From c3c6a58078718dbf65f1e81c4083067f249dc4fe Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 18 Nov 2024 09:45:29 +0800
Subject: [PATCH] 111

---
 src/pages/order/detail.vue   | 4 ++--
 src/pages/refund/apply.vue   | 2 +-
 src/pages/refund/history.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index b09cb29..f9d6516 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -62,7 +62,7 @@ const doCancelRefund = async () => {
             const data = refundApi.cancel(_pa)
             uni.hideLoading()
             uni.showToast({ title: '取消成功', icon: "none" });
-            router.jump("/pages/tabbar/order")
+            router.jump("/pages/tabbar/order", {}, 2)
         }
     })
 }
@@ -178,7 +178,7 @@ const doCancelRefund = async () => {
         <!-- end 退款相关 end -->
         <view class="h-30rpx" />
         <template #main-bottom>
-            <view v-if="state.detail.orderStatus == 10"
+            <view v-if="state.detail.orderStatus == 10 && !state.detail.applyCancelTime"
                 class="bg-#999 p-y-20rpx text-center rounded-40rpx m-x-30rpx m-y-30rpx sub-text-30 color-white!"
                 @tap="doCancelRefund">
                 取消申请
diff --git a/src/pages/refund/apply.vue b/src/pages/refund/apply.vue
index ecd2374..b92e356 100644
--- a/src/pages/refund/apply.vue
+++ b/src/pages/refund/apply.vue
@@ -9,7 +9,7 @@ import { orderApi, refundApi, commonApi } from "@@/api"
 const data = {
     payType: [
         { text: "仅退款", disabled: false, type: "10", value: "10" },
-        { text: "退款退货", disabled: false, type: "20", value: "20" },
+        { text: "退款退货", disabled: true, type: "20", value: "20" },
     ]
 }
 const state = reactive<any>({
diff --git a/src/pages/refund/history.vue b/src/pages/refund/history.vue
index f575db4..4d827d4 100644
--- a/src/pages/refund/history.vue
+++ b/src/pages/refund/history.vue
@@ -36,7 +36,7 @@ const getHistory = async () => {
 <template>
     <crud-layout mainIsScroll title="售后进度" bg="/static/page/blue-bg.png">
         <view class="h-30rpx" />
-        <view class="flex bg-white rounded-16rpx p-30rpx" v-for="(v, i) in state.historyList" :key="i">
+        <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="m-l-15rpx">
                 <view class="sub-text-28">