From 2791cb7249af3e5f6c2f4481b33abed0a8fda3b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Wed, 2 Mar 2022 22:30:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BE=A7=E8=BE=B9=E6=A0=8F=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8SCSS=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/index.vue | 14 +++++---------
 src/store/modules/settings.ts           |  5 +++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 8751aaef..1ea66f5a 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,16 +1,13 @@
 <template>
   <div :class="{'has-logo':showLogo}">
     <logo v-if="showLogo" :collapse="isCollapse"/>
-    <!-- :background-color="variables.menuBg"
-          :text-color="variables.menuText"
-          :active-text-color="variables.menuActiveText"-->
     <el-scrollbar wrap-class="scrollbar-wrapper">
       <el-menu
           :default-active="activeMenu"
           :collapse="isCollapse"
-          background-color="#304156"
-          text-color="#bfcbd9"
-          active-text-color="#409EFF"
+          :background-color="variables.menuBg"
+          :text-color="variables.menuText"
+          :active-text-color="variables.menuActiveText"
           :unique-opened="false"
           :collapse-transition="false"
           mode="vertical">
@@ -30,19 +27,18 @@
 import {computed, defineComponent} from "vue";
 import SidebarItem from './SidebarItem.vue'
 import Logo from './Logo.vue'
-import variables from '@/styles/variables.scss'
+import variables from '@/styles/variables.module.scss'
 import { useSettingStoreHook } from "@/store/modules/settings";
 import { useAppStoreHook } from "@/store/modules/app";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import {useRoute} from 'vue-router'
 
-const route =useRoute()
 
+const route =useRoute()
 const routes =computed(() => usePermissionStoreHook().routes)
 const showLogo = computed(() => useSettingStoreHook().sidebarLogo)
 const isCollapse = computed(() => !useAppStoreHook().sidebar.opened)
 
-
 const activeMenu = computed(() => {
   const {meta, path} = route
   // if set path, the sidebar will highlight the path you set
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index b4025559..8d5b8981 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -10,9 +10,9 @@ import variables from '@/styles/element-variables.module.scss'
 export const useSettingStore = defineStore({
     id: "setting",
     state: (): SettingState => ({
-        theme: localStorage.get("theme") || variables.theme,
+        theme: variables.theme || localStorage.get("theme"),
         showSettings: showSettings,
-        tagsView: tagsView,
+        tagsView: localStorage.get("tagsView") != null ? localStorage.get("tagsView") : tagsView,
         fixedHeader: fixedHeader,
         sidebarLogo: sidebarLogo,
     }),
@@ -31,6 +31,7 @@ export const useSettingStore = defineStore({
                     break
                 case 'tagsView':
                     this.tagsView = value
+                    localStorage.set("tagsView", value)
                     break
                 case 'sidebarLogo':
                     this.sidebarLogo = value