diff --git a/composables/useServerRequest.ts b/composables/useServerRequest.ts index 42a7620..816d2b2 100644 --- a/composables/useServerRequest.ts +++ b/composables/useServerRequest.ts @@ -16,7 +16,7 @@ export const useServerRequest = (url: string, opts?: UseFetchOptions -
+

@@ -13,16 +13,16 @@

- -
{{ item.comments }}
+ +
{{ item.comments }}
- -
{{ item.comments }}
+ +
{{ item.comments }}
@@ -35,6 +35,7 @@ import {useServerRequest} from "~/composables/useServerRequest"; import type {ApiResult, PageResult} from "~/api"; import type {FileRecord} from "~/api/system/file/model"; +import type {CmsArticle} from "~/api/cms/cmsArticle/model"; const props = withDefaults( defineProps<{ @@ -54,13 +55,13 @@ const emit = defineEmits<{ (e: 'done'): void; }>(); -const list = ref([]) +const list = ref([]) const reload = async () => { - const {data: response} = await useServerRequest>>('/file/page',{ - baseURL: 'https://server.gxwebsoft.com/api', - query: { - groupId: props.groupId + const {data: response} = await useServerRequest>>('/cms/cms-article/page', { + params: { + categoryId: 989, + limit: 8 } }) if(response.value?.data){ @@ -68,6 +69,12 @@ const reload = async () => { list.value = response.value?.data.list } } + // const {data: response} = await useServerRequest>>('/file/page',{ + // baseURL: 'https://server.gxwebsoft.com/api', + // query: { + // groupId: props.groupId + // } + // }) } const show = ref(false) @@ -75,7 +82,7 @@ watch( () => [props.groupId, props.scrollTop], () => { reload(); - if (props.scrollTop >= 2280) show.value = true + if (props.scrollTop >= 1580) show.value = true }, {immediate: true} diff --git a/pages/components/Djzt.vue b/pages/components/Djzt.vue new file mode 100644 index 0000000..e440ed7 --- /dev/null +++ b/pages/components/Djzt.vue @@ -0,0 +1,121 @@ + + + + + diff --git a/pages/components/ImportantInformation.vue b/pages/components/ImportantInformation.vue new file mode 100644 index 0000000..b0e9656 --- /dev/null +++ b/pages/components/ImportantInformation.vue @@ -0,0 +1,167 @@ + + + + + diff --git a/pages/index.vue b/pages/index.vue index 01c9699..b258601 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -9,10 +9,49 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -25,11 +64,17 @@ import type {BreadcrumbItem, Config} from "~/types/global"; import Flash from './components/Flash.vue'; import ArticleList from './components/ArticleList.vue'; import NewsCenter from "~/pages/components/NewsCenter.vue"; +import Information from '~/pages/components/ImportantInformation.vue'; import AboutUs from "~/pages/components/AboutUs.vue"; import VideoCenter from "~/pages/components/VideoCenter.vue"; import CompanyStyle from "~/pages/components/CompanyStyle.vue"; +import Djzt from "~/pages/components/Djzt.vue"; +import dayjs from "dayjs"; import Carousel from "~/pages/components/Carousel.vue"; -import type {ApiResult} from "~/api"; +import type {ApiResult, PageResult} from "~/api"; +import {getSpmUrl} from "~/utils/common"; +import type {CmsArticle} from "~/api/cms/cmsArticle/model"; +import {useServerRequest} from "~/composables/useServerRequest"; // 引入状态管理 const route = useRoute(); @@ -39,6 +84,8 @@ const config = useConfigInfo(); const groupId = ref() const parentId = ref() const breadcrumb = ref(); +const list989 = ref([]); +const list990 = ref([]); const scrollTop = ref(0) window.onscroll = e => { @@ -67,6 +114,29 @@ const reload = async () => { groupId.value = config.value?.IndexPhotoGroupId; parentId.value = config.value?.IndexNewsCenterParentId; } + + // 重大信息公开 + // const {data: response989} = await useServerRequest>>('/cms/cms-article/page', { + // params: { + // categoryId: 989, + // limit: 8 + // } + // }) + // if (response989.value?.data) { + // list989.value = response989.value?.data.list + // } + // 党建专题 + // const {data: response990} = await useServerRequest>>('/cms/cms-article/page', { + // params: { + // categoryId: 990, + // limit: 8 + // } + // }) + // + // if (response990.value?.data) { + // list990.value = response990.value?.data.list + // } + // seo useHead({ title: `构建现代WEB应用 · WEBSOFT`,