Merge branch 'dev-cloud' into 'master'

src/initConfig.js

@@ -64,6 +64,7 @@ export const initGlobalConfig = () => {
     appService
         .queryConfig({
           client: client || 'city',
+          ignoreSite: true,
         })
         .then(res => {
           if (res) {

src/layouts/BasicLayout1.js

@@ -299,9 +299,11 @@ const BasicLayout = props => {
       currentChildrenRoute && currentChildrenRoute.routes ? setChildrenRoutes(currentChildrenRoute.routes): setChildrenRoutes([currentChildrenRoute]);
 
     } else {
-      let url = _.isString(props.global.get('homepage'))
+      let url = props.global && props.global.hasOwnProperty('get') && props.global.get('homepage') 
+        ? _.isString(props.global.get('homepage'))
         ? props.global.get('homepage')
-        : props.global.get('homepage.url');
+        : props.global.get('homepage.url')
+        : '';
       if(!props.global.get('home')) {
         url = `civweb4/${url.replace(/^\//, '').replace(/^civweb4\//, '')}`
       }

src/layouts/Site.js

@@ -14,6 +14,8 @@ import { appService } from '../api';
 import CitySelector from '../components/CitySelector';
 import Login from '../pages/user/login/login';
 import styles from './UserLayout.less';
+import { initMicroApps } from '@/micro';
+
 
 const { Link } = Anchor;
 
@@ -343,6 +345,8 @@ class Site {
       // eslint-disable-next-line no-unused-expressions
       self.props.updateCurrentIndex && self.props.updateCurrentIndex(0);
 
+      initMicroApps();
+
       // 切换站点后，重置掉三级菜单
       const homeType = self.globalConfig.homeType || 'civweb4';
       const homePath = 

src/pages/bootpage/index.js

@@ -58,11 +58,14 @@ const renderIndustries = (config, callback) =>
     }
   });
 
-let loginAction = null;
+// let loginAction = null;
 const BootPage = props => {
   const [loadding, setLoadding] = useState(false);
   const [hasRole, setHasRole] = useState(false);
   const [scale, setScale] = useState(1);
+  const [loginAction, setAction] = useState(
+    () => new LoginAction(props),
+  );
   const history = useHistory();
   useDocumentTitle(
     { title: defaultSetting.title, id: '', pageName: '行业切换' },
@@ -80,18 +83,6 @@ const BootPage = props => {
     props.instance && props.instance.updateConfig(config);
     // props.instance && props.instance.getUserInfoAndConfig('', true, type);
     loginAction && loginAction.getUserInfoAndConfig('', true, type);
-    // eslint-disable-next-line no-shadow
-    // loginAction.events.on('toggleIndustry', event => {
-    //   setLoadding(false);
-    //   // props.history.push(`/?client=${props.global.client}`);
-    //   debugger
-    //   initMicroApps();
-    //   // 加载首页
-    //   history.push(props.global.homepage ?? `/?client=${props.global.client}`);
-    //   window.share.event.emit('triggerMicro', props.global);
-    //   props.updateCurrentIndex(0);
-    //   // window.location.reload();
-    // });
   }, []);
   useEffect(() => {
     // eslint-disable-next-line no-use-before-define
@@ -106,22 +97,20 @@ const BootPage = props => {
   };
   useEffect(() => {
     window.addEventListener('resize', handleResize);
-    loginAction = new LoginAction(props);
-    loginAction.events.on('toggleIndustry', event => {
+
+    const handleToggleIndustry = event => {
       setLoadding(false);
       props.history.push(`/?client=${props.global.client}`);
       initMicroApps();
-      // 加载首页
-      // history.push(props.global.homepage ?? `/?client=${props.global.client}`);
       window.share.event.emit('triggerMicro', props.global);
       props.updateCurrentIndex(0);
-      // window.location.reload();
-    });
+    }
+    loginAction.events.on('toggleIndustry', handleToggleIndustry);
     return () => {
       window.removeEventListener('resize', handleResize);
-      loginAction.events.removeAllListeners('toggleIndustry');
+      loginAction.events.removeListener('toggleIndustry', handleToggleIndustry);
     };
-  });
+  }, []);
   const renderIndustr = useMemo(
     () => renderIndustries(props.global, handlePage),
     [],

src/pages/bootpage/index.less

@@ -53,12 +53,10 @@
         width: 2px;
       }
       .bootPageUl {
-        // display: flex;
-        // width: 1280px;
-        // flex-wrap: wrap;
-        // justify-content: center;
-        display: grid;
-        grid-template-columns: repeat(4, 25%);
+        display: flex;
+        width: 1280px;
+        flex-wrap: wrap;
+        justify-content: center;
         list-style: none;
         transition: all .5s ease-out;
         overflow: hidden;

src/pages/user/login/login.js

@@ -857,7 +857,6 @@ class Login {
   }
 
   login(usr, pwd, userPhone, isRememberPWD, mode = SERVICE_APP_LOGIN_MODE.password) {
-    this.events.removeAllListeners('loginError');
     const self = this;
     if(window.globalConfig && window.globalConfig.hasGateWay) {
       usr = userPhone ? userPhone: usr;