mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bill' of http://git.excellentkk.cn/C.C/nk-shop2.0 into bill

Browse Source 
# Conflicts:
#	pages/users/order_list/index.vue
This commit is contained in:
THK3121 2023-07-08 10:55:14 +08:00
commit 05ef84a30b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages/users/order_list/index.vue
View File

@ -417,7 +417,7 @@
}, },
//商品分类 //商品分类
activity_type: '', activity_type: '',
product_type:'' product_type: 0
}; };
}, },
computed: { computed: {
@ -667,7 +667,7 @@
groupOrderList({ groupOrderList({
page: that.page, page: that.page,
limit: that.limit, limit: that.limit,
product_type:that.product_type product_type: that.product_type,
}).then(res => { }).then(res => {
console.log(res); console.log(res);
that.isReady = true; that.isReady = true;
@ -689,7 +689,7 @@
status: that.orderStatus - 1, status: that.orderStatus - 1,
page: that.page, page: that.page,
limit: that.limit, limit: that.limit,
product_type:that.product_type product_type: that.product_type,
}).then(res => { }).then(res => {
console.log(res); console.log(res);
let list = res.data.list || []; let list = res.data.list || [];