💄 修改细节问题

src/components/dynamicf/UploadImageFormItem.vue

@@ -44,7 +44,7 @@ import {
 } from './UploadImageFormItem';
 import { message, type UploadProps } from 'ant-design-vue';
 import { PlusOutlined, LoadingOutlined } from '@ant-design/icons-vue';
-import { defineProps, defineEmits, type PropType, ref, onMounted, watch } from 'vue';
+import { type PropType, ref, onMounted, watch } from 'vue';
 import FailImage from '@/assets/images/imageFailed.png';
 
 const props = defineProps({

src/views/AboutView.vue

@@ -42,17 +42,6 @@
     <section v-if="mainTabActive == 0" class="main-section main-background main-background-type0">
       <div class="content">   
         <SimplePageContentLoader :loader="introdLoader">
-          <div class="d-flex justify-content-center ">
-            <h2>全国文化生态保护区基本情况</h2>
-          </div>
-          <LeftRightBox 
-            class="mt-4"
-            :title="introdLoader.content.value?.introd1?.title"
-            :desc="introdLoader.content.value?.introd1?.content"
-            :image="introdLoader.content.value?.introd1?.image"
-            :showMore="false"
-            left
-          />
           <div class="d-flex justify-content-center mt-5">
             <h2>闽南文化生态保护区(厦门市)基本情况</h2>
           </div>
@@ -65,6 +54,17 @@
             @rightItemDefaultClick="(item) => navTo('/news/detail', { id: item.id })"
             @moreClick="navTo('/introduction/about')"
           />
+          <div class="d-flex justify-content-center ">
+            <h2>全国文化生态保护区基本情况</h2>
+          </div>
+          <LeftRightBox 
+            class="mt-4"
+            :title="introdLoader.content.value?.introd1?.title"
+            :desc="introdLoader.content.value?.introd1?.content"
+            :image="introdLoader.content.value?.introd1?.image"
+            :showMore="false"
+            left
+          />
         </SimplePageContentLoader>
       </div> 
     </section>
@@ -150,17 +150,12 @@ const mainTabs = [
   { title: '闽南文化生态保护区概况', value: 0 },
   { title: '世界闽南文化交流中心', value: 1 },
   { title: '政策法规', value: 2 },
-  { title: '申报入口', value: 3 },
 ]
 const mainTabActive = ref(0);
 
 const router = useRouter();
 
 function handleTabClick(value: number) {
-  if (value == 3) {
-    navTo('/inheritor/submit');
-    return;
-  }
   mainTabActive.value = value; 
 }
 

src/views/FusionView.vue

@@ -74,7 +74,7 @@ import { Carousel, Slide, Pagination, Navigation } from 'vue3-carousel'
 import { onMounted, ref, type Ref } from 'vue';
 import Image1 from '@/assets/images/fusion/Image1.jpg'
 import Image2 from '@/assets/images/fusion/Image2.jpg'
-import Image3 from '@/assets/images/fusion/Image3.jpg'
+import Image3 from '@/assets/images/inheritor/Image3.jpg'
 import Image4 from '@/assets/images/fusion/Image4.jpg'
 import Image5 from '@/assets/images/fusion/Image5.jpg'
 import LeftRightBox from '@/components/parts/LeftRightBox.vue';
@@ -107,11 +107,11 @@ const list = [
     }
   },
   {
-    title: '文化产品',
+    title: '非遗作品',
     desc: '让文化因传承而永存',
     image: Image3,
     onClick: () => {
-      navTo('/fusion/products');
+      navTo('/inheritor/products');
     }
   },
   {

src/views/InheritorView.vue

@@ -168,7 +168,7 @@ const list1 = [
     image: Image2,
     onClick: () => navTo('/inheritor/inheritor'),
   },
-  {
+  /* {
     title: '非遗作品',
     desc: '让文化因传承而永存',
     image: Image3,
@@ -179,7 +179,7 @@ const list1 = [
     desc: '让文化因传承而永存',
     image: Image4,
     onClick: () => navTo('/inheritor/activity'),
-  },
+  }, */
   {
     title: '非遗传习所',
     desc: '让文化因传承而永存',

src/views/NewsView.vue

@@ -41,7 +41,7 @@
         </div>
       </div>
       <!-- 头部TAB -->
-      <!-- <div class="main-header-tab">
+      <div class="main-header-tab">
         <div class="list">
           <div 
             v-for="(tab, k) in mainTabs"
@@ -52,7 +52,7 @@
             {{ tab.title }}
           </div>
         </div>
-      </div> -->
+      </div>
     </section>
 
     <!-- 新闻 -->
@@ -99,6 +99,7 @@ import NewsIndexContent from '@/api/news/NewsIndexContent';
 import CommonContent, { GetContentListParams } from '@/api/CommonContent';
 import DateUtils from '@/common/utils/DateUtils';
 import SimplePageContentLoader from '@/components/content/SimplePageContentLoader.vue';
+import ActivityContent from '@/api/inheritor/ActivityContent';
 
 const carouselConfig = {
   itemsToShow: 1,
@@ -107,8 +108,8 @@ const carouselConfig = {
 }
 const mainTabs = [
   { title: '活动公告', value: 0 },
-  { title: '文化热搜榜', value: 1 },
-  { title: '活动报名', value: 2 },
+  { title: '非遗活动', value: 1 },
+  //{ title: '活动报名', value: 2 },
 ]
 const mainTabActive = ref(0);
 
@@ -121,13 +122,28 @@ const regionData = ref([
 ]);
 
 const newsLoader = useSimplePagerDataLoader(10, async (page, pageSize) => {
-  const res = await NewsIndexContent.getContentList(new GetContentListParams()
-    .setMainBodyColumnId([ 228, 298, 299 ])
-    .setKeywords(searchValue.value)
-    .setSelfValues({
-      region: searchRegion.value === 0 ? undefined : searchRegion.value,
-    })
-  , page, pageSize);
+  let res
+  switch(mainTabActive.value) {
+    default:
+    case 0: 
+      res = await NewsIndexContent.getContentList(new GetContentListParams()
+        .setMainBodyColumnId([ 228, 298, 299 ])
+        .setKeywords(searchValue.value)
+        .setSelfValues({
+          region: searchRegion.value === 0 ? undefined : searchRegion.value,
+        })
+      , page, pageSize);
+      break;
+    case 1:
+      res = await ActivityContent.getContentList(new GetContentListParams()
+        .setKeywords(searchValue.value)
+        .setSelfValues({
+          region: searchRegion.value === 0 ? undefined : searchRegion.value,
+        })
+      , page, pageSize);
+      break;
+  }
+
   return {
     data: res.list,
     total: res.total,

src/views/fusion/route.vue

@@ -17,6 +17,7 @@
 import { ref } from 'vue';
 import { GetContentListParams } from '@/api/CommonContent';
 import ResultContent from '@/api/research/ResultContent';
+import RouteContent from '@/api/fusion/RouteContent';
 
 async function loadDetail(id: number, item: any) {
   return await ResultContent.getContentDetail(id);
@@ -29,8 +30,8 @@ async function loadData(
   dropDownValues: number[]
 ) {
 
-  const res = await ResultContent.getContentList(new GetContentListParams().setSelfValues({
-    mainBodyColumnId: selectedTag,
+  const res = await RouteContent.getContentList(new GetContentListParams().setSelfValues({
+    mainBodyColumnId: selectedTag == tagsData.value[0].id ? tagsData.value.map(p => p.id).join(',') : selectedTag,
     keywords: searchText,
   }), page, pageSize);
 

src/views/introduction/custom.vue

@@ -53,7 +53,7 @@ const tagsData = ref([
   { id: 245, name: '全部' },
   { id: 246, name: '婚丧嫁娶' },
   { id: 111, name: '民俗节庆' },
-  { id: 248, name: '信仰' },
+  //{ id: 248, name: '信仰' },
 ]);
 </script>