From 1ce8d78649a210f5de93a03e758bf1ddc2f5506e Mon Sep 17 00:00:00 2001
From: air <30444667+sszdot@users.noreply.github.com>
Date: Wed, 15 Jan 2025 21:22:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Apay=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E6=88=96?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=20=E8=B7=B3=E8=BD=AC=E5=88=B0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2=20=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=97=B6=E6=B8=85=E6=A5=9A=E4=BA=86=E7=BC=93=E5=AD=98=20?=
 =?UTF-8?q?=E6=AD=A4=E6=97=B6back=E6=8C=89=E9=92=AE=E5=A4=B1=E6=95=88=20?=
 =?UTF-8?q?=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=B2=A1=E6=9C=89=E7=BC=93=E5=AD=98=20back=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=80=80=E5=9B=9E=E5=88=B0=E9=A6=96=E9=A1=B5=20?=
 =?UTF-8?q?=E3=80=90=E5=BD=B1=20=20=E5=93=8D=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 pages/order/index.vue  | 31 +++++++++++++++++++++++++++----
 pages/order/refund.vue |  6 +++---
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/pages/order/index.vue b/pages/order/index.vue
index 3287191..5abb748 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -1,10 +1,16 @@
 <template>
 	<view>
 		<!-- topbar -->
-		<u-navbar title="订单" bgColor="#d43030" :titleStyle="{ color: '#FFF'}" :autoBack="true" placeholder>
-			<view class="u-nav-slot" slot="left">
-				<u-icon name="arrow-left" color="#fff" size="19"></u-icon>
-			</view>
+		<u-navbar
+		  title="订单"
+		  bgColor="#d43030"
+		  :titleStyle="{ color: '#FFF' }"
+		  :autoBack="false" 
+		  placeholder
+		>
+		  <view class="u-nav-slot" slot="left" @click="onBackClick">
+		    <u-icon name="arrow-left" color="#fff" size="19"></u-icon>
+		  </view>
 		</u-navbar>
 		<!-- tab -->
 		<view class="tabListBox m-l-24 m-r-24 m-t-24 flex msb pr">
@@ -63,6 +69,8 @@
 			}
 		},
 		onLoad() {
+			//更新订订单列表
+			this.$store.dispatch('fetchOrderList')
 			//初始化 tapline的位置
 			this.lineOffset(this.current)
 		},
@@ -87,6 +95,21 @@
 			}
 		},
 		methods: {
+			// 自定义返回按钮点击事件
+			onBackClick() {
+				const pages = getCurrentPages() // 获取当前页面栈
+				if (pages.length === 1) {
+				  // 如果当前页面是栈中的唯一页面，跳转到首页
+				  uni.reLaunch({
+					url: '/pages/index/index', // 跳转到首页
+				  })
+				} else {
+				  // 否则返回上一页
+				  uni.navigateBack({
+					delta: 1, // 返回上一页
+				  })
+				}
+			},
 			//点击tab标签时 设置current
 			handlerTab(index) {
 				this.current = index
diff --git a/pages/order/refund.vue b/pages/order/refund.vue
index 0359663..ba417b4 100644
--- a/pages/order/refund.vue
+++ b/pages/order/refund.vue
@@ -217,9 +217,9 @@
 					//成功申请退款
 					if (res.data.status === 1) {
 						//跳转到订单 退款tab页面
-						// uni.navigateTo({
-						// 	url: `/pages/shop/pay?order_sn=${res.data.order_sn}&fullPrice=${fullPrice}`
-						// })
+						uni.navigateTo({
+							url: `/pages/order/index`
+						})
 					} else if (res.data.status === -1) {
 						uni.removeStorage({ //清除用户信息 跳转首页
 							key: 'userInfo',