From 33c2164b1785a4b3c128f71ff577a989e2d91bdc Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 15:09:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/components/custom-tabbar/custom-tabbar.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/small-program/components/custom-tabbar/custom-tabbar.vue b/small-program/components/custom-tabbar/custom-tabbar.vue
index 8de2fe5..534bf28 100644
--- a/small-program/components/custom-tabbar/custom-tabbar.vue
+++ b/small-program/components/custom-tabbar/custom-tabbar.vue
@@ -7,6 +7,7 @@
</view>
</view>
<view class="tabbar-placeholder" :style="{ height: '100px' }"></view>
+ <auth-login :show="showLogin" @close="showLogin = false"></auth-login>
</view>
</template>
@@ -17,6 +18,7 @@
data() {
return {
safeAreaBottom: 0,
+ showLogin: false,
memberTabList: [
{
text: '棣栭〉',
@@ -72,7 +74,7 @@
}
},
computed: {
- ...mapState(['userType']),
+ ...mapState(['userType', 'token']),
currentIndex() {
const pages = getCurrentPages()
const currentPage = pages[pages.length - 1]
@@ -97,6 +99,10 @@
this.safeAreaBottom = systemInfo.safeAreaInsets.bottom || 0
},
switchTab(item) {
+ if (item.pagePath === '/pages/itinerary/itinerary' && !this.token) {
+ this.showLogin = true
+ return
+ }
const currentPath = getCurrentPages()[getCurrentPages().length - 1].$page.fullPath
if (this.userType === 1) {
if (currentPath !== item.pagePath) {
--
Gitblit v1.9.3