Browse Source

update 优化 getTenantList 接口动态决定是否传token

疯狂的狮子Li 9 tháng trước cách đây
mục cha
commit
fdfb556c8e

+ 2 - 2
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'
   });

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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;

+ 1 - 1
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>