Merge branch 'main' of http://work.gct.com.vn/minhnt/NSG_PORTAL_V2

pages/bai-viet/[slug].vue

@@ -16,30 +16,31 @@ import { useDynamicPageStore } from '~/stores/dynamic-page';
 import { useArticleStore } from '~/stores/articles';
 const { currentPage, sectionPublished, componentPublished } = storeToRefs(useDynamicPageStore());
 const { currentArticle } = storeToRefs(useArticleStore());
-
 const store = reactive({
   dynamicPage: useDynamicPageStore(),
   article: useArticleStore(),
 });
+
 (async () => {
   try {
-    store.article.getArticleById(route.params.slug);
+    store.article.getArticleById(Number(route.params.slug));
   } catch (error) {
     console.error("Error fetching data:", error);
   }
 })();
 
 const loadPage = async (contentType: string | number) => {
-  store.dynamicPage.fetchPageByCode('trang-chu');
+  await store.dynamicPage.fetchPageByCode(contentType);
   store.dynamicPage.setSectionPublished();
   store.dynamicPage.setComponentPublished();
 } 
 
 watch(currentArticle, async () => {
   let isContentType : string = '';
+  console.log(currentArticle.value)
   switch (currentArticle.value?.contentType) {
     case 1:
-        isContentType = 'ArticleLayoutDefault'
+        isContentType = 'trang-chi-tiet-emagazine'
     case 2:
         isContentType = 'ArticleLayoutImage'
     case 3:
@@ -65,7 +66,7 @@ useSeoMeta({
 </script>
 
 <template>
-  <main class="h-screen" v-if="currentPage">
+  <main class="h-screen" v-if="currentPage && currentPage.settings">
     <DynamicTemplate :settings="currentPage.settings">
       <template v-if="sectionPublished && sectionPublished.length > 0">
         <DynamicSection