🎨 修改细节问题

src/pages.json

@@ -63,13 +63,6 @@
       }
     },
     {
-      "path": "pages/inhert/unit/list",
-      "style": {
-        "navigationBarTitleText": "保护单位",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
       "path": "pages/inhert/inheritor/list",
       "style": {
         "navigationBarTitleText": "传承人列表",
@@ -77,13 +70,6 @@
       }
     },
     {
-      "path": "pages/inhert/old/list",
-      "style": {
-        "navigationBarTitleText": "重要相关老字号",
-        "enablePullDownRefresh": true
-      }
-    },
-    {
       "path": "pages/inhert/map/index",
       "style": {
         "navigationBarTitleText": "文化地图"

src/pages/article/common/CommonListPage.vue

@@ -244,6 +244,8 @@ export interface CommonListPageProps {
    * 点击详情跳转页面路径
    * 可以是字符串路径，也可以是对象数组，每个对象包含路径和参数
    * * 特殊值：byContent 表示根据 detailsPageByContentCallback 函数返回值跳转。
+   * * 特殊值：disabled 表示不跳转。
+   * * 特殊值：custom 表示自定义跳转,需要通过 goCustomDetails(item, id) 事件处理。
    */
   detailsPage?: string | Record<string, string|{
     page: string,

src/pages/article/data/CommonCategoryBlocks.vue

@@ -267,6 +267,7 @@ const categoryDatas = computed(() => props.categoryDefine.map(item => {
             modelId: content.modelId,
             detailsPage: item.detailsPage,
             dataSolve: item.dataSolve || [],
+            itemType: item.itemType,
           })
         }
       },

src/pages/article/data/DefaultCategory.json

@@ -151,6 +151,28 @@
               "text": "精彩瞬间",
               "data": {
                 "type": "serializedApi",
+                "name": "NewsIndexContent",
+                "params": {
+                  "mainBodyColumnId": [
+                    228,
+                    298,
+                    299
+                  ]
+                }
+              },
+              "showMore": false,
+              "detailsPage": "/pages/article/details?pageConfigName=intangible-details",
+              "dataSolve": [
+                "common"
+              ],
+              "type": "small-grid2",
+              "count": 4,
+              "visible": true
+            },
+            {
+              "text": "精彩瞬间",
+              "data": {
+                "type": "serializedApi",
                 "name": "ProjectsContent"
               },
               "showMore": false,
@@ -158,7 +180,9 @@
               "dataSolve": [
                 "common"
               ],
-              "type": "small-grid2"
+              "type": "small-grid2",
+              "visible": true,
+              "showTitle": false
             },
             {
               "text": "推荐文物",
@@ -171,7 +195,8 @@
               "dataSolve": [
                 "common"
               ],
-              "type": "small-grid2"
+              "type": "small-grid2",
+              "visible": true
             }
           ]
         }
@@ -198,11 +223,11 @@
                   "dataSolve": [
                     "common"
                   ],
-                  "type": ""
+                  "type": "article"
                 },
                 {
                   "text": "世界闽南文化交流中心",
-                  "type": "",
+                  "type": "article",
                   "data": {
                     "type": "commonContent",
                     "params": {
@@ -233,7 +258,7 @@
                       "modelId": 18
                     }
                   },
-                  "type": "article",
+                  "type": "simple-article",
                   "textLevel": "h3"
                 },
                 {
@@ -260,7 +285,7 @@
                     "common"
                   ],
                   "morePage": "",
-                  "type": "",
+                  "type": "article",
                   "textLevel": "h3"
                 },
                 {
@@ -394,7 +419,7 @@
                     "common"
                   ],
                   "detailsPage": "byContent",
-                  "type": ""
+                  "type": "article"
                 },
                 {
                   "text": "非遗秀",
@@ -409,7 +434,7 @@
                     "common"
                   ],
                   "detailsPage": "byContent",
-                  "type": ""
+                  "type": "article"
                 },
                 {
                   "text": "非遗新青年",
@@ -424,7 +449,7 @@
                     "common"
                   ],
                   "detailsPage": "byContent",
-                  "type": ""
+                  "type": "small-grid2"
                 },
                 {
                   "text": "非遗巴士研学",
@@ -605,7 +630,7 @@
     },
     {
       "name": "travel",
-      "title": "来厦门䢐迌",
+      "title": "来厦门𨑨迌",
       "content": {
         "type": "CommonList",
         "props": {
@@ -691,7 +716,7 @@
                     "common"
                   ],
                   "detailsPage": "byContent",
-                  "type": ""
+                  "type": "article"
                 },
                 {
                   "text": "闽南歌曲",
@@ -1304,7 +1329,7 @@
             },
             {
               "text": "资料影像",
-              "width": 200,
+              "width": 170,
               "type": "video"
             },
             {

src/pages/inhert/old/list.vue

@@ -1,47 +0,0 @@
-<template>
-  <CommonListPage 
-    title="重要相关老字号"
-    itemType="article-common"
-    detailsPage="/pages/article/data/details?pageConfigName=intangible-details"
-    :showTotal="false"
-    :dropDownNames="dropdownNames"
-    :detailsParams="{
-      mainBodyColumnId: 312,
-      modelId: 17,
-    }"
-    :load="loadData" 
-  />
-</template>
-
-<script setup lang="ts">
-import CommonContent, { GetContentListParams } from '@/api/CommonContent';
-import CommonListPage, { type DropDownNames } from '@/pages/article/common/CommonListPage.vue';
-import { onMounted, ref } from 'vue';
-
-const dropdownNames = ref<DropDownNames[]>([]);
-
-async function loadData(
-  page: number, 
-  pageSize: number,
-  searchText: string,
-  dropDownValues: number[]
-) {
-  const res = (await CommonContent.getContentList(new GetContentListParams()
-    .setModelId(17)
-    .setMainBodyColumnId(312)
-    .setKeywords(searchText)
-  , page, pageSize));
-  res.list.forEach((p) => {
-    p.desc = p.title + (p.desc ? '\n' + p.desc : '');
-    p.title = `${p.fontName || ''}`;
-    p.bottomTags = p.brandType;
-  }) 
-  console.log(res.list);
-  
-  return res;
-}
-
-onMounted(async () => {
-  
-})
-</script>

src/pages/inhert/unit/list.vue

@@ -1,48 +0,0 @@
-<template>
-  <CommonListPage 
-    title="保护单位"
-    itemType="simple-text"
-    detailsPage="disabled"
-    showTotal
-    :dropDownNames="dropdownNames"
-    :detailsParams="{
-      mainBodyColumnId: UnitContent.mainBodyColumnId,
-      modelId: UnitContent.modelId,
-    }"
-    :load="loadData" 
-  />
-</template>
-
-<script setup lang="ts">
-import { onMounted, ref } from 'vue';
-import { GetContentListParams } from '@/api/CommonContent';
-import UnitContent from '@/api/inheritor/UnitContent';
-import CommonListPage, { type DropDownNames } from '@/pages/article/common/CommonListPage.vue';
-
-const dropdownNames = ref<DropDownNames[]>([]);
-
-async function loadData(
-  page: number, 
-  pageSize: number,
-  searchText: string,
-  dropDownValues: number[]
-) {
-  const res = (await UnitContent.getContentList(new GetContentListParams()
-    .setKeywords(searchText)
-  , page, pageSize));
-  res.list.forEach((p) => {
-    p.desc = '';
-    p.bottomTags = [
-      p.levelText, 
-      p.ichTypeText, 
-      p.batchText,
-      p.regionText,
-    ] as string[];
-  })
-  return res;
-}
-
-onMounted(async () => {
-  
-})
-</script>