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 | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/mini-program/pages/mine/mine.vue b/mini-program/pages/mine/mine.vue
index 9964ac7..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">
+<<<<<<< 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>
@@ -174,6 +178,9 @@
},
// 璺宠浆璁剧疆
jumpSettings() {
+ if(!this.userInfo && !this.userInfo.id){
+ return
+ }
uni.navigateTo({
url: '/pages/settings/settings'
})
--
Gitblit v1.9.3