修改

ghsApp/src/admin/item/components/ItemStock.vue → ghsApp/src/admin/item/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 active" @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>
 			<text v-if="info.presell && info.presell ==1" class="presell-color">预售</text>
 			<view class="kc">￥{{ parseFloat(info.price) }} 
@@ -33,7 +33,7 @@
 </template>
 <script>
 export default {
-	name: "ItemStock",
+	name: "item",
 	components: {
 	},
 	props: {
@@ -57,15 +57,6 @@ export default {
 		},
 		goToProduct(id) {
 			this.$emit('goToProduct', id)
-		},
-		addEvent() {
-			this.$emit("add");
-		},
-		subtractEvent() {
-			this.$emit("subtract");
-		},
-		delEvent() {
-			this.$emit("del");
 		}
 	}
 };

ghsApp/src/admin/item/list.vue

@@ -78,7 +78,7 @@
 <script>
 import AppSearchModule from "@/components/module/app-search";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
-import ItemStock from "./components/ItemStock";
+import ItemStock from "./components/item";
 import productMins from "@/mixins/product";
 import { mapGetters } from "vuex";
 import { getWeixinId } from "@/api/invite/index";
@@ -123,10 +123,8 @@ export default {
 		if(this.option.delStatus){
 			this.delStatus = this.option.delStatus
 		}
-		if(this.option.warning){
-			this.warning = this.option.warning
-		}
-		this.initData({ type, shopId: this.shopId,status:this.status,delStatus:this.delStatus,warning:this.warning,requestType:'itemList'})
+		let requestType = this.option.warning && this.option.warning == 1 ? 'warning' : 'itemList'
+		this.initData({ type, shopId: this.shopId,status:this.status,delStatus:this.delStatus,requestType:requestType})
 		let that = this
 		getWeixinId().then(res => {
 			that.getAppIdList = res.data

ghsApp/src/pagesPurchase/add.vue

@@ -156,7 +156,7 @@ export default {
 		cgItemInit(){
 			this.shopId = this.getMyShopInfo.id;
 			let type = '';
-			this.initData({ type, shopId: this.shopId,status:0});
+			this.initData({ type, shopId: this.shopId,status:0,requestType:'cg'});
 		},
 		confirmSaveItem() {
 			if (this.$util.isEmpty(this.selectList)) {

ghsApp/src/pagesPurchase/components/CommodityPurchase.vue

@@ -2,7 +2,7 @@
   <view class="item-cmd_bx" @click="showAddModelFn">
 			<view class="img_bx" style="background:#eeeeee"> <image :src="info.cover" lazy-load="true" :lazy-load-margin="0"></image> </view>
     <view class="cmd-info_bx">
-      <view class="tit"> {{ info.itemName || "" }} </view>
+      <view class="tit"> {{ info.name || "" }} </view>
       <view class="num-open_bx">
         <view class="price" style="position:absolute;top:105upx;">￥{{ parseFloat(info.price) }}</view>
         <view style="position: relative;top:-10upx;">