冲突

Your Name

2022-08-17 2475c65a3c091cee4fe48f49e0f53697403750df

 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');
                }
                // 获取缓存中的全屏配置