From fa71d31a932fb9d453766d28a6f9df2ec9fe9727 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 9 Apr 2025 16:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=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           | 18 +++++-------------
 src/pages/tabbar/individualOrder.vue | 14 ++++++++------
 src/pages/tabbar/my.vue              |  3 ++-
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index c39dcdb..fbf3350 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -1,14 +1,13 @@
 <script setup lang="ts">
-import { ref, reactive } from "vue"
+import { reactive } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
 import { isEmpty } from "radash"
 
-import { hooks, constant, router } from "@@/index"
+import { hooks, router } from "@@/index"
 import { orderApi, refundApi } from "@@/api"
 
 import { filePath } from "@@/utils/file"
 
-const data = {}
 const state = reactive<any>({
 	detailId: null,
 	detail: {},
@@ -77,11 +76,7 @@ const doCancelRefund = async () => {
 		</view>
 		<view class="h-30rpx" />
 		<view class="relative flex-col justify-center overflow-hidden card p-x-20rpx p-y-30rpx m-b-20rpx">
-			<image
-				class="absolute top--20rpx right--60rpx w-160rpx h-160rpx"
-				src="/static/icon/guarantee.png"
-				mode="widthFix"
-			/>
+			<image class="absolute top--20rpx right--60rpx w-160rpx h-160rpx" src="/static/icon/guarantee.png" mode="widthFix" />
 			<view class="sub-text-32">订单信息</view>
 			<view class="m-t-15rpx">
 				<view class="info_cell">
@@ -94,7 +89,7 @@ const doCancelRefund = async () => {
 				</view>
 				<view class="info_cell">
 					<view>商户</view>
-					<view>{{ state.detail.merchantStr }}</view>
+					<view>{{ state.detail.merchantName }}</view>
 				</view>
 				<view class="m-t-15rpx h-1px bg-#999 bg-opacity-5" />
 				<view class="info_cell">
@@ -184,10 +179,7 @@ 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 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>
diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index c114cda..ff7b785 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -59,8 +59,8 @@
 						</view>
 					</view>
 				</view>
-				<view v-if="v.orderStatus == 10 && v.refundStatus == 0" class="h-50rpx mt-1 flex justify-end items-center">
-					<view class="botder_btn" @tap.stop="doIndividualRefund(v)">退款</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>
 			</view>
 		</z-paging>
@@ -220,7 +220,7 @@
 <script setup lang="ts">
 import { ref, reactive } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
-import { hooks } from "@@/index"
+import { hooks, router } from "@@/index"
 import { filePath } from "@@/utils/file"
 import zTabs from "@@/components/other/z-tabs/z-tabs.vue"
 import { individualOrderApi, refundApi } from "@@/api"
@@ -252,9 +252,9 @@ onLoad(() => {
 onShow(() => {
 	const isLogin = hooks.useCheckLogin()
 	if (!isLogin) return
-	// if (pageRef.value) {
-	// 	pageRef.value.reload(false)
-	// }
+	if (pageRef.value) {
+		pageRef.value.reload(false)
+	}
 })
 
 // 切换选项卡
@@ -279,6 +279,8 @@ const resetState = () => {
 
 // 点击退款
 const doIndividualRefund = async (v: any) => {
+	return router.jump("/pages/refund/apply", { id: v.id })
+
 	if (!v.id) return uni.showToast({ title: "订单id不存在", icon: "none" })
 
 	resetState()
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 59ae978..b6bad22 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -266,7 +266,8 @@ const scanCode = {
 		if (isDevEnv()) {
 			// 开发环境模拟扫码
 			// const testQrCode = "eyJpZCI6IjE4OTYxNTcyMDc2NDQwNTM1MDYiLCJuYW1lIjoi5rWL6K+V5ZWG5oi3In0=" // 线上-测试超市-收款码
-			const testQrCode = "eyJpZCI6IjE5MDU4MTY3NTEwNDM0NTI5MzAiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=" // 测试环境-邓本地-新县府超市-收款码
+			// const testQrCode = "eyJpZCI6IjE5MDU4MTY3NTEwNDM0NTI5MzAiLCJuYW1lIjoi5paw5Y6/5bqc6LaF5biCIn0=" // 测试环境-邓本地-新县府超市-收款码
+			const testQrCode = "eyJpZCI6IjE5MDc2ODQwNTY4NDA4NDMyNjYiLCJuYW1lIjoi5pm66IO95p+c6Ieq6JCl5ZWG5oi3MSJ9" // 测试环境-邓本地-智能柜自营商户1-收款码
 			uni.showToast({ title: "开发环境不是浙政钉环境，扫码仅供测试，收款商家为测试商户超市", icon: "none" })
 			return scanCode.decodeBase64(testQrCode)
 		} else if (state.appInfo == "dd") {