From 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 四月 2026 09:42:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/components/custom-tabbar/custom-tabbar.vue | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/small-program/components/custom-tabbar/custom-tabbar.vue b/small-program/components/custom-tabbar/custom-tabbar.vue
index ca09a2a..8de2fe5 100644
--- a/small-program/components/custom-tabbar/custom-tabbar.vue
+++ b/small-program/components/custom-tabbar/custom-tabbar.vue
@@ -12,7 +12,6 @@
<script>
import { mapState } from 'vuex'
-
export default {
name: 'CustomTabbar',
data() {
@@ -59,7 +58,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'
},
@@ -99,10 +98,21 @@
},
switchTab(item) {
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