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

src/layouts/BasicLayout.js

@@ -46,7 +46,6 @@ const optionsWith = [{ label: '按站点', value: 'site' }, { label: '按城市'
 const HOT = ['HOT', '县', '市', 'New'];
 const StationsItem = (item, action, onChangeVisible) => {
   const changeGroup = (event, data) => {  
-    debugger;
     action.changeGroup && action.changeGroup(event, data, onChangeVisible);
   };
   return (
@@ -191,7 +190,9 @@ const Layout = props => {
   const history = useHistory();
   useEffect(() => {
     siteAction.setGlobalConfig(props.global);
-    if (!Cookies.get('token')) {
+    const tk = Cookies.get('token') || props.global.token;
+    const isLogin = tk !== null && tk !== 'undefined' && tk !== (void 0);
+    if (!isLogin) {
       let client = props.global && props.global.hasOwnProperty('client') ? props.global.get('client') : null;
       client = client !== 'undefined' && !_.isNull(client) && !_.isUndefined(client) ? client : 'city';
       let generateType = props.global && props.global.hasOwnProperty('get') ? props.global.get('generateType') : null;
@@ -231,7 +232,6 @@ const Layout = props => {
 
   useEffect(() => {
     window.share.event.on('updateSite', res => {
-      debugger;
       setCityData(res);
     });
     return () => {

src/layouts/SecurityLayout.js

@@ -45,8 +45,8 @@ class SecurityLayout extends React.Component {
   render() {
     const { isReady } = this.state;
     const { children, global, loading } = this.props;
-    const isLogin = Cookies.get('token') !== null && global.token !== null;
-
+    const tk = Cookies.get('token') || global.token;
+    const isLogin = tk !== null && tk !== 'undefined' && tk !== (void 0);
     if (!isLogin && window.location.pathname !== '/civbase/user/login') {
       const { query = {}, search, pathname } = history.location;
       const { redirect } = query;
@@ -54,7 +54,7 @@ class SecurityLayout extends React.Component {
       //   redirect: pathname + search,
       // });
       this.props.updateCurrentIndex && this.props.updateCurrentIndex(0);
-      let client = global.client || Cookies.get('city');
+      let client = global.client || Cookies.get('client');
       client = client !== 'undefined' && !_.isNull(client) && !_.isUndefined(client) ? client : 'city';
       let { generateType } = global;
       generateType = !_.isNull(generateType) && !_.isUndefined(generateType) && generateType !== 'undefined' ? `&generateType=${generateType}` : '';

src/layouts/Site.js

@@ -361,6 +361,10 @@ class Site {
       window.share && window.share.event && window.share.event.emit('reloadNotice');
       const config = self.globalConfig;
       let url = !config.home ? ((config.homepage === '' || _.isNull(config.homepage)) ? `/civweb4`: `/civweb4/${config.homepage.replace(/^\//, '').replace(/^civweb4\//, '')}`) :  `/${config.homepage.replace(/^\//, '')}`;
+      // 在云平台上，切换前后如果url一致会出问题
+      if(config.userInfo && config.userInfo.site) {
+        url += `${url.indexOf('|') > -1 ? '&' : '|' }__site__=${config.userInfo.site}`;
+      }
       self.props.history && self.props.history.push(url);
       self.props && self.props.updateCollapsed && self.props.updateCollapsed(false);
       window.share.event.emit('triggerMicro', this.props.global);

src/pages/user/login/login.js

@@ -914,7 +914,6 @@ class Login {
     const self = this;
     const token = response && ( response.token ? response.token: ( response.access_token !== null && response.user_token !== null) ? response.user_token: '');
     if (token) {
-      Cookies.set('token', token);
       const exp = 86400000;
       self.globalConfig.token = token;
       if(response.access_token!== "") {