feat: 优化tabbar切换逻辑

src/custom-tab-bar/index.vue

@@ -22,7 +22,7 @@
 
 <script>
 import { Tabbar, TabbarItem } from "vant";
-import { mapGetters, mapMutations } from "vuex";
+import {mapActions, mapGetters, mapMutations} from "vuex";
 import Taro from "@tarojs/taro";
 import appConfig from "../../project-config";
 
@@ -36,15 +36,14 @@ export default {
   },
   data () {
     return {
-      active: 'home',
-      tabbars: appConfig.tabbars
+      active: 'home'
     }
   },
   computed: {
-    ...mapGetters('tabbar', ['activeTabKey'])
+    ...mapGetters('tabbar', ['activeTabKey', 'tabbars'])
   },
   methods: {
-    ...mapMutations('tabbar', ['doSwitchTab']),
+    ...mapActions('tabbar', ['doSwitchTab']),
     checkActiveTabbar ()  {
       const activeKey = this.getComputedActiveKey(this.activeTabKey || this.tabbars[0].key)
       this.doSwitchTab(activeKey)
@@ -62,9 +61,6 @@ export default {
     },
     onSwitchTab (item) {
       this.doSwitchTab(item.key)
-      Taro.switchTab({
-        url: item.path
-      })
     }
   }
 }

src/pages/tabbar/home/index.vue

@@ -56,7 +56,7 @@ import Taro from "@tarojs/taro";
 import { Popup } from 'vant'
 import AdSwiperList from '@/components/common/AdSwiperList'
 import adSingle from '@/components/common/Ad'
-import { mapState, mapGetters, mapMutations} from "vuex";
+import {mapState, mapGetters, mapMutations, mapActions} from "vuex";
 import TopSearch from "@/components/search/TopSearch.vue";
 import SearchResultList from '@/components/search/result/list'
 import SearchResultCell from '@/components/search/result/list-item'
@@ -113,7 +113,7 @@ export default {
     this.initSearchReqConf()
   },
   methods: {
-    ...mapMutations('tabbar', ['doSwitchTab']),
+    ...mapActions('tabbar', ['doSwitchTab']),
     ...mapMutations('user', ['setArea', 'setAddressReload']),
     initSearchReqConf() {
       const r = useDifferentSearchTypeList({ type: this.searchConf.searchType })
@@ -152,9 +152,6 @@ export default {
     },
     goSearch () {
       this.doSwitchTab('search')
-      Taro.switchTab({
-        url: '/pages/tabbar/search/index'
-      })
     }
   }
 }

src/pages/tabbar/monitor/index.vue

@@ -11,7 +11,7 @@
 <script>
 import boxItem from '@/ui/box-item'
 import Taro from "@tarojs/taro";
-import {mapGetters} from "vuex";
+import {mapActions, mapGetters} from "vuex";
 import adSingle from "@/components/common/Ad.vue";
 export default {
   components: {
@@ -35,58 +35,12 @@ export default {
     return {}
   },
   computed: {
-    ...mapGetters('env', ['miniEnv']),
-    ...mapGetters('box', ['list']),
-    formatBoxList () {
-      const result = this.list.map(v => {
-        v.self = v.id === this.miniEnv.appId
-        if (v.self) {
-          v.afterTitle = '您当前所在'
-          v.rightTip = ''
-        }
-        return v
-      })
-
-      return result.sort((a, b) => {
-        if (a?.class === 'light' && b?.class !== 'light') {
-          return -1
-        }
-        if (a?.class !== 'light' && b?.class === 'light') {
-          return 1
-        }
-        if (a?.self && !b?.self) {
-          return -1
-        }
-        if (!a?.self && b?.self) {
-          return 1
-        }
-        return 0
-      })
-    }
+    ...mapGetters('env', ['miniEnv'])
   },
   methods: {
+    ...mapActions('tabbar', ['doSwitchTab']),
     goSearch () {
-      Taro.switchTab({
-        url: '/pages/tabbar/search/index'
-      })
-    },
-    doOpenItem ({ path, id, self }) {
-      if (self) {
-        return
-      }
-
-      if (id) {
-        Taro.navigateToMiniProgram({
-          appId: id,
-          path: path,
-          extraData: {},
-          envVersion: 'trial',
-        })
-      } else if (path) {
-        Taro.navigateTo({
-          url: path
-        })
-      }
+      this.doSwitchTab('search')
     }
   }
 }

src/store/modules/tabbar.js

@@ -1,17 +1,42 @@
+import Taro from "@tarojs/taro";
+
 export default {
   namespaced: true,
   state: () => ({
     activeKey: ''
   }),
   mutations: {
-    doSwitchTab (state, key) {
+    setSwitchTab (state, key) {
       state.activeKey = key
     }
   },
-  actions: {},
+  actions: {
+    getTabbarItem ({ getters }, key) {
+      return getters.tabbars.find(v => v.key === key)
+    },
+    async doSwitchTab({ commit, dispatch }, key) {
+      try {
+        const item =  await dispatch('getTabbarItem', key)
+        if (item?.path) {
+          Taro.switchTab({
+            url: item.path
+          })
+          commit('setSwitchTab', key)
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    }
+  },
   getters: {
+    appConfig (state, getters, rootState, rootGetters) {
+      return rootGetters['config/appConfig']
+    },
     activeTabKey (state) {
       return state.activeKey
+    },
+    tabbars (state, getters) {
+      return getters.appConfig.tabbars
     }
   }
 }