From ef42e2f013c8e8a082038c922c20f1ff58e79e71 Mon Sep 17 00:00:00 2001 From: xlsea Date: Fri, 16 May 2025 20:36:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E7=A7=9F=E6=88=B7=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/custom/tenant-select.vue | 16 +++++++++------- src/views/_builtin/login/modules/pwd-login.vue | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/components/custom/tenant-select.vue b/src/components/custom/tenant-select.vue index a23d31a5..7f9dbcb6 100644 --- a/src/components/custom/tenant-select.vue +++ b/src/components/custom/tenant-select.vue @@ -25,7 +25,7 @@ const { clearTabs } = useTabStore(); const { toHome } = useRouterPush(); const tenantId = defineModel('tenantId', { required: false, default: undefined }); -const enabled = defineModel('enabled', { required: false, default: true }); +const enabled = defineModel('enabled', { required: false, default: false }); const lastSelected = ref(); @@ -71,12 +71,14 @@ async function handleFetchTenantList() { const { data, error } = await fetchTenantList(); if (error) return; enabled.value = data.tenantEnabled; - tenantOption.value = data.voList.map(tenant => { - return { - label: tenant.companyName, - value: tenant.tenantId - }; - }); + if (data.tenantEnabled) { + tenantOption.value = data.voList.map(tenant => { + return { + label: tenant.companyName, + value: tenant.tenantId + }; + }); + } endLoading(); } onMounted(async () => { diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue index 7763a25e..7bc337a7 100644 --- a/src/views/_builtin/login/modules/pwd-login.vue +++ b/src/views/_builtin/login/modules/pwd-login.vue @@ -20,11 +20,11 @@ const { loading: codeLoading, startLoading: startCodeLoading, endLoading: endCod const { loading: tenantLoading, startLoading: startTenantLoading, endLoading: endTenantLoading } = useLoading(); const codeUrl = ref(); -const captchaEnabled = ref(true); +const captchaEnabled = ref(false); const registerEnabled = ref(false); const remberMe = ref(false); -const tenantEnabled = ref(true); +const tenantEnabled = ref(false); const tenantOption = ref([]);