shish hace 3 años
padre
commit
846be80203

+ 3 - 2
ghsApp/src/admin/changePrice/components/Item.vue

@@ -26,7 +26,7 @@
 							<input class="change-input" @click.stop @blur="saveSkPrice" placeholder-style="color:#CCCCCC" v-model="skModifyPrice" type="digit" placeholder="散客价" />
 							<input class="change-input" @click.stop @blur="saveSkPrice" placeholder-style="color:#CCCCCC" v-model="skModifyPrice" type="digit" placeholder="散客价" />
 						</view>
 						</view>
 						<button v-if="Number(info.discountPrice)>0" @click.stop="cancelDiscountFn(info)" class="admin-button-com mini-btn blue" 
 						<button v-if="Number(info.discountPrice)>0" @click.stop="cancelDiscountFn(info)" class="admin-button-com mini-btn blue" 
-							style="position:absolute;bottom:-69upx;font-size:24upx;left:10upx;">取消特价</button>
+							style="position:absolute;bottom:-8upx;font-size:24upx;left:10upx;">取消特价</button>
 					</view>
 					</view>
 				</view>
 				</view>
 			</view>
 			</view>
@@ -35,7 +35,8 @@
 
 
 	<view class="level-price">
 	<view class="level-price">
 		<text>剩余 {{info.stock?parseFloat(info.stock):0}}</text>
 		<text>剩余 {{info.stock?parseFloat(info.stock):0}}</text>
-		<text style="color:#333333;position:absolute;right:80upx;color:green;">成本 ¥{{ parseFloat(info.cost) }}</text>
+		<text style="color:#333333;position:absolute;left:35upx;color:#71541e;">毛利润 ¥{{ info.ml ? parseFloat(info.ml) : 0 }}</text>
+		<text style="color:#333333;position:absolute;right:50upx;color:green;">成本 ¥{{ parseFloat(info.cost) }}</text>
 	</view>
 	</view>
 
 
 </view>
 </view>

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

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