From 80a4127af54ff0c9db01f78c0966118a74d1bd72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?TOP=E7=B3=AF=E7=B1=B3?= <1130395124@qq.com> Date: Sun, 26 Feb 2023 01:07:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=B3=E8=AF=B7=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E3=80=81=E6=9C=AA=E9=80=9A=E8=BF=87=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/order/action.vue | 19 ++- src/core/models/order.js | 33 +++++ src/pages.json | 6 + src/pages/order/order.vue | 4 +- src/pages/order/refund.vue | 252 ++++++++++++++++++++++++++++++++ 5 files changed, 307 insertions(+), 7 deletions(-) create mode 100644 src/pages/order/refund.vue diff --git a/src/components/order/action.vue b/src/components/order/action.vue index 4624ca9..6d3107e 100644 --- a/src/components/order/action.vue +++ b/src/components/order/action.vue @@ -17,7 +17,7 @@ - + 申请退款 @@ -26,7 +26,12 @@ 重新申请 - + + + 查看原因 + + + @@ -67,9 +72,13 @@ export default { this.$utils.toPage("/pages/worker/appraise?id=" + this.order.worker.id); }, // 退款 - drawbackOrder() { - // this.$emit("drawbackOrder"); - this.$utils.toPage("/pages/order/drawback?id=" + this.order.worker.id); + refundOrder() { + // this.$emit("refundOrder"); + this.$utils.toPage("/pages/order/refund?id=" + this.order.worker.id); + }, + // 查看未通过原因 + showReason() { + this.$utils.toPage("/pages/order/refund?type=reason&id=" + this.order.worker.id); }, // 重新提交 reapplyOrder() { diff --git a/src/core/models/order.js b/src/core/models/order.js index 4c6eec7..f887ad5 100644 --- a/src/core/models/order.js +++ b/src/core/models/order.js @@ -5,13 +5,26 @@ export default { CUSTOM_PRICE: 3, }, state: { + // 订单关闭 ORDER_CLOSE: -2, + // 未支付 NO_PAY: -1, + // 等待师傅报价 NO_PRICE: 0, + // 等待您选择师傅 NO_SELECT_WORKER: 1, + // 等待师傅上门 NO_SERVICE: 2, + // 完成订单 NO_APPRAISE: 3, + // 服务完结 ALL_FINISH: 4, + // 已申请退款 + APPLY_REFUND: 6, + // 已退款 + REFUNDED: 7, + // 无法退款 + CAN_NOT_REFUND: 8, }, getOrderStateTextColor(state) { switch (state) { @@ -23,6 +36,16 @@ export default { return '#000000'; case this.state.NO_SERVICE: return '#000000'; + case this.state.NO_APPRAISE: + return '#000000'; + case this.state.ALL_FINISH: + return '#000000'; + case this.state.APPLY_REFUND: + return '#000000'; + case this.state.REFUNDED: + return '#000000'; + case this.state.CAN_NOT_REFUND: + return '#000000'; default: return '#ff0000'; } @@ -37,6 +60,16 @@ export default { return '等待您选择师傅'; case this.state.NO_SERVICE: return '等待师傅上门'; + case this.state.NO_APPRAISE: + return '完成订单'; + case this.state.ALL_FINISH: + return '服务完结'; + case this.state.APPLY_REFUND: + return '已提交申请'; + case this.state.REFUNDED: + return '已退款'; + case this.state.CAN_NOT_REFUND: + return '未通过'; default: return '未知状态'; } diff --git a/src/pages.json b/src/pages.json index 5f79d35..04890aa 100644 --- a/src/pages.json +++ b/src/pages.json @@ -67,6 +67,12 @@ "navigationBarTitleText": "评价师傅" } }, + { + "path": "pages/order/refund", + "style": { + "navigationBarTitleText": "申请退款" + } + }, { "path": "pages/demand/demand", "style": { diff --git a/src/pages/order/order.vue b/src/pages/order/order.vue index 83ae266..7e26749 100644 --- a/src/pages/order/order.vue +++ b/src/pages/order/order.vue @@ -161,7 +161,7 @@ export default { ], }, { - type: "drawback", + type: "refund", name: "退款记录", more: true, list: [ @@ -173,7 +173,7 @@ export default { createTime: "2022-10-18 10:56:34", serviceTime: "2022-10-18 10:56:34", orderType: 1, - state: 1, + state: 8, worker: { id: 1, name: "张师傅", diff --git a/src/pages/order/refund.vue b/src/pages/order/refund.vue new file mode 100644 index 0000000..598240a --- /dev/null +++ b/src/pages/order/refund.vue @@ -0,0 +1,252 @@ +