diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue index f9d6516..a2dcd8f 100644 --- a/src/pages/order/detail.vue +++ b/src/pages/order/detail.vue @@ -144,7 +144,7 @@ const doCancelRefund = async () => { @tap="router.jump('/pages/refund/history', { id: state.refundDetail.id })"> - 退款申请待商家处理 + {{ hooks.useEnum('hardwareSaleStatusEnum', state.refundDetail.status) }} {{ hooks.useTime(state.refundDetail.updateTime, "") }} @@ -174,15 +174,35 @@ const doCancelRefund = async () => { {{ state.refundDetail.applyDescription }} + + + 审核人: + {{ state.refundDetail.auditUsername }} + + + 审核时间: + {{ hooks.useTime(state.refundDetail.auditTime, "") }} + + + 拒绝原因: + {{ state.refundDetail.auditReason }} + + diff --git a/src/pages/refund/apply.vue b/src/pages/refund/apply.vue index b92e356..3c6dec3 100644 --- a/src/pages/refund/apply.vue +++ b/src/pages/refund/apply.vue @@ -8,8 +8,8 @@ import { orderApi, refundApi, commonApi } from "@@/api" const data = { payType: [ - { text: "仅退款", disabled: false, type: "10", value: "10" }, - { text: "退款退货", disabled: true, type: "20", value: "20" }, + { text: "仅退款", disabled: false, visible: true, type: "10", value: "10" }, + { text: "退款退货", disabled: true, visible: false, type: "20", value: "20" }, ] } const state = reactive({ @@ -101,7 +101,7 @@ const doSubmit = async () => { const data = await refundApi.create(_pa) uni.hideLoading() uni.showToast({ title: '申请成功', icon: "none" }); - router.jump("/pages/order/detail", { id: state.detailId }) + router.jump("/pages/order/detail", { id: state.detailId }, 2) } catch (error) { console.error(error); uni.hideLoading() @@ -144,8 +144,8 @@ const doSubmit = async () => { 售后类型 - + diff --git a/src/pages/refund/history.vue b/src/pages/refund/history.vue index 4d827d4..96e9eae 100644 --- a/src/pages/refund/history.vue +++ b/src/pages/refund/history.vue @@ -37,7 +37,7 @@ const getHistory = async () => { - + {{ v.content }} diff --git a/src/pages/tabbar/order.vue b/src/pages/tabbar/order.vue index 13b6509..3f2ab22 100644 --- a/src/pages/tabbar/order.vue +++ b/src/pages/tabbar/order.vue @@ -105,13 +105,16 @@ const doRefund = (v: any) => { 售后中 已核销 - + 下单时间 {{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }} + + {{ hooks.useEnum('hardwareRefundStatusEnum', v.refundStatus) }} + diff --git a/src/sheep/constant/service-enum.ts b/src/sheep/constant/service-enum.ts index 7c62f1c..7a83405 100644 --- a/src/sheep/constant/service-enum.ts +++ b/src/sheep/constant/service-enum.ts @@ -22,6 +22,20 @@ const hardwarePayTypeEnum = { 7: "线上订餐二维码支付", }; +const hardwareSaleStatusEnum = { + 10: "会员申请退款", + 50: "商家确认退款", + 61: "会员取消退款", + 62: "商家拒绝退款", +}; + +const hardwareRefundStatusEnum = { + 0: "未售后", + 10: "售后中", + 20: "售后成功", + 30: "售后失败", +}; + const boxesBxStatusEnum = { "0": "今日空闲", "1": "今日部分空闲", @@ -33,4 +47,6 @@ export default { hardwareOrderTypeEnum, hardwarePayTypeEnum, boxesBxStatusEnum, + hardwareSaleStatusEnum, + hardwareRefundStatusEnum, };