Merge branch 'mall_dev_7.12.0' into mall_dev_7.13.0

src/pages/category/category.js

@@ -74,7 +74,7 @@ wxService.page({
       title: '加载中'
     })
     // wxService.get(`/sale/product/mallCategory/buyer/findCategoryTree`).then(res => {
-    wxService.get(`/sale/product/mallCategory/findCategoryTree`).then(res => {
+    wxService.get(`/sale/product/mallCategory/findCategoryTree?state=c`).then(res => {
       let { result, data } = res.data
       if (result == 0) {
         wx.hideLoading();

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

@@ -144,6 +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;
     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) {