ソースを参照

💄 按要求修改:概况标题修改,政策法规移动到理论研究前面

快乐的梦鱼 2 週間 前
コミット
8015507428
共有4 個のファイルを変更した12 個の追加8 個の削除を含む
  1. 5 2
      src/components/NavBar.vue
  2. 4 4
      src/views/AboutView.vue
  3. 1 1
      src/views/FusionView.vue
  4. 2 1
      src/views/introduction/policy.vue

+ 5 - 2
src/components/NavBar.vue

@@ -21,6 +21,7 @@
           <RouterLink to="/introduction">文化常识</RouterLink>
           <RouterLink to="/inheritor">保护传承</RouterLink>
           <RouterLink to="/communicate">传播交流</RouterLink>
+          <RouterLink to="/introduction/policy">政策法规</RouterLink>
           <RouterLink to="/research">理论研究</RouterLink>
           <RouterLink to="/fusion">文旅融合</RouterLink>
         </div>
@@ -38,6 +39,7 @@
   >
     <div></div>
     <div class="group">
+      <div class="link-placeholder" />
       <RouterLink to="/">首页</RouterLink>
       <RouterLink to="/about">保护区概况</RouterLink> 
       <RouterLink to="/news">资讯动态</RouterLink>
@@ -55,6 +57,7 @@
     <div class="group">
       <RouterLink to="/inheritor">保护传承</RouterLink>
       <RouterLink to="/communicate">传播交流</RouterLink>
+      <RouterLink to="/introduction/policy">政策法规</RouterLink>
       <RouterLink to="/research">理论研究</RouterLink>
       <RouterLink to="/fusion">文旅融合</RouterLink>
     </div>
@@ -140,7 +143,7 @@ nav.main {
     display: flex;
     gap: 1rem; 
 
-    a {
+    a, .link-placeholder {
       width: 100px;
       height: $nav-height;
       line-height: $nav-height;
@@ -231,7 +234,7 @@ nav.main {
   }
 }
 
-@media (max-width: 1260px) {
+@media (max-width: 1460px) {
   nav.main {
     
     .group {

+ 4 - 4
src/views/AboutView.vue

@@ -43,7 +43,7 @@
       <div class="content">   
         <SimplePageContentLoader :loader="introdLoader">
           <div class="d-flex justify-content-center">
-            <h2>闽南文化生态保护区(厦门市)基本情况</h2>
+            <h2>{{ introdLoader.content.value?.introd2?.title }}</h2>
           </div>
           <LeftRightBox 
             class="mt-4"
@@ -55,7 +55,7 @@
             @moreClick="navTo('/introduction/about')"
           />
           <div class="d-flex justify-content-center mt-5">
-            <h2>全国文化生态保护区基本情况</h2>
+            <h2>{{ introdLoader.content.value?.introd1?.title }}</h2>
           </div>
           <LeftRightBox 
             class="mt-4"
@@ -149,7 +149,7 @@ const carouselConfig = {
 const mainTabs = [
   { title: '闽南文化生态保护区概况', value: 0 },
   { title: '世界闽南文化交流中心', value: 1 },
-  { title: '政策法规', value: 2 },
+  //{ title: '政策法规', value: 2 },
 ]
 const mainTabActive = ref(0);
 
@@ -170,7 +170,7 @@ const introdLoader = useSimpleDataLoader(async () => {
       , 1, 10);
 
   const id1 = res2.list.find(item => item.title.includes('全国'))?.id; 
-  const id2 = res2.list.find(item => item.title.includes('厦门市'))?.id; 
+  const id2 = res2.list.find(item => item.title.includes('闽南'))?.id; 
   
   const introd1 = id1 ? await NewsIndexContent.getContentDetail(id1) : undefined;
   const introd2 = id2 ? await NewsIndexContent.getContentDetail(id2) : undefined;

+ 1 - 1
src/views/FusionView.vue

@@ -124,7 +124,7 @@ const list = [
     }
   },
   {
-    title: '非旅融合',
+    title: '融合发展',
     desc: '非遗与旅游融合发展推荐目录',
     image: Image4,
     onClick: () => {

+ 2 - 1
src/views/introduction/policy.vue

@@ -16,6 +16,7 @@
 import { GetContentListParams } from '@/api/CommonContent';
 import PolicyContent from '@/api/introduction/PolicyContent';
 import LawsImage from '@/assets/images/inheritor/LawsTest.jpg'
+import DateUtils from '@/common/utils/DateUtils';
 
 async function loadDetail(id: number, item: any) {
   return await PolicyContent.getContentDetail(id);
@@ -39,7 +40,7 @@ async function loadData(
       return {
         id: item.id,
         title: item.title,
-        desc: item.desc,
+        desc: DateUtils.formatDate(item.publishAt, DateUtils.FormatStrings.YearCommonShort),
         image: item.image,
       };
     }),