Commit 5a5e91cb authored by 邓晓峰's avatar 邓晓峰

fix: 修复首页配置

parent cd42f110
...@@ -441,7 +441,7 @@ const BasicLayout = props => { ...@@ -441,7 +441,7 @@ const BasicLayout = props => {
} }
const handleSelectMenuItem = (item) => { const handleSelectMenuItem = (item) => {
debugger
setTabActiveKey(item); setTabActiveKey(item);
if(item.indexOf('web_console') === -1) { if(item.indexOf('web_console') === -1) {
window.history.pushState(null, '', `/civbase${item}`); window.history.pushState(null, '', `/civbase${item}`);
......
...@@ -30,6 +30,7 @@ class SecurityLayout extends React.Component { ...@@ -30,6 +30,7 @@ class SecurityLayout extends React.Component {
// }); // });
if(_.isNull(global.token) || (global.hasGateWay && _.isNull(global.access_token))) { if(_.isNull(global.token) || (global.hasGateWay && _.isNull(global.access_token))) {
debugger
this.props.updateCurrentIndex && this.props.updateCurrentIndex(0); this.props.updateCurrentIndex && this.props.updateCurrentIndex(0);
let client = global.client || Cookies.get('city'); let client = global.client || Cookies.get('city');
client = client !== 'undefined' || !_.isNull(client) || !_.isUndefined(client) ? client: 'city'; client = client !== 'undefined' || !_.isNull(client) || !_.isUndefined(client) ? client: 'city';
......
...@@ -82,7 +82,9 @@ export const initMicroApps = () => { ...@@ -82,7 +82,9 @@ export const initMicroApps = () => {
baseRoot: item.name, baseRoot: item.name,
// eslint- // eslint-
// disable-next-line no-undef // disable-next-line no-undef
globalConfig: config, globalConfig: /civweb4/.test(item.name) ? Object.assign({}, config, {
homepage: config.homepage ? config.homepage.replace(/civweb\//, ''): config.homepage
}): config,
//createStoreage.get('globalConfig'), //createStoreage.get('globalConfig'),
XMLHttpRequest: window.XMLHttpRequest, XMLHttpRequest: window.XMLHttpRequest,
}; };
......
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