This commit is contained in:
ailanyin
2023-06-12 15:54:13 +08:00
parent b6fdcba1c3
commit 830e2e9054
3 changed files with 259 additions and 257 deletions

View File

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

View File

@ -1,10 +1,5 @@
import axios from "axios"; import axios from "axios";
import { import {ElLoading, ElMessage, ElMessageBox, ElNotification,} from "element-plus";
ElLoading,
ElMessage,
ElMessageBox,
ElNotification,
} from "element-plus";
import {getToken} from "@/utils/auth"; import {getToken} from "@/utils/auth";
import errorCode from "@/utils/errorCode"; import errorCode from "@/utils/errorCode";
import {blobValidate, tansParams} from "@/utils/ruoyi"; import {blobValidate, tansParams} from "@/utils/ruoyi";
@ -35,9 +30,13 @@ service.interceptors.request.use(
if (getToken() && !isToken) { if (getToken() && !isToken) {
config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改 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; config.headers["tenant"] = useUserStore().tenant;
} }
// }
// get请求映射params参数 // get请求映射params参数
if (config.method === "get" && config.params) { if (config.method === "get" && config.params) {
let url = config.url + "?" + tansParams(config.params); let url = config.url + "?" + tansParams(config.params);

View File

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