From 6f7f24efb43a64c79325a425dcd3e507d55bf876 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 25 四月 2026 14:46:26 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 small-program/pages/mine/mine.vue |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/small-program/pages/mine/mine.vue b/small-program/pages/mine/mine.vue
index ea33c54..d9b2959 100644
--- a/small-program/pages/mine/mine.vue
+++ b/small-program/pages/mine/mine.vue
@@ -26,13 +26,13 @@
 				<view class="order-card section-card">
 					<view class="section-head">
 						<text class="section-title">鎴戠殑璁㈠崟</text>
-						<view class="more-wrap" @click="toAllOrders">
+						<view class="more-wrap" @click="toOrderDetail(-1)">
 							<text class="more-text">鍏ㄩ儴璁㈠崟</text>
 							<u-icon name="arrow-right" size="13" color="#999999"></u-icon>
 						</view>
 					</view>
 					<view class="order-grid">
-						<view v-for="(item, index) in orderMenus" :key="index" class="order-item" @click="toOrderDetail(item.label)">
+						<view v-for="(item, index) in orderMenus" :key="index" class="order-item" @click="toOrderDetail(item.status)">
 							<image class="order-icon" :src="item.url" mode="widthFix"></image>
 							<view v-if="item.badge" class="order-badge">{{ item.badge }}</view>
 							<text class="order-label">{{ item.label }}</text>
@@ -83,9 +83,9 @@
 			agreeChecked: true,
 			userName: '',
 			orderMenus: [
-				{ label: '寰呮敮浠�', url: '/static/icon/mine_ic_daifukuan@2x.png', badge: 0 },
-				{ label: '寰呮敹璐�', url: '/static/icon/mine_ic_daishouhuo@2x.png', badge: 0 },
-				{ label: '閫�娆�/鍞悗', url: '/static/icon/mine_ic_tuikuan@2x.png', badge: 0 }
+				{ label: '寰呮敮浠�', url: '/static/icon/mine_ic_daifukuan@2x.png', badge: 0,status:0 },
+				{ label: '寰呮敹璐�', url: '/static/icon/mine_ic_daishouhuo@2x.png', badge: 0,status:3 },
+				{ label: '閫�娆�/鍞悗', url: '/static/icon/mine_ic_tuikuan@2x.png', badge: 0 ,status:5}
 			],
 			menuList: [
 				{ label: '闂ㄥ簵鍏ラ┗' },
@@ -121,8 +121,8 @@
 			this.showAuthLogin = true
 		},
 		toAllOrders() {
-			uni.navigateTo({
-				url: '/pages/orders/orders'
+			uni.switchTab({
+				url: '/pages/itinerary/itinerary'
 			})
 		},
 		handleMenuClick(item) {
@@ -145,8 +145,9 @@
 			}
 		},
 		toOrderDetail(label) {
-			uni.navigateTo({
-				url: '/pages/orders/orders?status=' + label
+			uni.setStorageSync("orderStatus",label)
+			uni.switchTab({
+				url: '/pages/itinerary/itinerary?status=' + label
 			})
 		},
 		toSetting() {

--
Gitblit v1.9.3