优化

ghsApp/src/admin/changePrice/list.vue

@@ -173,7 +173,7 @@ export default {
 		},
 		commitPrice(){
 			if(this.priceArr.length == 0){
-				uni.showToast({title:"没有修改",icon:"none"})
+				this.$msg('没有修改')
 				return;
 			}
 			let data = JSON.stringify(this.priceArr);
@@ -204,9 +204,7 @@ export default {
 			if (this.tabIndex == e.index) {
 				return false;
 			} else {
-				uni.showLoading({
-					title: "加载中"
-				});
+				uni.showLoading({ title: "加载中" })
 				this.tabIndex = e.index;
 				let type = "";
 				this.initData({ type, shopId: this.shopId,requestType:'hasStock' });

ghsApp/src/api/product/index.js

@@ -18,11 +18,11 @@ export const print = data => {
  * @parmas type 库存预警时，固定为waring，其他情况不传或者传空
  */
 export const getProductDataApi = data => {
-	return https.get("/product/index", data);
+	return https.get("/product/show", data);
 };
 
 export const getStockInItem = data => {
-	return https.get("/product/stock-in", data);
+	return https.get("/product/get-stock-in", data);
 };
 
 /** *

ghsApp/src/mixins/product.js

@@ -162,42 +162,27 @@ export default {
 		},
 		//请求商品数据
 		async initData(extendInfo) {
-			try {
-				let params = {type: this.type,customId:this.option.customId}
-				if (extendInfo) {
-					params = { ...params, ...extendInfo };
-				}
-				//区分获取正常花材和当天入库花材
-				let hostFn = extendInfo && extendInfo.pdType && extendInfo.pdType == 'stockInPd' ? getStockInItem : getProductDataApi;
-				const { data } = await hostFn(params);
-				this.globalClassItemList = '';
-				data.forEach(element => {
-					if(element.child && !this.$util.isEmpty(element.child)){
-						element.child.forEach(child => {
+			let params = {type: this.type,customId:this.option.customId}
+			if (extendInfo) {
+				params = { ...params, ...extendInfo };
+			}
+			//区分获取正常花材和当天入库花材
+			let hostFn = extendInfo && extendInfo.pdType && extendInfo.pdType == 'stockInPd' ? getStockInItem : getProductDataApi;
+			const { data } = await hostFn(params);
+			let currentClassItem = data.classItem ? data.classItem : []
+			let currentItemList = data.itemList ? data.itemList : []
 
-							//组合出一维数组给下面使用 shish 20221216
-							//this.globalItemList[child.id] = child 用这个方法会造成this.globalClassItemList无法渲染到页面，很奇怪！
-							this.globalItemList.push(child)
-	
-							child.classId = element.classId;
-							child.className = element.className;
-							child.userPrice = 0;
-						})
-					}
-				})
-				this.productInfoList = data;
+			this.globalItemList = currentItemList
 
-				let currentInfo = uni.getStorageSync('selectList_'+this.selectJobType+'_target_'+this.selectJobId)
-				if(!this.$util.isEmpty(currentInfo)){
-					this.setSelectInfo({ selectJobType: this.selectJobType, info: currentInfo,selectJobId:this.selectJobId })
-				}
+			this.productInfoList = currentClassItem
 
-				this.classIndex = 0;
-				this.scroll_into_view = 'class_0';
-				this.scrollPushList();
-			} catch (error) {} finally {
-				uni.hideLoading();
+			let currentInfo = uni.getStorageSync('selectList_'+this.selectJobType+'_target_'+this.selectJobId)
+			if(!this.$util.isEmpty(currentInfo)){
+				this.setSelectInfo({ selectJobType: this.selectJobType, info: currentInfo,selectJobId:this.selectJobId })
 			}
+			this.classIndex = 0;
+			this.scroll_into_view = 'class_0';
+			this.scrollPushList();
 		},
 		//滚动或切换分类 获取更多数据
 		scrollPushList(){