bugfix

src/api/login.js

@@ -1,4 +1,5 @@
 import request from "@/utils/request";
+import useUserStore from "@/store/modules/user";
 
 // 登录方法
 export function login(username, password, code, uuid) {

src/utils/request.js

@@ -1,20 +1,15 @@
 import axios from "axios";
-import {
-  ElLoading,
-  ElMessage,
-  ElMessageBox,
-  ElNotification,
-} from "element-plus";
-import { getToken } from "@/utils/auth";
+import {ElLoading, ElMessage, ElMessageBox, ElNotification,} from "element-plus";
+import {getToken} from "@/utils/auth";
 import errorCode from "@/utils/errorCode";
-import { blobValidate, tansParams } from "@/utils/ruoyi";
+import {blobValidate, tansParams} from "@/utils/ruoyi";
 import cache from "@/plugins/cache";
-import { saveAs } from "file-saver";
+import {saveAs} from "file-saver";
 import useUserStore from "@/store/modules/user";
 
 let downloadLoadingInstance;
 // 是否显示重新登录
-export let isRelogin = { show: false };
+export let isRelogin = {show: false};
 
 axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
@@ -35,9 +30,13 @@ service.interceptors.request.use(
         if (getToken() && !isToken) {
             config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
         }
-    if (useUserStore().tenant) {
+        // if (useUserStore().tenant) {
+        if (config.url === "/captchaImage") {
+            config.headers["tenant"] = useUserStore().tempTenant;
+        } else {
             config.headers["tenant"] = useUserStore().tenant;
         }
+        // }
         // get请求映射params参数
         if (config.method === "get" && config.params) {
             let url = config.url + "?" + tansParams(config.params);
@@ -159,13 +158,13 @@ service.interceptors.response.use(
             }
             return Promise.reject("您已被挤下线");
         } else if (code === 500) {
-      ElMessage({ message: msg, type: "error" });
+            ElMessage({message: msg, type: "error"});
             return Promise.reject(new Error(msg));
         } else if (code === 601) {
-      ElMessage({ message: msg, type: "warning" });
+            ElMessage({message: msg, type: "warning"});
             return Promise.reject(new Error(msg));
         } else if (code !== 200) {
-      ElNotification.error({ title: msg });
+            ElNotification.error({title: msg});
             return Promise.reject("error");
         } else {
             return Promise.resolve(res.data);
@@ -173,7 +172,7 @@ service.interceptors.response.use(
     },
     (error) => {
         console.log("err" + error);
-    let { message } = error;
+        let {message} = error;
         if (message == "Network Error") {
             message = "后端接口连接异常";
         } else if (message.includes("timeout")) {
@@ -181,7 +180,7 @@ service.interceptors.response.use(
         } else if (message.includes("Request failed with status code")) {
             message = "系统接口" + message.substr(message.length - 3) + "异常";
         }
-    ElMessage({ message: message, type: "error", duration: 5 * 1000 });
+        ElMessage({message: message, type: "error", duration: 5 * 1000});
         return Promise.reject(error);
     }
 );
@@ -199,7 +198,7 @@ export function download(url, params, filename, config) {
                     return tansParams(params);
                 },
             ],
-      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+            headers: {"Content-Type": "application/x-www-form-urlencoded"},
             responseType: "blob",
             ...config,
         })

src/views/login.vue

@@ -231,7 +231,9 @@ const handleTenantConfirm = (option) => {
 };
 
 watchEffect(() => {
+  console.log(loginForm.value.tenant)
   if (loginForm.value.tenant) {
+    console.log('getcode')
     getCode();
   }
 })