From b613bb368d4e678b42d25e94397d0aab3e213438 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 25 二月 2026 09:41:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
mini-program/pages/mine/mine.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/mini-program/pages/mine/mine.vue b/mini-program/pages/mine/mine.vue
index 0c81658..31b5325 100644
--- a/mini-program/pages/mine/mine.vue
+++ b/mini-program/pages/mine/mine.vue
@@ -26,19 +26,19 @@
</view>
</view>
<view class="cate">
- <view class="cate-item">
+ <view class="cate-item" @click="jumpTo(1)">
<text>{{objNum ? objNum.cartTypeNum : 0}}</text>
<text>璐墿杞�</text>
</view>
- <view class="cate-item">
+ <view class="cate-item" @click="jumpTo(2)">
<text>{{objNum ? objNum.member.integral : 0}}</text>
<text>绉垎</text>
</view>
- <view class="cate-item">
+ <view class="cate-item" @click="jumpTo(3)">
<text>{{objNum ? objNum.couponNum : 0}}</text>
<text>浼樻儬鍒�</text>
</view>
- <view class="cate-item">
+ <view class="cate-item" @click="jumpTo(4)">
<text>{{objNum ? objNum.collectNum : 0}}</text>
<text>鏀惰棌</text>
</view>
@@ -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,11 +102,31 @@
orderNum: null
};
},
- onLoad() {
+ async onLoad() {
+ await this.$onLaunched;
this.getMyInfo()
this.ordersStatistics()
},
methods: {
+ jumpTo(type) {
+ if (type === 1) {
+ uni.navigateTo({
+ url: '/pages/shopping-cart/shopping-cart'
+ })
+ } else if (type === 2) {
+ uni.navigateTo({
+ url: '/pages/my-points/my-points'
+ })
+ } else if (type === 3) {
+ uni.navigateTo({
+ url: '/pages/coupon/coupon'
+ })
+ } else if (type === 4) {
+ uni.navigateTo({
+ url: '/pages/my-collection/my-collection'
+ })
+ }
+ },
jump() {
uni.navigateTo({
url: '/pages/login/login'
@@ -156,15 +176,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