|
@@ -30,7 +30,8 @@ const getUrl = () => {
|
|
|
// getHomePath是以前的代码,留下做兼容,获取到一个默认的首页路径
|
|
// getHomePath是以前的代码,留下做兼容,获取到一个默认的首页路径
|
|
|
// 然后正常按配置走,默认使用上面的首页路径
|
|
// 然后正常按配置走,默认使用上面的首页路径
|
|
|
const homePathKey = data.result['defaultTheme'] ? data.result['defaultTheme'] : '';
|
|
const homePathKey = data.result['defaultTheme'] ? data.result['defaultTheme'] : '';
|
|
|
- homePath = data.result['systemHome'] ? data.result['systemHome'] : getHomePath(homePathKey);
|
|
|
|
|
|
|
+ const legacyHomePath = getHomePath(homePathKey);
|
|
|
|
|
+ homePath = data.result['systemHome'] ? data.result['systemHome'] : legacyHomePath;
|
|
|
const faviconIcon = document.getElementById('faviconIcon');
|
|
const faviconIcon = document.getElementById('faviconIcon');
|
|
|
if (faviconIcon) {
|
|
if (faviconIcon) {
|
|
|
faviconIcon.setAttribute('href', `${VUE_APP_URL.baseUrl}/sys/common/static/${logoUrl}`);
|
|
faviconIcon.setAttribute('href', `${VUE_APP_URL.baseUrl}/sys/common/static/${logoUrl}`);
|
|
@@ -47,11 +48,11 @@ const getUrl = () => {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
export async function getRemoteSetting() {
|
|
export async function getRemoteSetting() {
|
|
|
- if (!sysOrgCode) {
|
|
|
|
|
- try {
|
|
|
|
|
- await getUrl();
|
|
|
|
|
- } catch (error) {}
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if (!sysOrgCode) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ await getUrl();
|
|
|
|
|
+ } catch (error) {}
|
|
|
|
|
+ // }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
export const useGlobSetting = (): Readonly<GlobConfig> => {
|
|
export const useGlobSetting = (): Readonly<GlobConfig> => {
|