Pārlūkot izejas kodu

📦 按要求修改细节问题

快乐的梦鱼 1 mēnesi atpakaļ
vecāks
revīzija
88e5167ff9

+ 1 - 17
src/pages/article/common/DetailTabPage.vue

@@ -7,23 +7,7 @@
 
           <!-- 轮播大图 -->
           <ImageSwiper 
-            v-if="showHead && loader.content.value.images.length > 1" 
-            :images="loader.content.value.images"
-          />
-          <video 
-            v-else-if="showHead && loader.content.value.video" 
-            :src="loader.content.value.video"
-            autoplay
-            :poster="loader.content.value.image"
-            controls
-            class="w-100 height-400"
-          />
-          <!--非纯图片有内容才显示大图-->
-          <ImageSwiper 
-            v-else-if="showHead && (
-              loader.content.value.content
-              || loader.content.value.intro
-            )" 
+            v-if="showHead" 
             :images="loader.content.value.images"
           />
 

+ 2 - 4
src/pages/discover.vue

@@ -107,8 +107,6 @@
             :title="item.title"
             :desc="item.desc"
             :image="item.thumbnail || item.image"
-            :likes="item.likes"
-            :comment="item.comments"
             fixSize
             @click="goCultureDetail(item.id)"
           />
@@ -184,8 +182,8 @@ const categories = [
     icon: CategoryIcon4 , 
     onClick: () => navTo('/pages/article/common/list', {
       title: '闽南美食',
-      mainBodyColumnId: 303,
-      modelId: 17,
+      mainBodyColumnId: 103,
+      modelId: 8,
       itemType: 'article-common',
       detailsPage: '/pages/article/details',
     })  

+ 27 - 38
src/pages/home.vue

@@ -25,10 +25,11 @@
           />
         </view>
         <view class="position-relative d-flex flex-row flex-wrap justify-between mt-3">
+
           <view  
-            v-for="(tab, k) in subTabs1" 
+            v-for="(tab, k) in subTabs" 
             :key="k"
-            class="d-flex flex-column align-center width-1-5 mt-2"
+            class="d-flex flex-column align-center width-1-4 mt-2 mb-2"
             @click="tab.onClick"
           >
             <image class="width-100" :src="tab.icon" mode="widthFix" />
@@ -36,7 +37,7 @@
           </view>
 
           <Box1AudioPlay
-            class="w-100 mt-3 mb-3" 
+            class="w-100 mt-3" 
             :title="indexAudioPlayer.currentTitle.value"
             :image="indexAudioPlayer.currentItem?.value?.image"
             :playState="indexAudioPlayer.isPlaying.value"
@@ -46,16 +47,6 @@
             @prevClick="indexAudioPlayer.prev"
             @arrowClick="handleGoAudioList"
           />
-
-          <view  
-            v-for="(tab, k) in subTabs2" 
-            :key="k"
-            class="d-flex flex-column align-center width-1-5 mt-2"
-            @click="tab.onClick"
-          >
-            <image class="width-100" :src="tab.icon" mode="widthFix" />
-            <text class="color-second-text mt-2 size-base text-align-center">{{ tab.name }}</text>
-          </view>
         </view>
       </view>
 
@@ -212,7 +203,27 @@ import Tabbar from '@/common/components/tabs/tabbar.vue';
 import Box1AudioPlay from '@/pages/parts/Box1AudioPlay.vue';
 import SimplePageContentLoader from "@/common/components/SimplePageContentLoader.vue";
 
-const subTabs1 = [
+const subTabs = [
+  { 
+    name: '非遗项目', 
+    icon: MainBoxIcon6 , 
+    onClick: () => navTo('/pages/inhert/intangible/list')
+  },
+  { 
+    name: '文物古迹', 
+    icon: MainBoxIcon5 , 
+    onClick: () => navTo('/pages/inhert/artifact/list') 
+  },
+  { 
+    name: '老字号', 
+    icon: MainBoxIcon7 , 
+    onClick: () => navTo('/pages/inhert/old/list') 
+  },
+  { 
+    name: '传统村落', 
+    icon: MainBoxIcon8 , 
+    onClick: () => navTo('/pages/inhert/village/list')
+  },
   { 
     name: '闽南语', 
     icon: MainBoxIcon1, 
@@ -247,29 +258,7 @@ const subTabs1 = [
       detailsPage: '/pages/article/details',
     }) 
   },
-]
-const subTabs2 = [
-  { 
-    name: '非遗项目', 
-    icon: MainBoxIcon6 , 
-    onClick: () => navTo('/pages/inhert/intangible/list')
-  },
-  { 
-    name: '文物古迹', 
-    icon: MainBoxIcon5 , 
-    onClick: () => navTo('/pages/inhert/artifact/list') 
-  },
-  { 
-    name: '老字号', 
-    icon: MainBoxIcon7 , 
-    onClick: () => navTo('/pages/inhert/old/list') 
-  },
-  { 
-    name: '传统村落', 
-    icon: MainBoxIcon8 , 
-    onClick: () => navTo('/pages/inhert/village/list')
-  },
-]
+];
 
 const mapCtx = uni.createMapContext('map');
 const mapTab = ref(1);
@@ -411,7 +400,7 @@ const statsLoader = useSimpleDataLoader(async () => {
     {
       datas: [
         {
-          title: '非遗传习所',
+          title: '传习所',
           value: semiCount,
           onClick: () => navTo('/pages/inhert/map/index', { tab: 1 }),
         },

+ 4 - 4
src/pages/inhert.vue

@@ -84,8 +84,7 @@
               :key="i"
               :title="item.title"
               :image="item.image"
-              :likes="item.likes"
-              :comment="item.comment"
+              :tags="item.tags"
               title1
               @click="navTo('inhert/artifact/details', { id: item.id })"
             />
@@ -184,7 +183,7 @@
       </SimplePageContentLoader>
 
       <!-- 闽南知识百科 -->
-      <view class="d-flex flex-col wing-l">
+      <!-- <view class="d-flex flex-col wing-l">
         <HomeTitle title="闽南知识百科" showMore @clickMore="goTopicsList" />
         <SimplePageContentLoader :loader="topicsData">
           <Box2LineRightShadow
@@ -195,7 +194,7 @@
             @click="goTopicsDetail(item.id)"
           />
         </SimplePageContentLoader>
-      </view>
+      </view> -->
 
     </view>
   </view>
@@ -226,6 +225,7 @@ const artifactData = useSimpleDataLoader(async () =>
     desc: '', 
     image: p.thumbnail || p.image,
     likes: p.likes,
+    tags: [p.levelText, p.district] as string[],
     comment: p.comments,
   }))
 );

+ 0 - 1
src/pages/inhert/inheritor/list.vue

@@ -34,7 +34,6 @@ async function loadData(
     p.bottomTags = [
       p.levelText, 
       p.nation,
-      p.ichName,
     ];
   })
   return res;

+ 1 - 1
src/pages/inhert/intangible/details.vue

@@ -143,7 +143,7 @@ async function loadSubList(page: number, pageSize: number, content: any, subList
   } else if (subList == 'inheritorsList') {
     list.forEach((p) => {
       p.bottomTags = [
-        content.levelText,
+        p.levelText,
         p.nation,
         content.ichTypeText,
       ];

+ 1 - 1
src/pages/travel.vue

@@ -191,7 +191,7 @@ const subTabs = [
     icon: CategoryIcon6 , 
     onClick: () => navTo('/pages/article/common/list', {
       title: '闽南歌曲',
-      mainBodyColumnId: '189,190,191',
+      mainBodyColumnId: 315,
       modelId: 16,
       itemType: 'article-common',
       detailsPage: '/pages/video/details',