From e4f9739d74323aacf09d139700f22a383910ee97 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 三月 2026 10:38:32 +0800
Subject: [PATCH] 合并
---
mini-program/pages/mine/mine.vue | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/mini-program/pages/mine/mine.vue b/mini-program/pages/mine/mine.vue
index a8ebe31..917616f 100644
--- a/mini-program/pages/mine/mine.vue
+++ b/mini-program/pages/mine/mine.vue
@@ -6,7 +6,11 @@
<view class="head-bar-nav" :style="{ height: navHeight + 'px' }"></view>
</view>
<view class="user">
- <view class="user-left">
+<<<<<<< HEAD
+ <view class="user-left" @click="jumpUser">
+=======
+ <view class="user-left" @click="jumpSettings">
+>>>>>>> 7b09a9950f13521190a4aef9bbc2a6163445566c
<view class="user-image">
<image :src="userInfo.imgFullUrl?userInfo.imgFullUrl:'/static/icon/default.png'" mode="widthFix"></image>
</view>
@@ -53,17 +57,17 @@
</view>
<view class="func-list">
<view class="func-list-item" @click="jumpOrder(1)">
- <view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders}}</view>
+ <view class="func-list-item-num" v-if="orderNum && orderNum.waitPayOrders > 0">{{orderNum.waitPayOrders > 99 ? '99+' : 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(2)">
- <view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders}}</view>
+ <view class="func-list-item-num" v-if="orderNum && orderNum.waitOrders > 0">{{orderNum.waitOrders > 99 ? '99+' : 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(3)">
- <view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders}}</view>
+ <view class="func-list-item-num" v-if="orderNum && orderNum.waitReceivedOrders > 0">{{orderNum.waitReceivedOrders > 99 ? '99+' : orderNum.waitReceivedOrders}}</view>
<image src="/static/icon/mine_ic_daishouhuo@2x.png" mode="widthFix"></image>
<text>寰呮敹璐�</text>
</view>
@@ -112,6 +116,11 @@
if (uni.getStorageSync('backgroundImage')) {
this.share = uni.getStorageSync('backgroundImage').centerInviteBg
}
+ // 閫�鍑�/娉ㄩ攢娓呴櫎鏁版嵁
+ uni.$on('loginOut', () => {
+ this.objNum = null
+ this.orderNum = null
+ })
},
async onShow() {
await this.$onLaunched;
@@ -121,6 +130,13 @@
}
},
methods: {
+ jumpUser() {
+ if (this.userInfo) {
+ uni.navigateTo({
+ url: '/pages/settings/settings'
+ })
+ }
+ },
jumpTo(type) {
if (!this.userInfo) {
this.$refs.login.open()
@@ -162,6 +178,9 @@
},
// 璺宠浆璁剧疆
jumpSettings() {
+ if(!this.userInfo && !this.userInfo.id){
+ return
+ }
uni.navigateTo({
url: '/pages/settings/settings'
})
@@ -183,6 +202,8 @@
openid: res.data.openid
}).then(res => {
if (res.code === 200) {
+ that.getMyInfo()
+ that.ordersStatistics()
that.$store.commit('setUserInfo', res.data.member)
that.$store.commit('setToken', res.data.token)
that.$store.commit('setRecShopId','')
@@ -344,11 +365,11 @@
.func-list-item-num {
position: absolute;
top: 0;
- right: 0;
- height: 32rpx;
- line-height: 32rpx;
- padding: 0 8rpx;
- box-sizing: border-box;
+ right: -10rpx;
+ width: 40rpx;
+ height: 40rpx;
+ line-height: 40rpx;
+ text-align: center;
border-radius: 50%;
background-color: #E4001D;
font-weight: 400;
--
Gitblit v1.9.3