diff --git a/components/popups/index.vue b/components/popups/index.vue
index ad10ec8..7cbce19 100644
--- a/components/popups/index.vue
+++ b/components/popups/index.vue
@@ -139,7 +139,7 @@
// 关闭
handleClose() {
- if (this.$parent.$parent.load) this.$parent.$parent.load = false;
+ this.$emit('change')
this.$refs.popup.close();
},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1f810f7..8207119 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -168,7 +168,7 @@
- 待发货
+ {{item.order_type == 0?'待发货':'待核销'}}
@@ -194,9 +194,7 @@
style="color: #F84221;">{{g.cart_info.productAttr.price.split('.')[1] }}(含快递:¥0.00)
-
-
@@ -219,7 +217,9 @@
备注
- 去发货
+
+ {{item.order_type == 0?'去发货':'去核销'}}
+
@@ -231,10 +231,7 @@
{{loadTitle}}
-
-
-
@@ -551,11 +548,11 @@
// type: 3,
// image: require('@/static/images/index4.png')
// },
- // {
- // name: '扫码付款',
- // type: 18,
- // image: require('@/static/images/index25.png')
- // },
+ {
+ name: '扫码付款',
+ type: 18,
+ image: require('@/static/images/index25.png')
+ },
// {
// name: '进货管理',
// type: 4,
@@ -652,11 +649,11 @@
type: 2,
image: require('@/static/images/index1.png')
},
- // {
- // name: '扫码付款',
- // type: 18,
- // image: require('@/static/images/index25.png')
- // },
+ {
+ name: '扫码付款',
+ type: 18,
+ image: require('@/static/images/index25.png')
+ },
{
name: '提现管理',
type: 5,
@@ -761,11 +758,11 @@
type: 23,
image: require('@/static/images/index26.png')
},
- // {
- // name: '扫码付款',
- // type: 18,
- // image: require('@/static/images/index25.png')
- // },
+ {
+ name: '扫码付款',
+ type: 18,
+ image: require('@/static/images/index25.png')
+ },
// {
// name: '进货管理',
// type: 4,
@@ -805,7 +802,7 @@
where: {
page: 1,
limit: 3,
- status: 2
+ status: 9
},
where1: {
product_type: 0
@@ -1263,10 +1260,16 @@
},
//界面跳转
shopdetail(item) {
- uni.navigateTo({
- url: '/pages/admin/orderDetail/index?id=' + item.order_id + '&mer_id=' + this.userInfoData
- .service.mer_id
- })
+ if (item.order_type == 0) {
+ uni.navigateTo({
+ url: '/pages/admin/orderDetail/index?id=' + item.order_id + '&mer_id=' + this.userInfoData
+ .service.mer_id
+ })
+ } else {
+ uni.navigateTo({
+ url: '/pages/admin/order_cancellation/index?mer_id=' + this.userInfoData.service.mer_id
+ })
+ }
},
//获取订单数据
getindex() {
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index ab33309..02ab705 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -575,8 +575,9 @@
},
handleClear() {},
- handleChange() {
- this.load = false;
+ handleChange(val) {
+ if (!val)
+ this.load = false;
},
async postCreate(price) {