From 229155b24a976a9c4630b0c62b3103ae18d98522 Mon Sep 17 00:00:00 2001 From: MoreStrive Date: Wed, 19 Jun 2024 16:13:42 +0700 Subject: [PATCH] minhnt-dev: footer --- .../page-component/AssignComponent.vue | 1 - .../templates/navigations/layouts/Bottom.vue | 59 +++++++++++-------- .../templates/navigations/layouts/Top.vue | 2 +- .../components/footers/FooterHomeTemplate.vue | 6 +- definitions/cms/page.type.ts | 4 +- stores/dynamic-page.ts | 8 +-- 6 files changed, 45 insertions(+), 35 deletions(-) diff --git a/components/dynamic-page/page-component/AssignComponent.vue b/components/dynamic-page/page-component/AssignComponent.vue index 2085687..ed07c03 100644 --- a/components/dynamic-page/page-component/AssignComponent.vue +++ b/components/dynamic-page/page-component/AssignComponent.vue @@ -27,7 +27,6 @@ const findDataPosition = computed(() => { result = currentPage.value.components && currentPage.value.components.find((component: any) => { return component.settings?.template === enumPageComponentTemplates.NAVIGATION && component.settings?.layout === defineTypeRecusive.TOP_NAVIGATION }); - console.log(result) break; case defineTypeRecusive.BOTTOM_NAVIGATION: result = currentPage.value.components && currentPage.value.components.find((component: any) => { diff --git a/components/dynamic-page/page-component/templates/navigations/layouts/Bottom.vue b/components/dynamic-page/page-component/templates/navigations/layouts/Bottom.vue index cbc8c18..f6ded72 100644 --- a/components/dynamic-page/page-component/templates/navigations/layouts/Bottom.vue +++ b/components/dynamic-page/page-component/templates/navigations/layouts/Bottom.vue @@ -1,35 +1,48 @@ diff --git a/components/dynamic-page/page-component/templates/navigations/layouts/Top.vue b/components/dynamic-page/page-component/templates/navigations/layouts/Top.vue index 5ec5ec7..dc1a60e 100644 --- a/components/dynamic-page/page-component/templates/navigations/layouts/Top.vue +++ b/components/dynamic-page/page-component/templates/navigations/layouts/Top.vue @@ -4,7 +4,7 @@ import { buildTree } from "@/utils/recusive"; import RecusiveNavItem from "@/components/dynamic-page/page-component/templates/navigations/components/RecusiveNavItem.vue"; const _props = defineProps<{ - content?: any[]; + content?: any; component?: any; }>(); diff --git a/components/dynamic-page/page/templates/components/footers/FooterHomeTemplate.vue b/components/dynamic-page/page/templates/components/footers/FooterHomeTemplate.vue index 28ee002..ba8bf2c 100644 --- a/components/dynamic-page/page/templates/components/footers/FooterHomeTemplate.vue +++ b/components/dynamic-page/page/templates/components/footers/FooterHomeTemplate.vue @@ -1,12 +1,14 @@ +