diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 4ec2e28..6576c8c 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -117,8 +117,10 @@ function dynamicClearEvent() { function initTenantList() { getTenantList().then(res => { const vo = res.data; - tenantList.value = vo.voList; tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled; + if (tenantEnabled.value) { + tenantList.value = vo.voList; + } }); } diff --git a/src/views/login.vue b/src/views/login.vue index 4ec8ec4..56f0086 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -157,11 +157,13 @@ function getCode() { function initTenantList() { getTenantList().then(res => { const vo = res.data; - tenantList.value = vo.voList; - if (tenantList.value != null && tenantList.value.length !== 0) { - loginForm.value.tenantId = tenantList.value[0].tenantId; - } tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled; + if (tenantEnabled.value) { + tenantList.value = vo.voList; + if (tenantList.value != null && tenantList.value.length !== 0) { + loginForm.value.tenantId = tenantList.value[0].tenantId; + } + } }); } diff --git a/src/views/register.vue b/src/views/register.vue index 4f18274..577a6e5 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -173,11 +173,13 @@ function getCode() { function initTenantList() { getTenantList().then(res => { const vo = res.data; - tenantList.value = vo.voList; - if (tenantList.value != null && tenantList.value.length !== 0) { - loginForm.value.tenantId = tenantList.value[0].tenantId; - } tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled; + if (tenantEnabled.value) { + tenantList.value = vo.voList; + if (tenantList.value != null && tenantList.value.length !== 0) { + loginForm.value.tenantId = tenantList.value[0].tenantId; + } + } }); }