From 226efd70e82e05c3d23698ba83a8801c8e72517f Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Tue, 27 Jun 2023 15:26:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=93=8D=E5=BA=94=E6=96=B0=E5=AF=BC?=
 =?UTF-8?q?=E8=A7=864.1=E8=8F=9C=E5=8D=95=E6=96=B9=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PublicComponent/Tabs.vue | 10 +++++-----
 src/store/root/getters.js               |  5 +----
 src/views/Index/Index.vue               |  6 +++---
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/PublicComponent/Tabs.vue b/src/components/PublicComponent/Tabs.vue
index ab66030..0c7e4b4 100644
--- a/src/components/PublicComponent/Tabs.vue
+++ b/src/components/PublicComponent/Tabs.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="tabs" v-if="menuList.find(({ content: { path } }) => path === $route.path)">
-    <div :class="['item', tab.content.path === $route.path ? 'active' : '']" v-for="(tab, i) of menuList" :key="tab.id" @click="goPage(tab)">
-      <div class="icon"><img :src="theme.images[tab.content.moduleName]" /></div>
-      <div class="title">{{ tab.content.name }}</div>
+  <div class="tabs" v-if="menuList.find(({ routePath }) => routePath === $route.path)">
+    <div :class="['item', tab.routePath === $route.path ? 'active' : '']" v-for="(tab, i) of menuList" :key="tab.id" @click="goPage(tab)">
+      <div class="icon"><img :src="theme.images[tab.routePath.slice(1)]" /></div>
+      <div class="title">{{ tab.moduleName }}</div>
       <div class="count" v-if="i === 0 && activityCount">{{ activityCount }}</div>
     </div>
   </div>
@@ -19,7 +19,7 @@ const router = useRouter()
 const store = useStore()
 const { menuList, theme } = storeToRefs(store)
 const goPage = item => {
-  router.push(item.content.path)
+  router.push(item.routePath)
 }
 
 getActivityList().then(({ data }) => {
diff --git a/src/store/root/getters.js b/src/store/root/getters.js
index 63bf56d..8e41bbd 100644
--- a/src/store/root/getters.js
+++ b/src/store/root/getters.js
@@ -1,8 +1,5 @@
 import arrows from '../arrows/arrows'
-const DEVICE = {
-  WINDOWS: 'windows',
-  ANDROID: 'android'
-}
+
 export const currentBuildingFloorsList = state => {
   const currentBuilding = state.buildingList.find(building => building.buildingCode === state.currentFloor.buildingCode)
   return currentBuilding?.floorList ?? []
diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue
index d61dbf5..07f4d49 100644
--- a/src/views/Index/Index.vue
+++ b/src/views/Index/Index.vue
@@ -110,8 +110,8 @@
 
         <div class="menu">
           <div class="item" v-for="tab of menuList" :key="tab.id" @click="goMenu(tab)">
-            <div class="icon"><img :src="theme.images[tab.content.moduleName]" /></div>
-            <div class="title">{{ tab.content.name }}</div>
+            <div class="icon"><img :src="theme.images[tab.routePath.slice(1)]" /></div>
+            <div class="title">{{ tab.moduleName }}</div>
           </div>
         </div>
         <div class="acts">
@@ -190,7 +190,7 @@ getBrandList().then(({ data: { allShopNum, industryFatherList } }) => {
 
 const goPage = item => router.push(item.path)
 
-const goMenu = item => router.push(item.content.path)
+const goMenu = item => router.push(item.routePath)
 
 const setShopById = id => {
   const shop = shopList.value.find(_shop => _shop.shopCode === id)