Merge branch 'dev-cloud' into 'master'

src/initConfig.js

@@ -60,7 +60,8 @@ export const initGlobalConfig = () => {
         }
       });
       // eslint-disable-next-line react-hooks/rules-of-hooks
-    const client = params.getParams('client') || Cookies.get('city')
+    let client = params.getParams('client') || Cookies.get('city')
+    client = client && client !== 'undefined' ? client : 'city';
     appService
         .queryConfig({
           client: client || 'city',
@@ -72,7 +73,7 @@ export const initGlobalConfig = () => {
             store.dispatch(actionCreators.getConfig(Object.assign({})));
             const data = res;
             if (!data.client) {
-              data.client = params.getParams('client') || Cookies.get('city');
+              data.client = client;
             }
             // Cookies.set('city', data.client);
             store.dispatch(

src/layouts/BasicLayout1.js

@@ -360,7 +360,7 @@ const BasicLayout = props => {
   useEffect(() => {
     siteAction.setGlobalConfig(props.global);
     if (!Cookies.get('token')) {
-      let client = props.global && props.global.client;
+      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;
       generateType = !_.isNull(generateType) && !_.isUndefined(generateType) && generateType !== 'undefined' ? `&generateType=${generateType}` : '';