shish 5 лет назад
Родитель
Сommit
ed62fdb5a2

+ 7 - 5
ghsApp/src/pagesStorehouse/components/CommodityStock.vue

@@ -3,7 +3,7 @@
 		<view class="img_bx" style="background:#eeeeee">
 			<image :src="info.cover" v-if="isImg"></image>
 		</view>
-		<view @click="goItem(info.id)" class="cmd-info_bx" :class="type == STOCK_TYPE.WARN?'':'active'">
+		<view @click="goItem(info.id,info.itemId)" class="cmd-info_bx" :class="type == STOCK_TYPE.WARN?'':'active'">
 			<view class="tit">{{ info.itemName || "" }}</view>
 			<view class="kc"></view>
 			<view class="num-open_bx">
@@ -71,10 +71,12 @@ export default {
 		}
 	},
 	methods: {
-		goItem(id){
-			this.$util.pageTo({
-				url: "/admin/item/detail?id="+id
-			})
+		goItem(id,itemId){
+			if(this.type == STOCK_TYPE.WARN){
+				this.$util.pageTo({url: "/admin/item/detail?id="+id})
+			}else{
+				this.$util.pageTo({url: "/pagesStorehouse/stockWarn/detailed?id="+itemId})
+			}
 		},
 		customNum() {
 			this.$emit("customNum");

+ 0 - 9
ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -168,22 +168,13 @@ export default {
 	onLoad(e) {
 		this.itemId = e.id;
 		this.params.itemId = e.id;
-
 		let dateDefaultOption = [];
 		let list = this.getDictionariesInfo.dateDefaultOption;
-    console.log('list===>', list)
 		for (let i=0;i<list.length;i++){
 			dateDefaultOption.push({name:list[i].name,id:list[i].value})
 		}
 		this.menuTimeObj = {title:'时间',titleChild:'时间',list: dateDefaultOption};
-
 		this.shopId = this.getLoginInfo.shopId;
-		console.log(' this.selectShopId',this.shopId)
-		console.log(' this.getLoginInfo.shopId',this.getLoginInfo.shopId)
-		console.log(' this.menuTimeObj',this.menuTimeObj, dateDefaultOption)
-		// console.log('userShopAll',this.setUserShopAll())
-
-		// this.init();
 	},
 	onReachBottom() {
 		if (!this.list.finished) {

+ 13 - 23
hdApp/dist/build/mp-weixin/project.config.json

@@ -4,39 +4,29 @@
     "ignore": []
   },
   "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
+    "urlCheck": true,
+    "scopeDataCheck": false,
+    "coverView": true,
+    "es6": false,
     "postcss": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
     "preloadBackgroundData": false,
     "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
     "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
+    "newFeature": false,
     "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
     "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
+    "useIsolateContext": true,
+    "nodeModules": false,
+    "enhance": true,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
-    "useApiHostProcess": false,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "enableEngineNative": false,
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
+    "useApiHostProcess": true,
+    "showShadowRootInWxmlPanel": true,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "showES6CompileOption": false
+    "minifyWXSS": true
   },
   "compileType": "miniprogram",
   "libVersion": "",