Commit 7fde2355 authored by 邓晓峰's avatar 邓晓峰

chore: 升级kit_global_config

parent 908c0c14
Pipeline #40667 passed with stages
in 6 minutes 2 seconds
......@@ -11,7 +11,7 @@ export const initGlobalConfig = (loader, store, render) => {
// eslint-disable-next-line no-debugger
// eslint-disable-next-line no-undef
createStoreage.remove(`__PANDA_STORE__${location.hostname}`);
let config = createStoreage.get('globalConfig') || {};
store.dispatch(actionCreators.updateComplexConfig({}));
if (!getToken() || config.token == null) {
......@@ -71,7 +71,7 @@ export const initGlobalConfig = (loader, store, render) => {
// Cookies.set('city', data.client);
store.dispatch(
actionCreators.getConfig(
Object.assign({}, window.globalConfig, data),
Object.assign({}, data),
),
);
......
......@@ -625,11 +625,11 @@ class Login {
self.globalConfig.userInfo = Object.assign(
{},
response,
self.globalConfig.userInfo,
);
if(response.hasOwnProperty('data')) {
self.globalConfig.userInfo = {
... self.globalConfig.userInfo,
// ... self.globalConfig.userInfo,
...response.data
}
}
......
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