From 8dfc59832df6e86f1840857a5b497faa9061a2af Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 10:00:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mini-program/pages/mine/mine.vue |   25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/mini-program/pages/mine/mine.vue b/mini-program/pages/mine/mine.vue
index 0c81658..109db88 100644
--- a/mini-program/pages/mine/mine.vue
+++ b/mini-program/pages/mine/mine.vue
@@ -46,24 +46,24 @@
 			<view class="func">
 				<view class="func-top">
 					<view class="func-top-title">鎴戠殑璁㈠崟</view>
-					<view class="func-top-to" @click="jumpOrder">
+					<view class="func-top-to" @click="jumpOrder(0)">
 						鍏ㄩ儴璁㈠崟
 						<image src="/static/icon/ic_ar2@2x.png" mode="widthFix"></image>
 					</view>
 				</view>
 				<view class="func-list">
-					<view class="func-list-item" @click="jumpOrder(0)">
+					<view class="func-list-item" @click="jumpOrder(1)">
 						<view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders}}</view>
 						<image src="/static/icon/mine_ic_daifukuan@2x.png" mode="widthFix"></image>
 						<text>寰呮敮浠�</text>
 					</view>
-					<view class="func-list-item" @click="jumpOrder(1)">
+					<view class="func-list-item" @click="jumpOrder(2)">
 						<view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders}}</view>
 						<image src="/static/icon/mine_ic_daifahuo@2x.png" mode="widthFix"></image>
 						<text>寰呭彂璐�/鑷彁</text>
 					</view>
-					<view class="func-list-item" @click="jumpOrder(2)">
-						<view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitReceivedOrders}}</view>
+					<view class="func-list-item" @click="jumpOrder(3)">
+						<view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders}}</view>
 						<image src="/static/icon/mine_ic_daishouhuo@2x.png" mode="widthFix"></image>
 						<text>寰呮敹璐�</text>
 					</view>
@@ -102,7 +102,8 @@
 				orderNum: null
 			};
 		},
-		onLoad() {
+		async onLoad() {
+			await this.$onLaunched;
 			this.getMyInfo()
 			this.ordersStatistics()
 		},
@@ -156,15 +157,9 @@
 			},
 			// 璺宠浆璁㈠崟鍒楄〃
 			jumpOrder(status) {
-				if (status >= 0) {
-					uni.navigateTo({
-						url: '/pages/order/order?status=' + status
-					})
-				} else {
-					uni.navigateTo({
-						url: '/pages/order/order'
-					})
-				}
+				uni.navigateTo({
+					url: '/pagesA/pages/order/order?userType=0&status=' + status
+				})
 			}
 		}
 	}

--
Gitblit v1.9.3