Merge branch 'mall_dev_7.13.0' of ssh://gitlab.bigaka.net:2287/gaoshq/7-Eleven into mall_dev_7.13.0

src/project.config.json

@@ -9,7 +9,19 @@
 		"postcss": true,
 		"minified": true,
 		"newFeature": true,
-		"autoAudits": false
+		"coverView": true,
+		"autoAudits": false,
+		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"checkInvalidKey": true,
+		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"babelSetting": {
+			"ignore": [],
+			"disablePlugins": [],
+			"outputPath": ""
+		},
+		"useCompilerModule": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.8.2",

src/subPackage/page/pages/categoryPro/categoryPro.js

@@ -144,7 +144,7 @@ wxService.page({
     let pageNo = this.data.pageNo,
       pageSize = this.data.pageSize;
       // wxService.post(`/sale/product/buyer/listPageByCategoryId?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
-    this.data.form.state = 2;
+    this.data.form.state = 1;
     wxService.post(`/sale/product/mallCategory/listPageProductByMallCategoryIdAndItsSons?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
       const { result, data } = res.data
       if (result == 0 && data.content) {