diff --git a/src/api/login.ts b/src/api/login.ts index c7c291e..38b61a0 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -100,11 +100,11 @@ export function getInfo(): AxiosPromise { } // 获取租户列表 -export function getTenantList(): AxiosPromise { +export function getTenantList(isToken: boolean): AxiosPromise { return request({ url: '/auth/tenant/list', headers: { - isToken: false + isToken: isToken }, method: 'get' }); diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index c2ed0b6..617c5da 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -142,7 +142,7 @@ const dynamicClearEvent = async () => { /** 租户列表 */ const initTenantList = async () => { - const { data } = await getTenantList(); + const { data } = await getTenantList(true); tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled; if (tenantEnabled.value) { tenantList.value = data.voList; diff --git a/src/views/login.vue b/src/views/login.vue index db1fca6..71d5dcd 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -176,7 +176,7 @@ const getLoginData = () => { * 获取租户列表 */ const initTenantList = async () => { - const { data } = await getTenantList(); + const { data } = await getTenantList(false); tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled; if (tenantEnabled.value) { tenantList.value = data.voList; diff --git a/src/views/register.vue b/src/views/register.vue index c3d1930..4e67a67 100644 --- a/src/views/register.vue +++ b/src/views/register.vue @@ -140,7 +140,7 @@ const getCode = async () => { }; const initTenantList = async () => { - const { data } = await getTenantList(); + const { data } = await getTenantList(false); tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled; if (tenantEnabled.value) { tenantList.value = data.voList; diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 46bffd2..c53d41b 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -81,7 +81,7 @@