Skip to content

7
7-Eleven
Commit 17b4c47c by 程南
Options

Merge branch 'mall_dev_7.12.0' into mall_dev_7.13.0

parents 28b86238 13357225
Showing with 2 additions and 1 deletions
src/pages/category/category.js
...@@ -74,7 +74,7 @@ wxService.page({ ...@@ -74,7 +74,7 @@ wxService.page({
title: '加载中' title: '加载中'
}) })
// wxService.get(`/sale/product/mallCategory/buyer/findCategoryTree`).then(res => { // 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 let { result, data } = res.data
if (result == 0) { if (result == 0) {
wx.hideLoading(); wx.hideLoading();
......
src/subPackage/page/pages/categoryPro/categoryPro.js
...@@ -144,6 +144,7 @@ wxService.page({ ...@@ -144,6 +144,7 @@ wxService.page({
let pageNo = this.data.pageNo, let pageNo = this.data.pageNo,
pageSize = this.data.pageSize; pageSize = this.data.pageSize;
// wxService.post(`/sale/product/buyer/listPageByCategoryId?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => { // 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 => { wxService.post(`/sale/product/mallCategory/listPageProductByMallCategoryIdAndItsSons?pageNo=${pageNo}&pageSize=${pageSize}`, this.data.form).then(res => {
const { result, data } = res.data const { result, data } = res.data
if (result == 0 && data.content) { if (result == 0 && data.content) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment