From 59bfd0b8bbbf0ee94ec68e4a3a1a6e536d0ad8fd Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
small-program/components/custom-tabbar/custom-tabbar.vue | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/small-program/components/custom-tabbar/custom-tabbar.vue b/small-program/components/custom-tabbar/custom-tabbar.vue
index 8de2fe5..7f214a3 100644
--- a/small-program/components/custom-tabbar/custom-tabbar.vue
+++ b/small-program/components/custom-tabbar/custom-tabbar.vue
@@ -3,10 +3,11 @@
<view class="custom-tabbar" :style="{ paddingBottom: safeAreaBottom + 'px' }">
<view class="tabbar-item" v-for="(item, index) in tabList" :key="index" @click="switchTab(item)">
<image class="tabbar-icon" :src="currentIndex === index ? item.selectedIconPath : item.iconPath" mode="aspectFit"></image>
- <text class="tabbar-text" :class="{ active: currentIndex === index }">{{ item.text }}</text>
+ <text class="tabbar-text" :class="{ active: currentIndex === index, shop: userType === 1 }">{{ item.text }}</text>
</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: '棣栭〉',
@@ -48,7 +50,7 @@
text: '棣栭〉',
pagePath: '/shop/pages/store-home/store-home',
iconPath: '/static/icon/nav_home@2x.png',
- selectedIconPath: '/static/icon/nav_home_sel@2x.png'
+ selectedIconPath: '/static/shopTabbar/nav_home_sel@2x.png'
},
{
text: '閽卞寘',
@@ -60,19 +62,19 @@
text: '娑堟伅',
pagePath: '/shop/pages/message/message',
iconPath: '/static/icon/nav_xiaoxi@2x.png',
- selectedIconPath: '/static/icon/nav_xiaoxi_sel@2x.png'
+ selectedIconPath: '/static/shopTabbar/nav_xiaoxi_sel@2x.png'
},
{
text: '鎴戠殑',
pagePath: '/shop/pages/mine/mine',
iconPath: '/static/icon/nav_wode@2x.png',
- selectedIconPath: '/static/icon/nav_wode_sel@2x.png'
+ selectedIconPath: '/static/shopTabbar/nav_wode_sel@2x.png'
}
]
}
},
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) {
@@ -163,5 +169,9 @@
&.active {
color: #1ba8fa;
}
+
+ &.shop.active {
+ color: #004096;
+ }
}
</style>
--
Gitblit v1.9.3