diff --git a/src/api/cms/cmsArticle/index.ts b/src/api/cms/cmsArticle/index.ts index f8feab8..59f0470 100644 --- a/src/api/cms/cmsArticle/index.ts +++ b/src/api/cms/cmsArticle/index.ts @@ -119,6 +119,19 @@ export async function getCmsArticle(id: number) { return Promise.reject(new Error(res.data.message)); } +/** + * 根据code查询文章 + */ +export async function getByCode(code: string) { + const res = await request.get>( + '/cms/cms-article/getByCode/' + code + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + export async function getCount(params: CmsArticleParam) { const res = await request.get(MODULES_API_URL + '/cms/cms-article/data', { params diff --git a/src/api/cms/cmsNavigation/index.ts b/src/api/cms/cmsNavigation/index.ts index c229a73..9f00bba 100644 --- a/src/api/cms/cmsNavigation/index.ts +++ b/src/api/cms/cmsNavigation/index.ts @@ -119,3 +119,18 @@ export async function getCmsNavigation(id: number) { } return Promise.reject(new Error(res.data.message)); } + + +/** + * 根据code查询导航 + */ +export async function getByCode(code: string) { + const res = await request.get>( + '/cms/cms-navigation/getByCode/' + code + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + diff --git a/src/views/shop/shopUser/index.vue b/src/views/shop/shopUser/index.vue index a025689..ebf619c 100644 --- a/src/views/shop/shopUser/index.vue +++ b/src/views/shop/shopUser/index.vue @@ -156,6 +156,7 @@ import {Organization} from '@/api/system/organization/model'; import {hasRole} from '@/utils/permission'; import {getPageTitle} from "@/utils/common"; import router from "@/router"; +import {getTenantId} from "@/utils/domain"; // 加载状态 const loading = ref(true); @@ -402,7 +403,7 @@ const exportData = async () => { }); // 生成Excel文件 - const sheetName = `导出用户列表${dayjs(new Date()).format('YYYYMMDD')}`; + const sheetName = `shop_user_${getTenantId()}_${dayjs(new Date()).format('YYYYMMDD')}`; const workbook = { SheetNames: [sheetName], Sheets: {}