Commit 1c43aa25 authored by 邓晓峰's avatar 邓晓峰

fix: 修复登陆信息混乱

parent b5ca84d4
Pipeline #40630 passed with stages
in 3 minutes 35 seconds
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
// }, // },
{ {
name: 'civ_pandawork', name: 'civ_pandawork',
entry: `//${window.location.hostname}:8081/civ_pandawork`, entry: `//${window.location.hostname}:8080/civ_pandawork`,
container: '#micro-container', container: '#micro-container',
activeRule: '/civbase/civ_pandawork', activeRule: '/civbase/civ_pandawork',
}, },
......
...@@ -60,7 +60,7 @@ export const initGlobalConfig = (loader, store, render) => { ...@@ -60,7 +60,7 @@ export const initGlobalConfig = (loader, store, render) => {
}) })
.then(res => { .then(res => {
if (res) { if (res) {
store.dispatch(actionCreators.getConfig(Object.assign({})))
const data = res; const data = res;
if (!data.client) { if (!data.client) {
data.client = params.getParams('client') || 'city'; data.client = params.getParams('client') || 'city';
......
...@@ -497,7 +497,7 @@ const BasicLayout = props => { ...@@ -497,7 +497,7 @@ const BasicLayout = props => {
setCollapse(!collapse); setCollapse(!collapse);
} }
const logo = props.global.get('bannerLogo')? window.globalConfig.transformDevAssetsBaseURL(props.global.get('bannerLogo')): defaultSetting.logo; // const logo = props.global && props.global.get('bannerLogo')? window.globalConfig.transformDevAssetsBaseURL(props.global.get('bannerLogo')): defaultSetting.logo;
return ( return (
<SecurityLayout loading> <SecurityLayout loading>
......
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