Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/CivWeb

c8acba2c · 邓晓峰 · aee2fbd4 · 75c669ea · c8acba2c
Commit c8acba2c authored Apr 14, 2022 by 邓晓峰
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

initConfig.js src/initConfig.js +6 -3

No files found.
--- a/src/initConfig.js
+++ b/src/initConfig.js
@@ -97,9 +97,12 @@ export const initGlobalConfig = () => {
                // eslint-disable-next-line no-new
                new Login(
                  {
-                    global: Object.assign({}, data, {
+                    global: Object.assign({}, data,
-                      token: getToken(),
+                      {
-                    }),
+                        token: getToken(),
+                      },
+                      gateWayConfig,
+                    ),
                    // eslint-disable-next-line no-shadow
                    updateConfig: data =>
                      store.dispatch(actionCreators.getConfig(data)),