From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/App.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index c7c8d13..c738754 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -76,9 +76,10 @@
proxy.mittBus.on('getI18nConfig', (locale: string) => {
(state.i18nLocale as string | null) = locale;
});
- // 获取缓存中的布局配置
+ // 获取缓存中的布局配置;
if (Local.get('themeConfig')) {
- storesThemeConfig.setThemeConfig(Local.get('themeConfig'));
+ storesThemeConfig.setThemeConfig(themeConfig.value);
+ // storesThemeConfig.setThemeConfig(Local.get('themeConfig'));
document.documentElement.style.cssText = Local.get('themeConfigStyle');
}
// 获取缓存中的全屏配置
--
Gitblit v1.9.2