diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 4a9f34b..20b53b4 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -348,6 +348,10 @@
onLoad(option) {
this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? ""
this.where.status = option.types
+ if (option.types == 99) {
+ delete this.where.status;
+ this.where.is_verify = 1;
+ }
this.current = "";
this.merId = option.merId;
if (option.pay_time) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2cf9ad8..eb4f0e2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -500,26 +500,33 @@
value: 0
}, ],
order: [{
- name: '待付款',
- type: 1,
- value: 0
- }, {
- name: '待发货',
- type: 2,
- value: 0
- }, {
- name: '待收货',
- type: 3,
- value: 0
- }, {
- name: '待评价',
- type: 4,
- value: 0
- }, {
- name: '退款',
- type: 6,
- value: 0
- }],
+ name: '待付款',
+ type: 1,
+ value: 0
+ }, {
+ name: '待核销',
+ type: 99,
+ value: 0
+ }, {
+ name: '待发货',
+ type: 2,
+ value: 0
+ }, {
+ name: '待收货',
+ type: 3,
+ value: 0
+ },
+ // {
+ // name: '待评价',
+ // type: 4,
+ // value: 0
+ // },
+ {
+ name: '退款',
+ type: 6,
+ value: 0
+ }
+ ],
other_order: [{
name: '待发货',
type: 2,
@@ -963,7 +970,13 @@
})
break;
+ case 99:
+ uni.navigateTo({
+ url: '/pages/admin/orderList/index?merId=' + this.userInfoData.service.mer_id +
+ '&types=' + item.type
+ })
+ break;
}
} else {
this.isAuto = true;
@@ -1262,11 +1275,16 @@
}
orderStatistics(this.userInfoData.service.mer_id, data).then(
res => {
- this.order[0].value = res.data.order.unpaid
- this.order[1].value = res.data.order.unshipped
- this.order[2].value = res.data.order.untake
- this.order[3].value = res.data.order.unevaluate
+ this.order[0].value = res.data.order.unpaid;
+ this.order[1].value = res.data.order.verify;
+
+ this.order[2].value = res.data.order.unshipped
+ this.order[3].value = res.data.order.untake
+ // this.order[4].value = res.data.order.unevaluate
this.order[4].value = res.data.order.refund
+
+
+
this.list[2].value = res.data.data.month.orderNum
this.list[5].value = res.data.data.today.orderNum
},
@@ -1347,13 +1365,13 @@
storeActivityTotal().then(res => {
res.data.forEach(item => {
if (item.type == 13) {
- this.list[4].value = item.total_amount;
- this.list[4].name = item.type_cn;
- }
+ this.list[4].value = item.total_amount;
+ this.list[4].name = item.type_cn;
+ }
if (item.type == 2) {
- this.list[3].value = item.total_amount;
- this.list[3].name = item.type_cn;
- }
+ this.list[3].value = item.total_amount;
+ this.list[3].name = item.type_cn;
+ }
})
})
}
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 07d2cbf..f62e019 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -156,7 +156,7 @@
})
}
} else {
- this.$refs.popups.handleOpen();
+ this.$refs.popups.handleOpen('money');
}
},
diff --git a/pages/product/shop_type_change/list.vue b/pages/product/shop_type_change/list.vue
index aef89c8..f8e2ea8 100644
--- a/pages/product/shop_type_change/list.vue
+++ b/pages/product/shop_type_change/list.vue
@@ -37,7 +37,7 @@
审核人:
- {{item.name}}
+ {{item.check_name}}
审核时间: