shish 3 years ago
parent
commit
9fa3bffffd

+ 21 - 6
ghsApp/src/admin/changePrice/components/Item.vue

@@ -35,11 +35,12 @@
 				{{ info.name || "" }}
 				<text v-if="info.variety && info.variety ==1" class="show-color"></text>
 			</view>
-			<view class="kc">¥{{ parseFloat(info.price) }}</view>
+			<text class="hj-price">¥{{ info.hjPrice?parseFloat(info.hjPrice):0 }}</text>
+			<text class="kc">¥{{ info.price?parseFloat(info.price):0 }}</text>
+			<text class="sk-price">¥{{ info.skPrice?parseFloat(info.skPrice):0 }}</text>
 			<view class="num-open_bx">
 				<view>
 					<view class="open-bx" >
-						<text style="color:#333333;">¥{{ parseFloat(info.skPrice) }}</text>
 						<view class="hd-price-area">
 							<input class="change-input" @click.stop @blur="savePrice" placeholder-style="color:#CCCCCC" v-model="modifyPrice" type="digit" placeholder="批发价" />
 						</view>
@@ -57,7 +58,7 @@
 
 	<view class="level-price">
 		<text>剩余 {{info.stock?parseFloat(info.stock):0}}</text>
-		<text style="position:absolute;left:40upx;color:#333333;">会员价 ¥{{ info.hjPrice ? parseFloat(info.hjPrice) : 0 }}</text>
+		<text style="position:absolute;left:40upx;">毛利 ¥{{ info.ml ? parseFloat(info.ml) : 0 }}</text>
 		<text style="position:absolute;right:50upx;">成本 ¥{{ parseFloat(info.cost) }}</text>
 	</view>
 
@@ -234,11 +235,25 @@ export default {
 				margin-left:15upx;
 			}
 		}
+		& .hj-price{
+			color:green;
+			position: absolute;
+			top:48upx;
+			left:171upx;
+		}
 		& .kc {
 			color:red;
-			font-size: 31upx;
-			padding: 17upx 0 24upx;
-			font-weight: 700;
+			font-size:28upx;
+			font-weight:bold;
+			position: absolute;
+			top:86upx;
+			left:171upx;
+		}
+		& .sk-price{
+			color:#333333;
+			position: absolute;
+			top:130upx;
+			left:171upx;
 		}
 		& .num-open_bx {
 			display: flex;

+ 1 - 1
ghsApp/src/admin/item/components/item.vue

@@ -45,8 +45,8 @@
 				<template>
 					<view class="open-bx">
 						还剩 <text style="font-size:23upx;margin-left:8upx;">{{ info.stock?parseFloat(info.stock):0 }}</text>
-						<text style="margin-left:28upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">销量 {{ info.actualSold ? parseInt(info.actualSold) : 0 }}</text>
 						<text style="margin-left:28upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">成本 {{ info.cost ? parseInt(info.cost) : 0 }}</text>
+						<text style="margin-left:28upx;font-size:23upx;display:inline-block;color:#999;font-weight:normal;">销量 {{ info.actualSold ? parseInt(info.actualSold) : 0 }}</text>
 					</view>
 				</template>
 			</view>