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

src/components/GlobalHeader/ExtendRightContent.js

@@ -129,12 +129,12 @@ const GlobalHeaderRight = props => {
       url = `civweb4/${url.replace(/^\//, '').replace(/^civweb4\//, '')}`
     }
     window.share.event.emit('goHome', `/${url}`);
-    url ? (
-      window.share.event.emit('listenerMointer', {
-        label: '首页',
-        url: url.replace(/^civweb4\//, ''),
-      })
-    ) : null;
+    // url ? (
+    //   window.share.event.emit('listenerMointer', {
+    //     label: '首页',
+    //     url: url.replace(/^civweb4\//, ''),
+    //   })
+    // ) : null;
   };
 
 

src/layouts/BasicLayout1.js

@@ -362,7 +362,7 @@ const BasicLayout = props => {
     if (!Cookies.get('token')) {
       let client = props.global && props.global.client;
       client = client !== 'undefined' && !_.isNull(client) && !_.isUndefined(client) ? client: 'city';
-      let generateType = props.global && props.global.hasOwnProperty('get') && props.global.get('generateType');
+      let generateType = props.global && props.global.hasOwnProperty('get') ? props.global.get('generateType') : null;
       generateType = !_.isNull(generateType) && !_.isUndefined(generateType) && generateType !== 'undefined' ? `&generateType=${generateType}` : '';
       history.replace(`/user/login?client=${client}${generateType}`);
       props.logout();