From e67e2fe70105a9e59eb14612e5efd5d4056cb7cb Mon Sep 17 00:00:00 2001 From: cmxdd <86407334@qq.com> Date: Thu, 6 Aug 2020 10:04:38 +0800 Subject: [PATCH] update code adout order --- components/order-item/index.vue | 4 +- pages/index/details.vue | 48 +++++++----- pages/index/index.vue | 1 + pages/index/otherdetails.vue | 125 +++++++++++++++++++++----------- 4 files changed, 116 insertions(+), 62 deletions(-) diff --git a/components/order-item/index.vue b/components/order-item/index.vue index 2192fd1..78bc509 100644 --- a/components/order-item/index.vue +++ b/components/order-item/index.vue @@ -10,9 +10,9 @@ 待处理订单 已发货订单 已完成订单 - 申请退款订单 + 申请退款 已退款订单 - 拒绝退款订单 + 拒绝退款 {{info.extend_order_goods[0].goods_name}} diff --git a/pages/index/details.vue b/pages/index/details.vue index e9d40da..a73bfca 100644 --- a/pages/index/details.vue +++ b/pages/index/details.vue @@ -13,20 +13,7 @@ - - - - {{ info.extend_order_common.reciver_name }} - - - - {{ info.extend_order_common.reciver_info.mob_phone }} - - - - {{ info.extend_order_common.reciver_info.address }} - - + 收件人信息 @@ -44,6 +31,22 @@ + + + + + {{ info.extend_order_common.reciver_name }} + + + + {{ info.extend_order_common.reciver_info.mob_phone }} + + + + {{ info.extend_order_common.reciver_info.address }} + + + 派送方式 @@ -52,6 +55,7 @@ 确认 + 物流信息 订单单号:{{ info.order_sn }} @@ -60,11 +64,14 @@ {{list.kd_time}} + + 不处理 确定处理 - 退款状态:{{ type == 5 ? '同意退款，请注意查收' : '拒绝退款，请等待客服联系' }} + + 退款状态:{{ type == 5 ? '同意退款，请注意查收！' : '拒绝退款，请等待客服联系！' }} 骑手信息 @@ -181,7 +188,6 @@ export default { this.showRefunds = false; if (this.cur == 0) { // 确定退款 - return; this.$u.api.refund({ refund_id: this.orderid, seller_state:2, @@ -197,12 +203,14 @@ export default { title: res.message, type: 'success' }); + uni.navigateBack({ + delta: 1 + }); console.log(res); } }); } else { // 不进行退款 - return; this.$u.api.refund({ refund_id: this.orderid, seller_state:3, @@ -218,6 +226,9 @@ export default { title: res.message, type: 'success' }); + uni.navigateBack({ + delta: 1 + }); console.log(res); } }); @@ -298,6 +309,9 @@ export default { title: res.message, type: 'success' }); + uni.navigateBack({ + delta: 1 + }); } }); } diff --git a/pages/index/index.vue b/pages/index/index.vue index 9c844dc..2119766 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -153,6 +153,7 @@ export default { // 订单状态： 0:全部 1已付款未发货 2已发货 3已完成 4申请退款/退货 5已退款/退货 6拒绝退款/退货 }, onShow() { + this.num=1 this.current=0 // 初始化数据 this.resetarr() diff --git a/pages/index/otherdetails.vue b/pages/index/otherdetails.vue index 27f360a..a13b39c 100644 --- a/pages/index/otherdetails.vue +++ b/pages/index/otherdetails.vue @@ -13,21 +13,9 @@ - - - - {{ info.goods_try_member_name }} - - - - {{ info.goods_try_member_mobile }} - - - - {{ info.goods_try_area_info }} - - - + + + + + + 派送方式 @@ -53,35 +62,44 @@ 确认 - - + + + + 人工送达，请等待，货物正在飞速与你接近！ - 确认 - --> + + + 配送信息 + 提示信息 + + + + {{ info.takeawayer_name }} + + + + {{ info.takeawayer_mobile }} + + + + + + + + 抱歉，商家正忙无法接单，期待下次为您服务！ + + + + + + 订单配送完成，期待下次为您服务！ + + - - @@ -135,6 +153,13 @@ export default { type: 'error' }); } else { + this.$refs.uToast.show({ + title: res.message, + type: 'success' + }); + uni.navigateBack({ + delta: 1 + }); } }); } else { @@ -150,6 +175,13 @@ export default { type: 'error' }); } else { + this.$refs.uToast.show({ + title: res.message, + type: 'success' + }); + uni.navigateBack({ + delta: 1 + }); } }); } @@ -234,6 +266,13 @@ export default { } } } + .refunds-title{ + padding: 25rpx 30rpx; + font-weight: 500; + color: #333333; + background-color: #ffffff; + border-bottom: 2rpx solid #ececec; + } .refunds-user { padding: 25rpx 30rpx; background-color: #ffffff; @@ -290,7 +329,7 @@ export default { border-bottom: 2rpx solid #ececec; } .title { - width: 150rpx; + width: 170rpx; font-size: 30rpx; margin-right: 10rpx; }