merge: merge master-xuli branch

7fc3ec74 · 邓晓峰 · 25083383 · 7fc3ec74 · 7fc3ec74
Commit 7fc3ec74 authored Nov 23, 2021 by 邓晓峰
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

app.js src/app.js +1 -0

micro.js src/micro.js +1 -1

No files found.
--- a/src/app.js
+++ b/src/app.js
@@ -132,6 +132,7 @@ const initGlobalConfig = () => {
          if (!data.client) {
            data.client = 'city';
          }
+          Cookies.set('city', data.client);
          store.dispatch(
            actionCreators.getConfig(
              Object.assign({}, window.globalConfig, data),

--- a/src/micro.js
+++ b/src/micro.js
@@ -117,7 +117,7 @@ export const initMicroApps = (loader, store) => {
        excludeAssetFilter: url =>
            url.indexOf('framework/highcharts') !== -1 ||
            // url.indexOf('framework/amap/AMap.UI') !== -1 ||
-            // url.indexOf('framework/amap/init.js') !== -1 ||
+            url.indexOf('framework/amap/init.js') !== -1 ||
            url.indexOf('jquery') !== -1 ||
            url.indexOf('managers/MapManager.js') !== -1 ||
            url.indexOf('jquery.mCustomScrollbar.js') !== -1 ||