From d2dc19e7cbae34e316e5881f1b4d863bb74cbbf7 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 18 Nov 2024 17:39:39 +0800
Subject: [PATCH 1/2] 11

---
 src/pages/order/detail.vue         | 24 ++++++++++++++++++++++--
 src/pages/refund/apply.vue         | 10 +++++-----
 src/pages/refund/history.vue       |  2 +-
 src/pages/tabbar/order.vue         |  5 ++++-
 src/sheep/constant/service-enum.ts | 16 ++++++++++++++++
 5 files changed, 48 insertions(+), 9 deletions(-)

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 })">
                 <view>
                     <view class="sub-text-28">
-                        <view>退款申请待商家处理</view>
+                        <view>{{ hooks.useEnum('hardwareSaleStatusEnum', state.refundDetail.status) }}</view>
                     </view>
                     <view class="m-t-10rpx second-text-26">
                         {{ hooks.useTime(state.refundDetail.updateTime, "") }}
@@ -174,15 +174,35 @@ const doCancelRefund = async () => {
                     <view>{{ state.refundDetail.applyDescription }}</view>
                 </view>
             </view>
+            <view v-if="state.refundDetail.status == 62"
+                class="card p-x-20rpx p-y-30rpx space-y-10rpx m-b-20rpx second-text-24">
+                <view class="flex-row items-center">
+                    <view>审核人：</view>
+                    <view>{{ state.refundDetail.auditUsername }}</view>
+                </view>
+                <view class="flex-row items-center">
+                    <view>审核时间：</view>
+                    <view>{{ hooks.useTime(state.refundDetail.auditTime, "") }}</view>
+                </view>
+                <view class="flex-row items-center">
+                    <view>拒绝原因：</view>
+                    <view>{{ state.refundDetail.auditReason }}</view>
+                </view>
+            </view>
         </slot>
         <!-- end 退款相关 end -->
         <view class="h-30rpx" />
         <template #main-bottom>
-            <view v-if="state.detail.orderStatus == 10 && !state.detail.applyCancelTime"
+            <view v-if="state.detail.orderStatus == 10 && state.refundDetail.status != 62"
                 class="bg-#999 p-y-20rpx text-center rounded-40rpx m-x-30rpx m-y-30rpx sub-text-30 color-white!"
                 @tap="doCancelRefund">
                 取消申请
             </view>
+            <view v-else-if="state.refundDetail.status == 62"
+                class="bg-#999 p-y-20rpx text-center rounded-40rpx m-x-30rpx m-y-30rpx sub-text-30 color-white!"
+                @tap=" router.jump('/pages/refund/apply', { id: state.detailId }, 2)">
+                重新申请
+            </view>
         </template>
     </crud-layout>
 </template>
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<any>({
@@ -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 () => {
             <view class="sub-text-28">售后类型</view>
             <view class="m-t-20rpx">
                 <tm-radio-group @change="radioChange" direction="column" gap="20" v-model="applyForm.way">
-                    <tm-radio :disabled="v.disabled" v-for="(v, i) in data.payType" :key="i" :value="v.type"
-                        :label="v.text" />
+                    <tm-radio :disabled="v.disabled" v-for="(v, i) in data.payType" :key="i" v-show="v.visible"
+                        :value="v.type" :label="v.text" />
                 </tm-radio-group>
             </view>
         </view>
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 () => {
     <crud-layout mainIsScroll title="售后进度" bg="/static/page/blue-bg.png">
         <view class="h-30rpx" />
         <view class="flex card p-30rpx m-b-20rpx" v-for="(v, i) in state.historyList" :key="i">
-            <view class="m-t-10rpx size-12rpx rounded-full bg-green" />
+            <view :class="[v.afterStatus == 62 ? 'bg-red' : 'bg-green']" class="m-t-10rpx size-12rpx rounded-full" />
             <view class="m-l-15rpx">
                 <view class="sub-text-28">
                     <view>{{ v.content }}</view>
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) => {
                             <tm-tag v-if="v.orderStatus == 10" color="error" size="xs">售后中</tm-tag>
                             <tm-tag v-if="v.orderStatus == 15" size="xs">已核销</tm-tag>
                         </view>
-                        <view class="m-t-5rpx">
+                        <view class="flex-row items-center justify-between m-t-5rpx">
                             <view class="second-text-26">
                                 <text>下单时间</text>
                                 <text class="m-l-10rpx">
                                     {{ hooks.useTime(v.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}
                                 </text>
                             </view>
+                            <view class="second-text-22">
+                                {{ hooks.useEnum('hardwareRefundStatusEnum', v.refundStatus) }}
+                            </view>
                         </view>
                     </view>
                 </view>
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,
 };

From 8b8e1c08631438d0d5f373ab0b12d9e3289b2161 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 18 Nov 2024 17:56:08 +0800
Subject: [PATCH 2/2] 11

---
 src/manifest.json          | 3 +--
 src/pages/order/detail.vue | 6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index f23a30b..900e63f 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -72,8 +72,7 @@
     "h5": {
         "router": {
             "base": "/",
-//            "base": "/H5/",
             "mode": "hash"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index a2dcd8f..f80cfef 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -144,10 +144,12 @@ const doCancelRefund = async () => {
                 @tap="router.jump('/pages/refund/history', { id: state.refundDetail.id })">
                 <view>
                     <view class="sub-text-28">
-                        <view>{{ hooks.useEnum('hardwareSaleStatusEnum', state.refundDetail.status) }}</view>
+                        <view>
+                            {{ hooks.useEnum('hardwareSaleStatusEnum', state.refundDetail.status) }}
+                        </view>
                     </view>
                     <view class="m-t-10rpx second-text-26">
-                        {{ hooks.useTime(state.refundDetail.updateTime, "") }}
+                        {{ hooks.useTime(state.refundDetail.updateTime || state.refundDetail.createTime, "") }}
                     </view>
                 </view>
                 <view class="m-l-15rpx color-#999 font-size-26rpx! iconfont icon-youjiantou" />