Commit 0443c331 authored by 李纪文's avatar 李纪文

fix: 首页跳转问题

parent 13a3830d
Pipeline #42021 passed with stages
in 1 minute 34 seconds
...@@ -94,7 +94,6 @@ const appReducer = (state = initialState, action) => { ...@@ -94,7 +94,6 @@ const appReducer = (state = initialState, action) => {
window.__INITIAL_STATE__.mdi = 'SDI'; window.__INITIAL_STATE__.mdi = 'SDI';
window.__INITIAL_STATE__.menu = 'banner-left'; window.__INITIAL_STATE__.menu = 'banner-left';
window.globalConfig = AppConfig(window.__INITIAL_STATE__); window.globalConfig = AppConfig(window.__INITIAL_STATE__);
window.globalConfig.productType = 'civweb4';
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
createStoreage.set('globalConfig', window.globalConfig); createStoreage.set('globalConfig', window.globalConfig);
// eslint-disable-next-line no-undef,no-case-declarations // eslint-disable-next-line no-undef,no-case-declarations
......
...@@ -223,7 +223,7 @@ export const defaultApp = () => { ...@@ -223,7 +223,7 @@ export const defaultApp = () => {
// if(config.productType && config.productType !== 'civweb4') { // if(config.productType && config.productType !== 'civweb4') {
// setDefaultMountApp(`/civbase/${config.productType}/${config.homepage.replace(/^\//, '')}`); // setDefaultMountApp(`/civbase/${config.productType}/${config.homepage.replace(/^\//, '')}`);
// } else { // } else {
// const homepage = _.isNull(config.productType) ? '/index': '/' + config.homepage; // const homepage = _.isNull(config.homepage) ? '/index': '/' + config.homepage;
// setDefaultMountApp(`/${pkg.name.toLocaleLowerCase()}/civweb4${homepage}`); // setDefaultMountApp(`/${pkg.name.toLocaleLowerCase()}/civweb4${homepage}`);
// createStoreage.set('init_web4', true) // createStoreage.set('init_web4', true)
// } // }
......
...@@ -223,7 +223,7 @@ class Login { ...@@ -223,7 +223,7 @@ class Login {
menu: self.globalConfig.menu, menu: self.globalConfig.menu,
style: self.globalConfig.style, style: self.globalConfig.style,
homepage: params.getParams('redirect') || self.globalConfig.homepage || config.homepage, homepage: params.getParams('redirect') || self.globalConfig.homepage || config.homepage,
productType: config.productType || self.globalConfig.productType || 'civweb4' // productType: config.productType || self.globalConfig.productType || 'civweb4'
}); });
if(self.globalConfig.hasOwnProperty('webConfig')) { if(self.globalConfig.hasOwnProperty('webConfig')) {
...@@ -235,8 +235,8 @@ class Login { ...@@ -235,8 +235,8 @@ class Login {
} }
self.updateConfig && self.updateConfig(self.globalConfig); self.updateConfig && self.updateConfig(self.globalConfig);
createStoreage.set('globalConfig', self.globalConfig); // createStoreage.set('globalConfig', self.globalConfig);
window.globalConfig.productType = self.globalConfig.productType; // window.globalConfig.productType = self.globalConfig.productType;
self.getProjectItems().then(() => { self.getProjectItems().then(() => {
window.subSysCfg = {}; window.subSysCfg = {};
result.forEach(item => { result.forEach(item => {
...@@ -287,8 +287,8 @@ class Login { ...@@ -287,8 +287,8 @@ class Login {
if (mainConf.menu) self.globalConfig.menu = mainConf.menu; if (mainConf.menu) self.globalConfig.menu = mainConf.menu;
if (mainConf.shortcutIcon) if (mainConf.shortcutIcon)
self.globalConfig.shortcutIcon = mainConf.shortcutIcon; self.globalConfig.shortcutIcon = mainConf.shortcutIcon;
if (mainConf.productType) // if (mainConf.productType)
self.globalConfig.productType = mainConf.productType; // self.globalConfig.productType = mainConf.productType;
} }
self.updateConfig && self.updateConfig(self.globalConfig); self.updateConfig && self.updateConfig(self.globalConfig);
// console.log("===loginSuccess===") // console.log("===loginSuccess===")
...@@ -301,8 +301,8 @@ class Login { ...@@ -301,8 +301,8 @@ class Login {
} else { } else {
// loginSuccess // loginSuccess
self.updateConfig && self.updateConfig(self.globalConfig); self.updateConfig && self.updateConfig(self.globalConfig);
createStoreage.set('globalConfig', self.globalConfig); // createStoreage.set('globalConfig', self.globalConfig);
window.globalConfig.productType = self.globalConfig.productType; // window.globalConfig.productType = self.globalConfig.productType;
// console.log("===loginSuccess===") // console.log("===loginSuccess===")
getIndustry getIndustry
? self.events.emit('toggleIndustry') ? self.events.emit('toggleIndustry')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment