diff --git a/src/App.vue b/src/App.vue index 18bcdbd..7dbfc2c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,8 +1,12 @@ @@ -15,6 +19,11 @@ import { useDarkModeTheme } from '@/hooks/setting/useDarkModeTheme'; import 'dayjs/locale/zh-cn'; import { computed } from 'vue'; + import { NConfigProvider } from 'naive-ui' + import { useDarkThemeHook, useThemeOverridesHook, useCode, useLang } from '@/hooks' + + // 暗黑主题 + const darkNTheme = useDarkThemeHook() // support Multi-language const { getAntdLocale } = useLocale(); diff --git a/src/hooks/useTheme.hook.ts b/src/hooks/useTheme.hook.ts index 94d809d..17a1df6 100644 --- a/src/hooks/useTheme.hook.ts +++ b/src/hooks/useTheme.hook.ts @@ -3,6 +3,7 @@ import { darkTheme, GlobalThemeOverrides } from 'naive-ui' import { useDesignStore } from '@/store/modules/designStore/designStore' import { borderRadius } from '@/settings/designSetting' import { alpha, lighten } from '@/utils' +import { useAppStore } from '@/store/modules/app' /** * * 设置全局主题 @@ -45,6 +46,6 @@ export const useThemeOverridesHook = () => { // 返回暗黑主题 export const useDarkThemeHook = () => { - const designStore = useDesignStore() - return computed(() => (designStore.getDarkTheme ? darkTheme : undefined)) + const appStore = useAppStore() + return computed(() => (appStore.getDarkMode == 'dark' ? darkTheme : undefined)) } diff --git a/src/styles/common/_dark.scss b/src/styles/common/_dark.scss index 1c9ee92..edbfe2b 100644 --- a/src/styles/common/_dark.scss +++ b/src/styles/common/_dark.scss @@ -3,6 +3,8 @@ $dark: ( // 文字颜色 color: $--color-text-4, + // aside 背景 + aside-background-color: $--color-dark-bg-1, //背景 background-color: $--color-dark-bg-1, background-color1: $--color-dark-bg-1,