Merge branch 'test' of http://120.79.166.78:19005/zhongzheng-edu/zz-admin into test

src/utils/request.js

@@ -31,9 +31,12 @@ service.interceptors.request.use(
         }
         if (sessionStorage.TenantId && sessionStorage.TenantId !== 'undefined') {
             config.headers.TenantId = sessionStorage.TenantId; //存在的话 就携带 token
-        } else if (router.history.pending !== null && router.history.pending.query.TenantId) {
-            config.headers.TenantId = router.history.pending.query.TenantId
-            sessionStorage.TenantId = router.history.pending.query.TenantId;
+        } else if (router.history.current !== null && router.history.current.query.TenantId) {
+            config.headers.TenantId = router.history.current.query.TenantId
+            sessionStorage.TenantId = router.history.current.query.TenantId;
+        }else{
+            console.log('router.history:',router.history)
+            console.log('sessionStorage.TenantId:',sessionStorage.TenantId)
         }
         return config;   //  然后把配置返回
     },