Merge branch 'master' into dev_info

src/pages/user/login/login.js

@@ -511,9 +511,9 @@ class Login {
         cacheBust: true,
       })
       .then(response => {
-        console.log('sceen wx', response);
         if (response.token) {
           self.globalConfig.token = response.token;
+          Cookies.set('token', response.token);
           self.updateConfig && self.updateConfig(this.globalConfig);
           self.isSignIn = true;
           self.getUserInfoAndConfig();
@@ -600,8 +600,8 @@ class Login {
   }
 
   getUserInfoAndConfig(failCallback, flag, industry) {
-    // const { token } = this.globalConfig;
-    const token = Cookies.get('token');
+    const { token: tk } = this.globalConfig;
+    const token = tk || Cookies.get('token')
     const site = Cookies.get('site');
     const self = this;
     /* eslint-disable */