diff --git a/src/api/cms/design/model/index.ts b/src/api/cms/design/model/index.ts index c7d1e0b..abe365e 100644 --- a/src/api/cms/design/model/index.ts +++ b/src/api/cms/design/model/index.ts @@ -41,5 +41,6 @@ export interface DesignParam extends PageParam { pageId?: string; name?: number; type?: number; + path?: string; userId?: number; } diff --git a/src/api/tennat/index.ts b/src/api/tennat/index.ts new file mode 100644 index 0000000..033f0ed --- /dev/null +++ b/src/api/tennat/index.ts @@ -0,0 +1,85 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { Tenant, TenantParam } from './model/index'; + +/** + * 分页查询租户 + */ +export async function pageTenant(params: TenantParam) { + const res = await request.get>>('/tenant/page', { + params + }); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询租户列表 + */ +export async function listTenant(params?: TenantParam) { + const res = await request.get>('/tenant', { + params + }); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加租户 + */ +export async function addTenant(data: Tenant) { + const res = await request.post>('/tenant', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改租户 + */ +export async function updateTenant(data: Tenant) { + const res = await request.put>('/tenant', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 重置用户密码 + */ +export async function updateTenantPassword( + tenantId?: number, + password = 'gxwebsoft.com' +) { + const res = await request.put>('/tenant/password', { + tenantId, + password + }); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 检查IP是否存在 + */ +export async function checkExistence( + field: string, + value: string, + id?: number +) { + const res = await request.get>('/tenant/existence', { + params: { field, value, id } + }); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/tennat/model/index.ts b/src/api/tennat/model/index.ts new file mode 100644 index 0000000..6bb16e3 --- /dev/null +++ b/src/api/tennat/model/index.ts @@ -0,0 +1,32 @@ +import type { PageParam } from '@/api'; +import { Company } from "@/api/system/company/model"; + +/** + * 租户 + */ +export interface Tenant { + // 租户id + tenantId?: number; + // 租户名称 + tenantName?: string; + // 客户ID + customerId?: string; + // 备注 + comments?: string; + // 创建时间 + createTime?: string; + // 状态 + status?: string; + // 企业信息 + company?: Company; + // 配置信息 + config?: any; +} + +/** + * 租户搜索条件 + */ +export interface TenantParam extends PageParam { + tenantName?: string; + customerId?: number; +} diff --git a/src/store/modules/tenant.ts b/src/store/modules/tenant.ts index 4b6a8c1..eea6dad 100644 --- a/src/store/modules/tenant.ts +++ b/src/store/modules/tenant.ts @@ -57,10 +57,6 @@ export const useTenantStore = defineStore({ if(d.type == 0){ d.path = `/article/${d.categoryId}` } - // 页面 - if(d.type == 1){ - d.path = `/page/${d.pageId}` - } // 链接 if(d.type == 2){ d.path = `${d.path}` diff --git a/src/utils/request.ts b/src/utils/request.ts index 4dce936..d68c274 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -15,7 +15,7 @@ import { import { getToken, setToken } from './token-util'; import { logout } from './page-tab-util'; import type { ApiResult } from '@/api'; -import {getTenantId} from "@/utils/domain"; +// import {getTenantId} from "@/utils/domain"; const service = axios.create({ baseURL: API_BASE_URL @@ -35,9 +35,9 @@ service.interceptors.request.use( if(config.headers){ config.headers.common['TenantId'] = TENANT_ID; // 解析二级域名获取租户ID - if(getTenantId() != null && getTenantId() != '0'){ - config.headers.common['TenantId'] = getTenantId(); - } + // if(getTenantId() != null && getTenantId() != '0'){ + // config.headers.common['TenantId'] = getTenantId(); + // } } return config; }, diff --git a/src/views/about/components/detail.vue b/src/views/about/components/detail.vue index 9ad8cc0..146f9e1 100644 --- a/src/views/about/components/detail.vue +++ b/src/views/about/components/detail.vue @@ -21,7 +21,7 @@ import {toDateString} from "ele-admin-pro"; import {ref, unref, watch} from "vue"; import {Design} from "@/api/cms/design/model"; -import {getDesign} from "@/api/cms/design"; +import {getDesign, listDesign} from "@/api/cms/design"; import {useThemeStore} from "@/store/modules/theme"; import {storeToRefs} from "pinia"; import {useRouter} from "vue-router"; @@ -36,6 +36,7 @@ const list = ref([]); const activeKey = ref('1'); const newsBg3 = ref(''); const pageId = ref(0); +const pagePath = ref(); const currentPage = ref(1); const total = ref(); @@ -49,23 +50,24 @@ const { form,assignFields } = useFormData({ }); const reload = () => { - getDesign(pageId.value).then(data => { - assignFields(data) + listDesign({path: pagePath.value}).then(data => { + if(data.length){ + assignFields((data[0])); + } }) + // getDesign(pageId.value).then(data => { + // assignFields(data) + // }) } watch( currentRoute, (route) => { - const { redirectedFrom } = unref(route); - if(redirectedFrom){ - const { params } = redirectedFrom; - const { id } = params; - if (id) { - pageId.value = Number(id); - } + const { path } = unref(route); + if(path){ + pagePath.value = path; + reload(); } - reload(); }, { immediate: true } );