优化项目

src/layouts/admin/components/logo.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="layout-logo">
-        <img v-if="!config.layout.menuCollapse" class="logo-img" :src="getTheme.logoUrl" />
+        <img v-if="!config.layout.menuCollapse && getTheme.logoUrl" class="logo-img" :src="getTheme.logoUrl" />
         <!--        <div-->
         <!--            v-if="!config.layout.menuCollapse"-->
         <!--            :style="{ color: config.getColorVal('menuActiveColor') }"-->
@@ -8,7 +8,7 @@
         <!--        >-->
         <!--            灿能-->
         <!--        </div>-->
-        <!-- <Icon
+        <Icon
             v-if="config.layout.layoutMode != 'Streamline'"
             @click="onMenuCollapse"
             :name="config.layout.menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
@@ -17,18 +17,18 @@
             style="margin: 15px;"
             size="18"
             class="fold"
-        /> -->
+        />
     </div>
 </template>
 
 <script setup lang="ts">
 import { useConfig } from '@/stores/config'
 import { closeShade } from '@/utils/pageShade'
-import { Session } from '@/utils/storage'
+import { getStoredTheme } from '@/utils/storage'
 import { setNavTabsWidth } from '@/utils/layout'
 
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const getTheme = getStoredTheme()
 const onMenuCollapse = function () {
     if (config.layout.shrink && !config.layout.menuCollapse) {
         closeShade()

src/layouts/admin/components/navBar/classic.vue

@@ -4,7 +4,7 @@
             <!-- <Icon @click="onMenuCollapse" name="fa fa-indent" :color="config.getColorVal('menuActiveColor')"
                 size="18" /> -->
         </div>
-        <span class="nav-bar-title">{{ getTheme.name }} <span style="font-size: 14px;" v-if="Version?.versionName">
+        <span class="nav-bar-title">{{ themeName }} <span style="font-size: 14px;" v-if="Version?.versionName">
                 ({{ Version?.versionName }})
             </span></span>
         <NavMenus />
@@ -19,8 +19,9 @@ import NavMenus from '../navMenus.vue'
 import { showShade } from '@/utils/pageShade'
 import { onMounted } from 'vue'
 import { getLastData } from '@/api/systerm'
+import { getStoredThemeName } from '@/utils/storage'
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const themeName = getStoredThemeName()
 const Version: any = ref({})
 const onMenuCollapse = () => {
     showShade('ba-aside-menu-shade', () => {
@@ -33,7 +34,7 @@ onMounted(() => {
         Version.value = res.data
 
     })
-    document.title = getTheme.name
+    document.title = themeName
 })
 </script>