🎨 按要求调整栏目

src/pages.json

@@ -40,12 +40,6 @@
       }
     },
     {
-      "path": "pages/introduction/travel",
-      "style": {
-        "navigationBarTitleText": "乐游闽南"
-      }
-    },
-    {
       "path": "pages/introduction/character/list",
       "style": {
         "navigationBarTitleText": "历史人物列表",

src/pages/article/data/CommonCategoryGlobalLoader.ts

@@ -27,7 +27,7 @@ export function useCommonCategoryGlobalLoader() {
   async function loadCommonCategory() {
     uni.showLoading({ title: '加载中' });
     try {
-      if (isDev) {
+      if (true || isDev) {
         commonCategoryData.value = DefaultCofig as IHomeCommonCategoryDefine;
         return;
       }

src/pages/article/data/DefaultCategory.json

@@ -89,6 +89,18 @@
               "type": "nestCategory",
               "categorys": [
                 {
+                  "text": "精品剧目",
+                  "data": {
+                    "type": "commonContent",
+                    "params": {
+                      "mainBodyColumnId": 369,
+                      "modelId": 18
+                    }
+                  },
+                  "detailsPage": "byContent",
+                  "type": ""
+                },
+                {
                   "text": "非遗作品秀",
                   "data": {
                     "type": "commonContent",
@@ -125,6 +137,18 @@
                   "type": ""
                 },
                 {
+                  "text": "文创好物",
+                  "data": {
+                    "type": "commonContent",
+                    "params": {
+                      "mainBodyColumnId": 48,
+                      "modelId": 9
+                    }
+                  },
+                  "detailsPage": "byContent",
+                  "type": "horizontal-large"
+                },
+                {
                   "text": "各区重大节庆活动（一区一节）",
                   "data": {
                     "type": "commonContent",
@@ -172,15 +196,34 @@
           "showTab": true,
           "tabs": [
             {
-              "text": "世界走透透",
-              "type": "list",
-              "data": {
-                "type": "commonContent",
-                "params": {
-                  "mainBodyColumnId": [260, 261, 262],
-                  "modelId": 18
+              "text": "交流活动",
+              "type": "nestCategory",
+              "categorys": [
+                {
+                  "text": "闽南歌曲",
+                  "data": {
+                    "type": "commonContent",
+                    "params": {
+                      "mainBodyColumnId": [315],
+                      "modelId": 16
+                    }
+                  },
+                  "noFrom": true,
+                  "morePage": "/pages/travel/fashion/list",
+                  "detailsPage": "/pages/video/details",
+                  "type": "large-grid2"
+                },
+                {
+                  "text": "世界走透透",
+                  "data": {
+                    "type": "commonContent",
+                    "params": {
+                      "mainBodyColumnId": [260, 261, 262],
+                      "modelId": 18
+                    }
+                  }
                 }
-              }
+              ]
             },
             {
               "text": "海洋文化",
@@ -207,19 +250,6 @@
               "type": "nestCategory",
               "categorys": [
                 {
-                  "text": "闽南语在线课程",
-                  "data": {
-                    "type": "commonContent",
-                    "params": {
-                      "mainBodyColumnId": 257,
-                      "modelId": 5
-                    }
-                  },
-                  "noFrom": true,
-                  "detailsPage": "/pages/video/details",
-                  "type": "horizontal-large"
-                },
-                {
                   "text": "闽南歌曲",
                   "data": {
                     "type": "commonContent",
@@ -264,7 +294,19 @@
                   "noFrom": true,
                   "morePage": "/pages/travel/scenic-spot/list",
                   "detailsPage": "/pages/inhert/intangible/details",
-                  "type": "large-grid2"
+                  "type": ""
+                },
+                {
+                  "text": "市民文化会",
+                  "data": {
+                    "type": "commonContent",
+                    "params": {
+                      "mainBodyColumnId": 370,
+                      "modelId": 18
+                    }
+                  },
+                  "detailsPage": "byContent",
+                  "type": ""
                 },
                 {
                   "text": "文化旅游路线",
@@ -280,15 +322,16 @@
                   "type": "horizontal-large"
                 },
                 {
-                  "text": "闽南好物",
+                  "text": "闽南语在线课程",
                   "data": {
                     "type": "commonContent",
                     "params": {
-                      "mainBodyColumnId": 48,
-                      "modelId": 9
+                      "mainBodyColumnId": 257,
+                      "modelId": 5
                     }
                   },
-                  "detailsPage": "byContent",
+                  "noFrom": true,
+                  "detailsPage": "/pages/video/details",
                   "type": "horizontal-large"
                 }
               ]

src/pages/introduction/travel.vue

@@ -1,227 +0,0 @@
-<template>
-  <FlexCol :padding="30" backgroundColor="background.page">
-
-    <!-- 闽南语在线课程-->
-    <HomeTitle title="闽南语在线课程" :showMore="false" @clickMore="goCourseList" />
-    <SimplePageContentLoader :loader="corseData" >
-      <scroll-view scroll-x>
-        <view class="pb-3 pt-3 d-flex flex-row overflow-visible align-stretch">
-          <Box2LineLargeImageUserShadow
-            v-for="(item, i) in corseData.content.value"
-            classNames="width-2-3 mr-2"
-            titleColor="title-text"
-            title1
-            fixSize
-            :key="i"
-            :title="item.title"
-            :desc="item.desc"
-            :image="item.thumbnail || item.image"
-            @click="goCourseDetail(item)"
-          />
-        </view>
-      </scroll-view>
-    </SimplePageContentLoader>   
-
-    <!-- 闽南歌曲 -->
-    <HomeTitle title="闽南歌曲" showMore @clickMore="navTo('/pages/travel/fashion/list')" />
-    <SimplePageContentLoader :loader="songsData">
-      <FlexRow wrap align="stretch" justify="space-between" overflow="visible">
-        <Box2LineLargeImageUserShadow
-          v-for="(item, i) in songsData.content.value"
-          titleColor="title-text"
-          width="calc(50% - 10rpx)"
-          fixSize
-          :key="i"
-          :title="item.title"
-          :desc="item.desc"
-          :image="item.image"
-          @click="goSongsDetail(item)"
-        />
-      </FlexRow>
-    </SimplePageContentLoader>    
-
-    <!-- 闽南节庆日历 -->
-    <HomeTitle title="闽南节庆日历" showMore @clickMore="navTo('/pages/travel/calendar/index')" />
-    <CalendarBlock />
-
-    <!-- 闽南美食 -->
-    <HomeTitle title="闽南美食" showMore @clickMore="goFoodList" />
-    <SimplePageContentLoader :loader="foodData">
-      <FlexRow wrap justify="space-between">
-        <Box2LineLargeImageUserShadow
-          v-for="(item, i) in foodData.content.value"
-          width="calc(50% - 10rpx)"
-          titleColor="title-text"
-          fixSize
-          :key="i"
-          :title="item.title"
-          :image="item.thumbnail || item.image"
-          @click="goFoodDetail(item)"
-        />
-      </FlexRow>
-    </SimplePageContentLoader>
-
-    <!-- 闽南文化景区 -->
-    <HomeTitle title="景区、景点" showMore @clickMore="navTo('/pages/travel/scenic-spot/list')" />
-    <SimplePageContentLoader :loader="spotData">
-      <scroll-view scroll-x>
-        <FlexCol>
-          <Box2LineImageRightShadow
-            v-for="(item, i) in spotData.content.value"
-            titleColor="title-text"
-            fixSize
-            :key="i"
-            :title="item.title"
-            :desc="item.desc"
-            :image="item.image"
-            :tags="item.bottomTags"
-            @click="navTo('/pages/inhert/intangible/details', { id: item.id })"
-          />
-        </FlexCol>
-      </scroll-view>
-    </SimplePageContentLoader>
-
-    <!-- 文化旅游路线 -->
-    <HomeTitle title="文化旅游路线" showMore @clickMore="goRouteList" />
-    <SimplePageContentLoader :loader="routeData">
-      <scroll-view scroll-x>
-        <view class="pb-3 pt-3 d-flex flex-row overflow-visible align-stretch">
-          <Box2LineLargeImageUserShadow
-            v-for="(item, i) in routeData.content.value"
-            classNames="width-2-3 mr-2"
-            titleColor="title-text"
-            fixSize
-            :key="i"
-            :title="item.title"
-            :desc="item.desc"
-            :image="item.thumbnail || item.image"
-            @click="goRouteDetail(item)"
-          />
-        </view>
-      </scroll-view>
-    </SimplePageContentLoader>
-
-    <!-- 闽南好物 -->
-    <HomeTitle title="闽南好物" showMore @clickMore="goCreativeList" />
-    <SimplePageContentLoader :loader="creativeData">
-      <scroll-view scroll-x>
-        <view class="pb-3 pt-3 d-flex flex-row overflow-visible align-stretch">
-          <Box2LineLargeImageUserShadow
-            v-for="(item, i) in creativeData.content.value"
-            classNames="width-2-3 mr-2"
-            titleColor="title-text"
-            fixSize
-            :key="i"
-            :title="item.title"
-            :image="item.thumbnail || item.image"
-            @click="goCreativeDetail(item)"
-          />
-        </view>
-      </scroll-view>
-    </SimplePageContentLoader>
-
-    <Footer text="我也是有底线的~" />
-  </FlexCol>
-</template>
-
-<script setup lang="ts">
-import { navTo } from '@/components/utils/PageAction';
-import { useSimpleDataLoader } from '@/common/composeabe/SimpleDataLoader';
-import { useHomeCommonCategoryBlock } from '../article/common/CommonContent';
-import { GetContentListParams } from '@/api/CommonContent';
-import SimplePageContentLoader from '@/common/components/SimplePageContentLoader.vue';
-import FlexCol from '@/components/layout/FlexCol.vue';
-import HomeTitle from '../parts/HomeTitle.vue';
-import Box2LineLargeImageUserShadow from '../parts/Box2LineLargeImageUserShadow.vue';
-import Box2LineImageRightShadow from '../parts/Box2LineImageRightShadow.vue';
-import ScenicSpotContent from '@/api/fusion/ScenicSpotContent';
-import FlexRow from '@/components/layout/FlexRow.vue';
-import Footer from '@/components/display/Footer.vue';
-import CalendarBlock from '../travel/calendar/block.vue';
-
-const spotData = useSimpleDataLoader(async () => 
-  (await ScenicSpotContent.getContentList(new GetContentListParams(), 1, 4)).list.map(p => ({
-    id: p.id,
-    title: p.title, 
-    desc: p.desc, 
-    image: p.thumbnail || p.image,
-    bottomTags: [
-      p.levelText, 
-      p.ichTypeText, 
-      p.batchText,
-      p.regionText,
-    ] as string[],
-  }))
-);
-
-const {
-  loader: songsData,
-  goDetail: goSongsDetail,
-} = useHomeCommonCategoryBlock({
-  title: '闽南歌曲',
-  mainBodyColumnId: [315],
-  modelId: 16,
-  itemType: 'article-common',
-  detailsPage: '/pages/video/details',
-});
-
-const {
-  loader: corseData,
-  goList: goCourseList,
-  goDetail: goCourseDetail,
-} = useHomeCommonCategoryBlock({
-  title: '闽南语在线课程',
-  mainBodyColumnId: [257/* ,235,237,210 */],
-  modelId: 5,
-  itemType: 'article-common',
-  detailsPage: '/pages/video/details',
-});
-
-const {
-  loader: routeData,
-  goList: goRouteList,
-  goDetail: goRouteDetail,
-} = useHomeCommonCategoryBlock({
-  title: '旅游路线',
-  mainBodyColumnId: [274,275,276,277],
-  modelId: 17,
-  itemType: 'article-common',
-  detailsPage: '/pages/article/details',
-});
-
-const {
-  loader: recommendData,
-  goList: goRecommendList,
-  goDetail: goRecommendDetail,
-} = useHomeCommonCategoryBlock({
-  title: '文化景区',
-  mainBodyColumnId: 273,
-  modelId: 17,
-  itemType: 'article-common',
-  detailsPage: '/pages/article/details',
-});
-
-const {
-  loader: creativeData,
-  goList: goCreativeList,
-  goDetail: goCreativeDetail,
-} = useHomeCommonCategoryBlock({
-  title: '文化产品',
-  mainBodyColumnId: 48,
-  modelId: 9,
-  itemType: 'article-common',
-  detailsPage: '/pages/article/details',
-});
-
-const {
-  loader: foodData,
-  goList: goFoodList,
-  goDetail: goFoodDetail,
-} = useHomeCommonCategoryBlock({
-  title: '闽南美食',
-  mainBodyColumnId: 253,
-  modelId: 3,
-  itemType: 'article-common',
-  detailsPage: '/pages/article/details',
-});
-</script>