diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index 6fd3763..93d81bb 100644 --- a/src/layout/components/Settings/index.vue +++ b/src/layout/components/Settings/index.vue @@ -79,11 +79,8 @@ const currentThemeColor = computed(() => { }); onMounted(() => { window.document.body.setAttribute("layout", settingsStore.layout); - const theme = - localStorage.getItem("vueuse-color-scheme") || defaultSettings.theme; - settingsStore.changeSetting({ key: "theme", value: theme }); - - if (theme != "light") { + const theme = settingsStore.theme; + if (theme == "dark") { document.documentElement.classList.add("dark"); } diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 96a3c57..7f1f4fb 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -10,8 +10,6 @@ defineProps({ }, }); -const layout = computed(() => settingsStore.layout); - const logo = ref(new URL(`../../../assets/logo.png`, import.meta.url).href); @@ -36,8 +34,8 @@ const logo = ref(new URL(`../../../assets/logo.png`, import.meta.url).href); to="/" > - vue3-element-admin + {{ $t("login.title") }} diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts index 6689823..ebb391d 100644 --- a/src/store/modules/settings.ts +++ b/src/store/modules/settings.ts @@ -20,9 +20,7 @@ export const useSettingsStore = defineStore("setting", () => { ); const theme = useStorage("theme", defaultSettings.theme); - if (theme.value == "light") { - document.body.classList.remove("dark"); - } + // actions function changeSetting(param: { key: string; value: any }) { const { key, value } = param; @@ -47,6 +45,9 @@ export const useSettingsStore = defineStore("setting", () => { break; case "theme": theme.value = value; + if (theme.value !== "dark") { + document.documentElement.classList.remove("dark"); + } break; } }