qj-common 4.1.21 → 4.1.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qj-common",
-  "version": "4.1.21",
+  "version": "4.1.22",
   "description": "common files && template for qj-paas",
   "scripts": {
     "gulp": "gulp css"

package/src/utils/request.js

@@ -181,7 +181,7 @@ service.interceptors.request.use(
 
     // Reset Config -- By Joenix
     config = interceptor(config);
-   
+
     if (getLocalStorage('saas-tenantcode')) {
       config.headers['saas-tenantcode'] = getLocalStorage('saas-tenantcode');
     }
@@ -193,8 +193,8 @@ service.interceptors.request.use(
     }else if(getQueryString('saas-token')){
         config.headers['saas-token'] = getQueryString('saas-token');
         console.log('saas-token',getQueryString('saas-token'));
-    }else if(getLocalStorage('saas-token')){
-        config.headers['saas-token'] = getLocalStorage('saas-token');
+    }else if(getLocalStorage('saas-token') || getLocalStorage('saasToken')){
+      config.headers['saas-token'] = getLocalStorage('saas-token') || getLocalStorage('saasToken');
     }
     if (getLocalStorage('saas-proappcode')) {
       config.headers['saas-proappcode'] = getLocalStorage('saas-proappcode');
@@ -280,7 +280,7 @@ service.interceptors.response.use(
       window.sessionStorage.setItem('cookieKey', cookieKey);
       let menuCode = window.sessionStorage.getItem('menuCode') ? window.sessionStorage.getItem('menuCode') : '';
 
-      
+
       setLocalStorage('saas-tenantcode', tenantcode);
       setLocalStorage('saas-token', token);
       setLocalStorage('saas-proappcode', proappcode);
@@ -311,7 +311,7 @@ service.interceptors.response.use(
             }
           // window.location.href = process.env.API_ROOT + nJson.loginurl
         } else {
-          // 如果检查到没有登录，则清除保存的登录cookie 
+          // 如果检查到没有登录，则清除保存的登录cookie
             if(!window.qs){
                 let newDomain = document.domain
                     .split('.')