diff --git a/pages/index/index.vue b/pages/index/index.vue
index 87e0989..fb0309a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -11,7 +11,7 @@
待退货
-
+
待配货
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 73a915d..b47a83d 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -17,7 +17,7 @@
订单状态:{{item.status == 0 ?'待抢单' :item.status == 1 ?'待取货' :item.status == 3 ?'待送达' :item.status == 4 ?'已完成' :item.status == 5 ?'下游客户待退货' :item.status == 00 ?'退货待抢单' :item.status == 01 ?'退货待取货' :item.status == 03 ?'退货待送达' :item.status == 04 ?'待确认退货' :item.status == 6 ?'待配货' :'挂单'}}
-
+ 去开单
@@ -43,7 +43,8 @@
},
onLoad(options) {
console.log('options', options);
- this.type = options.type;
+ this.type = options.type;
+ this.listStatus = options.listStatus
this.getOrderInfoList()
},
onReachBottom() {
@@ -76,7 +77,8 @@
pageVo: {
pageSize: 10,
pageNumber: this.page
- },
+ },
+ status:this.listStatus
}, false, false).then((res) => {
this.status = 'nomore';
if (res.code == 200) {
diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue
index cf7bdfd..55899ff 100644
--- a/pages/inventory/inventory.vue
+++ b/pages/inventory/inventory.vue
@@ -204,33 +204,34 @@
}).catch((res) => {})
},
//商品上下架
- upDown(type, data) {
+ upDown(type, data) {
+ let that = this
uni.showModal({
title: "提示",
content: "确定将此款商品" + type == 0 ? "下架" : "上架" + "吗?",
success: function(res) {
if (type == 0) { //下架
- this.tui.request("/app/product/down", "POST", {
+ that.tui.request("/app/product/down", "POST", {
id: data.id
}, false, false).then((res) => {
if (res.code == 200) {
- this.tui.toast("下架成功")
+ that.tui.toast("下架成功")
} else {
- this.tui.toast(res.message)
+ that.tui.toast(res.message)
}
}).catch((res) => {})
} else { //上架
- this.tui.request("/app/product/up", "POST", {
+ that.tui.request("/app/product/up", "POST", {
id: id
}, false, false).then((res) => {
if (res.code == 200) {
- this.tui.toast("上架成功")
+ that.tui.toast("上架成功")
} else {
- this.tui.toast(res.message)
+ that.tui.toast(res.message)
}
}).catch((res) => {})
}
- this.getShareList(data.categoryId)
+ that.getShareList(data.categoryId)
}
})
},