From fdfb556c8e1eb40c61e8867297109b7afea5de71 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 05 十一月 2024 14:29:24 +0800
Subject: [PATCH] update 优化 getTenantList 接口动态决定是否传token
---
src/views/register.vue | 2 +-
src/views/system/user/index.vue | 2 +-
src/views/login.vue | 2 +-
src/layout/components/Navbar.vue | 2 +-
src/api/login.ts | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
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 getTenantList(): AxiosPromise<TenantInfo> {
+export function getTenantList(isToken: boolean): AxiosPromise<TenantInfo> {
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 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 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 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 @@
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item icon="Download" @click="importTemplate">涓嬭浇妯℃澘</el-dropdown-item>
- <el-dropdown-item icon="Top" @click="handleImport"> 瀵煎叆鏁版嵁</el-dropdown-item>
+ <el-dropdown-item icon="Top" @click="handleImport">瀵煎叆鏁版嵁</el-dropdown-item>
<el-dropdown-item icon="Download" @click="handleExport"> 瀵煎嚭鏁版嵁</el-dropdown-item>
</el-dropdown-menu>
</template>
--
Gitblit v1.9.3