Merge branch 'bill' of http://git.excellentkk.cn/C.C/nk-shop2.0 into bill
# Conflicts: # pages/users/order_list/index.vue
This commit is contained in:
commit
05ef84a30b
@ -417,7 +417,7 @@
|
||||
},
|
||||
//商品分类
|
||||
activity_type: '',
|
||||
product_type:''
|
||||
product_type: 0
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -667,7 +667,7 @@
|
||||
groupOrderList({
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
product_type:that.product_type
|
||||
product_type: that.product_type,
|
||||
}).then(res => {
|
||||
console.log(res);
|
||||
that.isReady = true;
|
||||
@ -689,7 +689,7 @@
|
||||
status: that.orderStatus - 1,
|
||||
page: that.page,
|
||||
limit: that.limit,
|
||||
product_type:that.product_type
|
||||
product_type: that.product_type,
|
||||
}).then(res => {
|
||||
console.log(res);
|
||||
let list = res.data.list || [];
|
||||
|
Loading…
x
Reference in New Issue
Block a user