admin/lx-admin-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
疯狂的狮子Li 2024-11-05 14:29:13 +08:00
parent 9ed3ae3fab
commit fdfb556c8e
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/login.ts
View File

@ -100,11 +100,11 @@ export function getInfo(): AxiosPromise<UserInfo> {
} }
// 获取租户列表 // 获取租户列表
export function getTenantList(): AxiosPromise<TenantInfo> { export function getTenantList(isToken: boolean): AxiosPromise<TenantInfo> {
return request({ return request({
url: '/auth/tenant/list', url: '/auth/tenant/list',
headers: { headers: {
isToken: false isToken: isToken
}, },
method: 'get' method: 'get'
}); });

2
src/layout/components/Navbar.vue
View File

@ -142,7 +142,7 @@ const dynamicClearEvent = async () => {
/** 租户列表 */ /** 租户列表 */
const initTenantList = async () => { const initTenantList = async () => {
const { data } = await getTenantList(); const { data } = await getTenantList(true);
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled; tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) { if (tenantEnabled.value) {
tenantList.value = data.voList; tenantList.value = data.voList;

2
src/views/login.vue
View File

@ -176,7 +176,7 @@ const getLoginData = () => {
* 获取租户列表 * 获取租户列表
*/ */
const initTenantList = async () => { const initTenantList = async () => {
const { data } = await getTenantList(); const { data } = await getTenantList(false);
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled; tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) { if (tenantEnabled.value) {
tenantList.value = data.voList; tenantList.value = data.voList;

2
src/views/register.vue
View File

@ -140,7 +140,7 @@ const getCode = async () => {
}; };
const initTenantList = async () => { const initTenantList = async () => {
const { data } = await getTenantList(); const { data } = await getTenantList(false);
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled; tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) { if (tenantEnabled.value) {
tenantList.value = data.voList; tenantList.value = data.voList;

2
src/views/system/user/index.vue
View File

@ -81,7 +81,7 @@
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item> <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-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>