From fdfb556c8e1eb40c61e8867297109b7afea5de71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Tue, 5 Nov 2024 14:29:13 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20getTenantList=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=A8=E6=80=81=E5=86=B3=E5=AE=9A=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E4=BC=A0token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.ts                 | 4 ++--
 src/layout/components/Navbar.vue | 2 +-
 src/views/login.vue              | 2 +-
 src/views/register.vue           | 2 +-
 src/views/system/user/index.vue  | 2 +-
 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 getInfo(): AxiosPromise<UserInfo> {
 }
 
 // 获取租户列表
-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 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 @@
                   <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>