From 2b15e320f4123a9bc60170228ebf62a4af6e94b0 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 26 Jun 2024 14:41:30 +0800
Subject: [PATCH] =?UTF-8?q?Feat(=E9=9D=9E=E9=81=97=E6=96=87=E5=8C=96):?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E5=93=81+=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                          |  6 ++++++
 pkg_product/views/heritage.vue      |  7 ++++++-
 pkg_product/views/heritageGoods.vue | 15 ++++++++++-----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pages.json b/pages.json
index 49bc633..e61a01f 100644
--- a/pages.json
+++ b/pages.json
@@ -546,6 +546,12 @@
             "navigationBarTitleText": ""
           }
         },
+        {
+          "path": "views/heritageGoodAndVideo",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
         {
           "path": "views/homestay",
           "style": {
diff --git a/pkg_product/views/heritage.vue b/pkg_product/views/heritage.vue
index 1b9a73c..038a748 100644
--- a/pkg_product/views/heritage.vue
+++ b/pkg_product/views/heritage.vue
@@ -41,14 +41,19 @@ export default {
     },
     goDetails(item) {
       if (!item.isLink) return
+      // 1-视频，2-图文(可配置商品)，3-商品+视频
       if (item.type === 1) {
         uni.navigateTo({
           url: '/pkg_product/views/heritageVideo?id=' + item.id
         })
-      } else {
+      } else if (item.type === 2) {
         uni.navigateTo({
           url: '/pkg_product/views/heritageGoods?id=' + item.id
         })
+      } else if (item.type === 3) {
+        uni.navigateTo({
+          url: '/pkg_product/views/heritageGoodAndVideo?id=' + item.id
+        })
       }
     }
   }
diff --git a/pkg_product/views/heritageGoods.vue b/pkg_product/views/heritageGoods.vue
index de5d921..8b88e65 100644
--- a/pkg_product/views/heritageGoods.vue
+++ b/pkg_product/views/heritageGoods.vue
@@ -8,6 +8,7 @@ export default {
   data() {
     return {
       id: null,
+      type: 2,
       info: null,
       pageKeyId: ''
     }
@@ -16,11 +17,11 @@ export default {
     const id = options.id
     this.id = id
     this.pageKeyId = `ichContent_id_${id}`
-    this.getDetails();
+    this.getDetails()
   },
   methods: {
     getDetails() {
-      getICHDetails(this.id).then(({data}) => this.info = data);
+      getICHDetails(this.id).then(({data}) => this.info = data)
     },
     goGoods(id) {
       uni.navigateTo({
@@ -33,10 +34,14 @@ export default {
 
 <template>
   <view class="heritage-goods" v-if="info">
-    <image class="page-bg" :src="info.backgroundImage" mode="widthFix"/>
+    <image class="page-bg" :src="info.backgroundImage" mode="widthFix" />
     <view class="list-box flex flex-wrap">
-      <view class="item flex flex-col jc-between" v-for="(item,index) in info.products" :key="index"
-            @click="goGoods(item.productId)">
+      <view
+        v-for="(item,index) in info.products"
+        :key="index"
+        class="item flex flex-col jc-between"
+        @click="goGoods(item.productId)"
+      >
         <view class="flex flex-col ai-center">
           <image :src="item.image" mode="scaleToFill"/>
           <view class="more-t">{{ item.storeName }}</view>