diff --git a/Web/src/views/login/component/account.vue b/Web/src/views/login/component/account.vue index cda82f49..8fb513d9 100644 --- a/Web/src/views/login/component/account.vue +++ b/Web/src/views/login/component/account.vue @@ -229,8 +229,7 @@ const onSignIn = async () => { const publicKey = window.__env__.VITE_SM_PUBLIC_KEY; const password = sm2.doEncrypt(state.ruleForm.password, publicKey, 1); - //const tenantid = route.query.tid ?? 0; - const tenantid = Local.get('tid') ?? 0; + const tenantid = route.query.tid ?? 0; const [err, res] = await feature(getAPI(SysAuthApi).apiSysAuthLoginPost({ ...state.ruleForm, password: password, tenantId: Number(tenantid) })); if (err) { getCaptcha(); // 重新获取验证码 diff --git a/Web/src/views/login/index.vue b/Web/src/views/login/index.vue index 3552f35f..722afd53 100644 --- a/Web/src/views/login/index.vue +++ b/Web/src/views/login/index.vue @@ -102,7 +102,7 @@ import { Local } from '/@/utils/storage'; // 引入多语言 import { languageList, getCountryCode } from '/@/i18n'; import '/node_modules/flag-icons/css/flag-icons.min.css'; -import { getTenantIdByHostname } from '/@/api/login/index'; + // 引入组件 const Account = defineAsyncComponent(() => import('/@/views/login/component/account.vue')); const Mobile = defineAsyncComponent(() => import('/@/views/login/component/mobile.vue')); @@ -129,13 +129,7 @@ onMounted(async () => { if (!route.query.tid) Local.remove('tid'); var tenantid = Number(route.query.tid); if (isNaN(tenantid)) { - // 确保hostname不包含端口号 - const hostnameWithoutPort = window.location.hostname; - const data = await getTenantIdByHostname(hostnameWithoutPort); - console.log('tenantid', data.data.result); - tenantid = data.data.result; - if (tenantid > 99999) - Local.set('tid', tenantid); + tenantid = 0; } else if (tenantid > 99999) { Local.set('tid', tenantid); }