From 7a0b33a5f2e0ba589bf35a1b8d896700a21f94a4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 30 四月 2026 16:00:55 +0800
Subject: [PATCH] 支付宝支付dddadd
---
small-program/components/custom-tabbar/custom-tabbar.vue | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/small-program/components/custom-tabbar/custom-tabbar.vue b/small-program/components/custom-tabbar/custom-tabbar.vue
index ca09a2a..534bf28 100644
--- a/small-program/components/custom-tabbar/custom-tabbar.vue
+++ b/small-program/components/custom-tabbar/custom-tabbar.vue
@@ -7,17 +7,18 @@
</view>
</view>
<view class="tabbar-placeholder" :style="{ height: '100px' }"></view>
+ <auth-login :show="showLogin" @close="showLogin = false"></auth-login>
</view>
</template>
<script>
import { mapState } from 'vuex'
-
export default {
name: 'CustomTabbar',
data() {
return {
safeAreaBottom: 0,
+ showLogin: false,
memberTabList: [
{
text: '棣栭〉',
@@ -59,7 +60,7 @@
},
{
text: '娑堟伅',
- pagePath: '/pages/message/message',
+ pagePath: '/shop/pages/message/message',
iconPath: '/static/icon/nav_xiaoxi@2x.png',
selectedIconPath: '/static/icon/nav_xiaoxi_sel@2x.png'
},
@@ -73,7 +74,7 @@
}
},
computed: {
- ...mapState(['userType']),
+ ...mapState(['userType', 'token']),
currentIndex() {
const pages = getCurrentPages()
const currentPage = pages[pages.length - 1]
@@ -98,11 +99,26 @@
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 (currentPath !== item.pagePath) {
- uni.switchTab({
- url: item.pagePath
- })
+ if (this.userType === 1) {
+ if (currentPath !== item.pagePath) {
+ uni.redirectTo({
+ url: item.pagePath
+ })
+ }
+ } else {
+ if (currentPath !== item.pagePath) {
+ if(item.pagePath ==='/pages/itinerary/itinerary'){
+ uni.setStorageSync("orderStatus",-1)
+ }
+ uni.switchTab({
+ url: item.pagePath
+ })
+ }
}
}
}
--
Gitblit v1.9.3