shish пре 2 месеци
родитељ
комит
016ca92c7b
2 измењених фајлова са 28 додато и 9 уклоњено
  1. 26 7
      hdApp/src/pagesPurchase/components/item.vue
  2. 2 2
      hdApp/src/pagesPurchase/ghsProduct.vue

+ 26 - 7
hdApp/src/pagesPurchase/components/item.vue

@@ -39,7 +39,7 @@
 							<text style="font-weight:bold;font-size:30upx;" :class="{'price-reach': reachDiscountReached}">¥{{ displayUnitPrice }}</text>
 						</view>
 					</view>
-					<view style="text-align: right" >
+					<view class="ctrl-side">
 						<view class="open-bx" >
 							<i class="iconfont iconjian" @click.stop="delEvent(info.variety)" v-if="bigCount > 0 || smallCount > 0"></i>
 							<text class="num">
@@ -49,12 +49,12 @@
 							<i class="iconfont iconzeng add-btn" @click.stop="addEvents(info.variety)"></i>
 						</view>
 						<stock v-if="showStock && showStock == '1'">
-							<text v-if="Number(info.stock) > Number(info.stockWarning)" style="color:#333;margin-right:55upx;">还剩 {{ parseFloat(info.stock) }}</text>
-							<text v-else style="color:red;font-weight:bold;margin-right:55upx;">还剩 {{ parseFloat(info.stock) }}</text>
+							<text v-if="Number(info.stock) > Number(info.stockWarning)" class="stock-line stock-line--ok">还剩 {{ parseFloat(info.stock) }}</text>
+							<text v-else class="stock-line stock-line--warn">还剩 {{ parseFloat(info.stock) }}</text>
 						</stock>
 						<stock v-else>
 							<stock v-if="showSold && showSold == 1">
-								<text style="color:#333;margin-right:55upx;">已售 {{ info.actualSold ? parseInt(info.actualSold):0 }}</text>
+								<text class="stock-line stock-line--ok">已售 {{ info.actualSold ? parseInt(info.actualSold):0 }}</text>
 							</stock>
 						</stock>
 					</view>
@@ -153,7 +153,7 @@ export default {
 		displayOriginalPriceLabel() {
 			if (this.reachDiscountReached) {
 				const price = parseFloat(Number(this.info.price) || 0);
-				return this.info.myLevel == 2 ? `会员¥${price}` : `¥${price}`;
+				return this.info.myLevel == 2 ? `¥${price}` : `¥${price}`;
 			}
 			if (this.hasLimitDiscount) {
 				return `¥${parseFloat(Number(this.info.prePrice) || 0)}`;
@@ -288,7 +288,7 @@ export default {
 .price-original {
 	text-decoration: line-through;
 	color: #A9A9A9;
-	font-size: 24upx;
+	font-size: 28upx;
 	margin-right: 8upx;
 	font-weight: bold;
 }
@@ -369,6 +369,26 @@ export default {
 			& > view:last-child {
 				flex-shrink: 0;
 			}
+			.ctrl-side {
+				flex-shrink: 0;
+				text-align: right;
+				padding-right: 16upx;
+				margin-top: 2upx;
+				box-sizing: border-box;
+			}
+			.stock-line {
+				display: block;
+				margin-top: 4upx;
+				font-size: 24upx;
+				text-align: right;
+			}
+			.stock-line--ok {
+				color: #333;
+			}
+			.stock-line--warn {
+				color: red;
+				font-weight: bold;
+			}
 			& .price {
 				font-size: 28upx;
 				color: #ff2842;
@@ -380,7 +400,6 @@ export default {
 				display: flex;
 				align-items: center;
 				justify-content: flex-end;
-				padding-right: 4upx;
 				box-sizing: border-box;
 				flex-shrink: 0;
 				& .iconfont {

+ 2 - 2
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -894,9 +894,9 @@ export default {
 	}
 	.item_list_title {
 		margin-bottom: 20upx;
-		font-size: 34upx;
+		font-size: 36upx;
 		font-weight: 600;
-		color: #067a40;
+		color: #141414;
 	}
 	.select-cmd_bx {
 		& .kc {