diff --git a/lib/global.js b/lib/global.js index 4b24b0d2..17f31ace 100644 --- a/lib/global.js +++ b/lib/global.js @@ -16,8 +16,8 @@ export function GlobalContextProvider(props) { const [lang, updateLang] = useState(NOTION_CONFIG?.LANG || LANG) // 默认语言 const [locale, updateLocale] = useState(generateLocaleDict(NOTION_CONFIG?.LANG || LANG)) // 默认语言 const [theme, setTheme] = useState(NOTION_CONFIG?.THEME || THEME) // 默认博客主题 - const defaultDarkMode = NOTION_CONFIG?.APPEARANCE === 'dark' || APPEARANCE === 'dark' - const [isDarkMode, updateDarkMode] = useState(defaultDarkMode) // 默认深色模式 + const defaultDarkMode = NOTION_CONFIG?.APPEARANCE || APPEARANCE + const [isDarkMode, updateDarkMode] = useState(defaultDarkMode === 'dark') // 默认深色模式 const [onLoading, setOnLoading] = useState(false) // 抓取文章数据 const router = useRouter() diff --git a/themes/theme.js b/themes/theme.js index 9e545d8e..f09d3886 100644 --- a/themes/theme.js +++ b/themes/theme.js @@ -101,11 +101,11 @@ export const initDarkMode = (updateDarkMode, defaultDarkMode) => { // 查看localStorage中用户记录的是否深色模式 const userDarkMode = loadDarkModeFromLocalStorage() if (userDarkMode) { - newDarkMode = JSON.parse(userDarkMode) + newDarkMode = userDarkMode } // 如果站点强制设置默认深色,则优先级改过用 - if (typeof defaultDarkMode ==='boolean' && defaultDarkMode) { + if (defaultDarkMode==='dark') { newDarkMode = defaultDarkMode }