diff --git a/api/cms/cmsNavigation/model/index.ts b/api/cms/cmsNavigation/model/index.ts index 66529e2..f60579d 100644 --- a/api/cms/cmsNavigation/model/index.ts +++ b/api/cms/cmsNavigation/model/index.ts @@ -1,4 +1,4 @@ -import type { PageParam } from '@/api'; +import type {PageParam} from '@/api'; import type {CmsDesign} from "~/api/cms/cmsDesign/model"; /** @@ -79,6 +79,8 @@ export interface CmsNavigation { label?: string; value?: number; design?: CmsDesign; + childHeight?: number, + showChild?: boolean } /** diff --git a/api/cms/cmsWebsite/model/index.ts b/api/cms/cmsWebsite/model/index.ts index 27a9469..f91793f 100644 --- a/api/cms/cmsWebsite/model/index.ts +++ b/api/cms/cmsWebsite/model/index.ts @@ -1,4 +1,5 @@ import type { PageParam } from '@/api'; +import type {CmsNavigation} from "~/api/cms/cmsNavigation/model"; /** * 网站信息记录表 @@ -88,6 +89,8 @@ export interface CmsWebsite { updateTime?: string; // 网站配置 config?: any; + topNavs?: CmsNavigation[]; + bottomNavs?: CmsNavigation[]; } /** diff --git a/api/layout/index.ts b/api/layout/index.ts index 947f260..05ff55c 100644 --- a/api/layout/index.ts +++ b/api/layout/index.ts @@ -3,13 +3,13 @@ import type { ApiResult } from '@/api'; import type { User } from '@/api/system/user/model'; import type { UpdatePasswordParam } from './model'; import { MODULES_API_URL, SERVER_API_URL } from '~/config'; -import type {Website} from "~/api/cms/website/model"; +import type {CmsWebsite} from "~/api/cms/cmsWebsite/model"; /** * 获取网站信息 */ export async function getSiteInfo() { - const res = await request.get>( + const res = await request.get>( MODULES_API_URL + '/cms/website/getSiteInfo' ); if (res.data.code === 0 && res.data.data) { diff --git a/components/AppFooter.vue b/components/AppFooter.vue index 7c9417a..d2b941c 100644 --- a/components/AppFooter.vue +++ b/components/AppFooter.vue @@ -69,7 +69,7 @@
- github + github
@@ -97,6 +97,7 @@ import type {Config} from "~/types/global"; const config = useConfigInfo(); const website = useWebsite(); const subMenu = useSubMenu(); +const SysDomain = localStorage.getItem('SysDomain'); console.log('---------config---------',config.value) console.log('---------website---------',website.value) console.log('---------subMenu---------',subMenu.value) diff --git a/components/AppHeader.vue b/components/AppHeader.vue index e830f99..b5c8f11 100644 --- a/components/AppHeader.vue +++ b/components/AppHeader.vue @@ -1,104 +1,130 @@