fix

README.md

@@ -3,8 +3,8 @@
 > A Vue.js project
 
 ## Build Setup
-
 ``` bash
+#pc、h5通用登录页面跳转去别的地方
 # install dependencies
 npm install
 

src/apis/login.js

@@ -33,7 +33,8 @@ export default {
       url: "/app/common/live/sms",
       method: "post",
       data: data,
-      noToken: true
+      noToken: true,
+      hasTenantId:true
     });
   },
   /**

src/axios.js

@@ -1,7 +1,7 @@
 import axios from "axios";
 import { Message } from "element-ui";
-// export const BASE_URL = "https://api.xyyxt.net"; //正式
-export const BASE_URL = "http://120.79.166.78:19012"; //测试
+export const BASE_URL = "https://api.xyyxt.net"; //正式
+// export const BASE_URL = "http://120.79.166.78:19012"; //测试
 export const BASE_IMG_URL = "https://file.xyyxt.net/";
 
 // 创建 axios 实例
@@ -22,10 +22,12 @@ const err = error => {
   }
   return Promise.reject(error);
 };
-
+console.log(sessionStorage.getItem('tenantId'),'see')
 // request interceptor(请求拦截器)
 request.interceptors.request.use(config => {
-  // config.headers["TenantId"] = tenantId;
+  if(config.hasTenantId && sessionStorage.getItem('tenantId')){
+    config.headers["TenantId"] = sessionStorage.getItem('tenantId');
+  }
   return config;
 }, err);
 

src/pages/login/index.vue

@@ -285,6 +285,11 @@ export default {
       });
       return;
     }
+    if (this.getQueryString("tenantId")) {
+      sessionStorage.setItem("tenantId", this.getQueryString("tenantId"));
+    }else{
+      sessionStorage.removeItem('tenantId')
+    }
     const item = JSON.parse(localStorage.getItem("user_account"));
     if (item) {
       let date = new Date().getTime();
@@ -313,7 +318,8 @@ export default {
       return {
         param: this.getQueryString("param"),
         urlType: this.isMobile ? 1 : 2,
-        type: 1
+        type: 1,
+        tenantId:this.getQueryString("tenantId")
       };
     }
   },
@@ -328,6 +334,11 @@ export default {
      * 微信登入—返回数据
      */
     loginBack({ url, user_account }, isSet = true) {
+      if(this.isMobile){
+        if(url.indexOf("pages5") == -1){
+          url = url.replace("pages","pages5")
+        }
+      }
       isSet &&
         localStorage.setItem(
           "user_account",