花材列表

ghsApp/src/admin/changePrice/components/Item.vue

@@ -8,7 +8,7 @@
 			<image :src="info.cover" style="width:160upx;height:160upx;" lazy-load="true" :lazy-load-margin="0"></image>
 		</view>
 		<view class="cmd-info_bx" @click="pageTo({url: '/admin/item/detail',query: {id: info.id}})">
-			<view class="tit">{{ info.itemName || "" }}</view>
+			<view class="tit">{{ info.name || "" }}</view>
 			<text v-if="info.variety && info.variety ==1" class="show-color"></text>
 			<view class="kc">￥{{ parseFloat(info.price) }}</view>
 			<text v-if="info.presell && info.presell ==1" class="presell-color">预售</text>

ghsApp/src/admin/changePrice/list.vue

@@ -169,7 +169,7 @@ export default {
 		initProduct(){
 			this.shopId = this.getMyShopInfo.id;
 			let type = '';
-			this.initData({ type, shopId: this.shopId,status:0,requestType:'hasStock'});
+			this.initData({ type, shopId: this.shopId,status:0,requestType:'changePrice'});
 		},
 		commitPrice(){
 			if(this.priceArr.length == 0){

ghsApp/src/admin/stat/stock.vue

@@ -9,11 +9,11 @@
 					<!--<button class="admin-button-com middle blue" @click="allOutSelectShop(0)">全部出库到</button>-->
 				</view>
 			</view>
-			<view class="top-bar" style="margin-left:115upx;">实时</view>
+			<view class="top-bar" style="margin-left:110upx;">实时</view>
 			<scroll-view scroll-y scroll-with-animation class="main-view">
 				<view class="space-view ex-table">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<t-tr header><t-th><view style="width:220upx;text-align:left;">花材</view></t-th><t-th>库存</t-th><t-th>花店价</t-th><t-th>散客价</t-th></t-tr>
+						<t-tr header><t-th><view style="width:270upx;text-align:left;">花材</view></t-th><t-th>库存</t-th><t-th>花店价</t-th><t-th>散客价</t-th></t-tr>
 						<block v-if="!$util.isEmpty(classItemData)">
 							<block v-for="(classItem,classIndex) in classItemData" :key="classIndex">
 								<block v-if="classItem.child && !$util.isEmpty(classItem.child)">
@@ -30,7 +30,7 @@
 										<block v-for="(productItem, productIndex) in classItem.child" :key="productIndex">
 											<t-tr>
 												<t-td>
-													<view style="width:280upx;text-align:left;color:#333333;font-size:30upx;
+													<view style="width:270upx;text-align:left;color:#333333;font-size:30upx;
 													overflow: hidden; white-space: nowrap; text-overflow: ellipsis;" 
 													@click="pageTo({url:'/admin/item/detail',query:{id: productItem.id}})">
 														{{productItem.name}}
@@ -131,7 +131,7 @@ export default {
 			this.shopId = this.getMyShopInfo.id;
 			let type = '';
 			let that = this
-			getProductDataApi({ type, shopId: this.shopId,status:0,requestType:'hasStock'}).then(res=>{
+			getProductDataApi({ type, shopId: this.shopId,status:0,requestType:'hasStockList'}).then(res=>{
 				if(res.code == 1){
 					that.classItemData = res.data.classItem ? res.data.classItem : []
 				}