From 5f181fae03631f7748073433f9febead5aec02e3 Mon Sep 17 00:00:00 2001
From: zouzhibing <zouzhibing@anthead.cn>
Date: Mon, 27 Feb 2023 19:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=80=A7:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/index.vue   |  5 ++++-
 src/layout/components/SubMenu/SubMenu.vue | 11 +++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index b1834cd..f408c4a 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -25,9 +25,10 @@
 <script lang="ts" setup>
 import Logo from './components/Logo.vue'
 import SubItem from '../SubMenu/SubItem.vue'
+import SubMenu from '../SubMenu/SubMenu.vue'
 import {useSettingStore} from "@/store/modules/setting"
 import {usePermissionStore} from "@/store/modules/permission"
-import { computed } from 'vue'
+import { computed, ref, watch } from "vue";
 import { useRoute } from 'vue-router'
 
 // 在setup中获取store
@@ -40,6 +41,8 @@ const isCollapse = computed(() => !SettingStore.isCollapse)
 // 设置
 const themeConfig = computed(() =>SettingStore.themeConfig )
 
+const basePath = ref('/')
+
 // 获取路由
 const permission_routes = computed(() => PermissionStore.permission_routes)
 
diff --git a/src/layout/components/SubMenu/SubMenu.vue b/src/layout/components/SubMenu/SubMenu.vue
index 2214d6b..eac457d 100644
--- a/src/layout/components/SubMenu/SubMenu.vue
+++ b/src/layout/components/SubMenu/SubMenu.vue
@@ -3,18 +3,18 @@
     <el-sub-menu v-if="subItem.children && subItem.children.length > 0" :index="subItem.path">
       <template #title>
         <el-icon>
-          <component :is="subItem.meta.icon"></component>
+          <component :is="subItem?.meta?.icon"></component>
         </el-icon>
-        <span>{{ subItem.meta.title }}</span>
+        <span>{{ subItem?.meta?.title }}</span>
       </template>
-      <SubMenu :menuList="subItem.children" :basePath="`${basePath}/${subItem.path}`"/>
+      <SubMenu :menuList="subItem.children" :basePath="`${basePath?'/':''}${subItem.path}`"/>
     </el-sub-menu>
     <el-menu-item v-else-if="!subItem.hidden" :index="subItem.path" @click="handleClickMenu(subItem)">
       <el-icon>
-        <component :is="subItem.meta.icon"></component>
+        <component :is="subItem?.meta?.icon"></component>
       </el-icon>
       <template #title>
-        <span>{{ subItem.meta.title }}</span>
+        <span>{{ subItem?.meta?.title }}</span>
       </template>
     </el-menu-item>
   </template>
@@ -36,7 +36,6 @@ let props = defineProps({
 
 const router = useRouter();
 const handleClickMenu = (subItem) => {
-  console.log('isExternal(subItem.path)',subItem.path,isExternal(subItem.path))
   if (isExternal(subItem.path)) return window.open(subItem.path, "_blank");
   let path = props.basePath+'/'+subItem.path
   router.push(path);