From a26fbcf493f4456f1242daa319c7a3343708515c Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 11 Apr 2025 16:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E9=87=8D=E6=96=B0=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/order/detail.vue           |  6 +++---
 src/pages/tabbar/individualOrder.vue | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index fbf3350..4aa47ac 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -61,7 +61,7 @@ const doCancelRefund = async () => {
 			const data = refundApi.cancel(_pa)
 			uni.hideLoading()
 			uni.showToast({ title: "取消成功", icon: "none" })
-			router.jump("/pages/tabbar/order", {}, 2)
+			router.jump("/pages/tabbar/individualOrder", {}, 2)
 		},
 	})
 }
@@ -198,14 +198,14 @@ const doCancelRefund = async () => {
 		<view class="h-30rpx" />
 		<template #main-bottom>
 			<view
-				v-if="state.detail.orderStatus == 10 && state.refundDetail.status == 62"
+				v-if="state.detail.orderStatus == 10 && state.refundDetail.status == 10"
 				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"
+				v-else-if="state.refundDetail.status == 62 || state.refundDetail.status == 61"
 				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)"
 			>
diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index 52fd7c0..6c5251a 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -71,12 +71,12 @@
 						</view>
 					</view>
 				</view>
-				<view v-if="v.refundStatus == '0' && v.orderType == '1'" class="h-50rpx mt-1 flex justify-end items-center">
-					<view class="botder_btn" @tap.stop="refundDetail(v)">退款详情</view>
-				</view>
-				<view v-if="v.orderStatus == '5' && v.orderType == '1'" class="h-50rpx mt-1 flex justify-end items-center">
-					<view class="botder_btn" @tap.stop="doIndividualRefund(v)">申请退款</view>
-				</view>
+				<div class="flex justify-end items-center mt-1">
+					<view v-if="v.orderType == '1' && v.refundStatus" class="ml-1 botder_btn" @tap.stop="refundDetail(v)">售后详情</view>
+					<view v-if="v.orderStatus == '5' && v.orderType == '1'" class="ml-1 botder_btn" @tap.stop="doIndividualRefund(v)">
+						申请退款
+					</view>
+				</div>
 			</view>
 		</z-paging>