shish 3 лет назад
Родитель
Сommit
72fcc67c0d

+ 2 - 5
ghsApp/src/admin/changePrice/changeStock.vue

@@ -8,9 +8,6 @@
 			<view class="search-bar">
 				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFn"/>
 			</view>
-			<view style="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" @click="downloadTable()">价格表</button>
-			</view>
 		</view>
 
 		<view class="scroll-middle_bx">
@@ -33,7 +30,7 @@
 						<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
 
 							<template v-for="(productItem, productIndex) in classItem.child">
-								<view style="height:230upx" :id="`class_${classIndex}`" :key="productIndex">
+								<view style="height:190upx" :id="`class_${classIndex}`" :key="productIndex">
 									<ItemComponent v-if="classItem.isActive" :isPrice="false" :info="productItem" @saveStock="saveStock" @cancelDiscountFn="cancelDiscountFn" @cancelPreSellFn="cancelPreSellFn"></ItemComponent>
 								</view>
 							</template>
@@ -180,7 +177,7 @@ export default {
 		initProduct(){
 			this.shopId = this.getMyShopInfo.id;
 			let type = '';
-			this.initData({ type, shopId: this.shopId,status:'',delStatus:0,requestType:'itemList'});
+			this.initData({ type, shopId: this.shopId,status:0,delStatus:0,requestType:'itemList'});
 		},
 		commitPrice(){
 			let that = this

+ 4 - 7
ghsApp/src/admin/changePrice/components/changeStockItem.vue

@@ -30,15 +30,12 @@
 					</view>
 				</view>
 			</view>
+			<text style="position:absolute;right:70upx;color:#333333;font-weight:bold;bottom:0upx;">
+			剩余 {{info.stock?parseFloat(info.stock):0}}
+			</text>
 		</view>
 	</view>
 
-	<view class="level-price">
-		<text>毛利 ¥{{ info.ml ? parseFloat(info.ml) : 0 }}</text>
-		<text style="position:absolute;left:35upx;">成本 ¥{{ parseFloat(info.cost) }}</text>
-		<text style="position:absolute;right:50upx;color:#333333;">剩余 {{info.stock?parseFloat(info.stock):0}}</text>
-	</view>
-
 </view>
 </template>
 <script>
@@ -186,7 +183,7 @@ export default {
 				.hd-price-area{
 					width:190upx;
 					position: absolute;
-					top:37upx;
+					top:50upx;
 					right:-10upx;
 					.change-input {
 						width: 150upx;