From 0c0708477515315e115e50a36fed6a14c3e6f9c2 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Tue, 30 Dec 2025 23:21:12 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A4777=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=A6=82=E6=9E=9C=E6=9F=90?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=9C=89=E4=BA=A7=E5=93=81=E6=95=85=E4=BA=8B?=
 =?UTF-8?q?=E5=B0=81=E9=9D=A2=EF=BC=8C=E5=88=99=E5=B0=86=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E6=95=85=E4=BA=8B=E5=B0=81=E9=9D=A2=E5=9B=BE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9C=A8=E7=AC=AC=E4=B8=80=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/gift/components/CoverPicker.vue     |  2 +-
 pkg_user/views/gift/components/GiftCard.vue   |  2 +-
 pkg_user/views/gift/gift.vue                  | 59 +++++++++++++++----
 3 files changed, 49 insertions(+), 14 deletions(-)

diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 971bd88..9a033fb 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -27,7 +27,7 @@
                 <image :src="product.image" class="pro-cover-image" mode="widthFix|heightFix" />
               </view>
               <view class="good-story"
-                v-if="product.productStory"
+                v-if="product.productStory && item.isShowProductStory"
                 :style="{
                   right: (item.productStoryX*2 || 0)   + 'rpx',
                   top: (item.productStoryY*2 || 0)  + 'rpx'
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index fea56a7..90ca7a9 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -15,7 +15,7 @@
       </view>
       <view 
           class="good-story"
-          v-if="card.isBlind !== 1 && card.giftProducts[0].productStory"
+          v-if="card.isBlind !== 1 && card.giftProducts[0].productStory && card.isShowProductStory"
           :style="{
             right: (card.productStoryX*2 || 0)   + 'rpx',
             top: (card.productStoryY*2 || 0)  + 'rpx'
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 1b2858b..5ce8cc6 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -290,6 +290,34 @@ export default {
     }
   },
   methods: {
+    adjustCoverListForProductStory(coverList, productInfo, defaultTemplate) {
+      if (!productInfo || !productInfo.productStory) {
+        return {
+          coverList,
+          template: defaultTemplate
+        }
+      }
+      const list = coverList && coverList.length ? [...coverList] : []
+      if (!list.length) {
+        return {
+          coverList: list,
+          template: defaultTemplate
+        }
+      }
+      const storyIndex = list.findIndex(item => item && item.isShowProductStory)
+      if (storyIndex === -1) {
+        return {
+          coverList: list,
+          template: defaultTemplate
+        }
+      }
+      const storyCover = list.splice(storyIndex, 1)[0]
+      list.unshift(storyCover)
+      return {
+        coverList: list,
+        template: storyCover
+      }
+    },
     // 团购价计算
     computedTravelGroupPrice(useDefaultCouponId) {
       const params = {
@@ -345,16 +373,19 @@ export default {
       }
       getGiftCardResend(params).then(res => {
         this.isPayOk = false
-        this.coverList = [...res.data.giftCardTemplates, res.data.specialGiftCardTemplate]
-        this.cartId = res.data.cartInfo[0].id
+        const initialCoverList = [...res.data.giftCardTemplates, res.data.specialGiftCardTemplate]
+        const goodsInfo = res.data.cartInfo[0]
+        const { coverList, template } = this.adjustCoverListForProductStory(initialCoverList, goodsInfo && goodsInfo.productInfo, res.data.specialGiftCardTemplate)
+        this.coverList = coverList
+        this.cartId = goodsInfo.id
         this.giftNotice = res.data.giftCardGiftNotice
         this.orderKey = res.data.orderKey
-        this.goodsInfo = res.data.cartInfo[0]
-        this.templateId = res.data.specialGiftCardTemplate.id
+        this.goodsInfo = goodsInfo
+        this.templateId = template.id
         this.defaultIndex = this.coverList.findIndex(item => item.id === this.templateId)
         console.log(this.defaultIndex, 'defaultIndex');
-        this.selectedCover = res.data.specialGiftCardTemplate.cover
-        this.giftImage = res.data.specialGiftCardTemplate.image
+        this.selectedCover = template.cover
+        this.giftImage = template.image
         this.couponId = ''
         this.computedPrice(this.goodsInfo.cartNum)
       })
@@ -423,13 +454,17 @@ export default {
       this.loading = true
       getGiftCardSendOrderConfirm(params).then(res => {
         const temp = this.isGroupBuy ? res.data.giftCardTemplates : res.data.giftCardTemplates.filter(e => e.isTravelGroup === 0)
-        this.coverList = res.data.giftCardTemplates.map(e => e.id).includes(res.data.specialGiftCardTemplate.id) ? [...temp]  : [...temp, res.data.specialGiftCardTemplate]
+        const hasSpecial = res.data.giftCardTemplates.map(e => e.id).includes(res.data.specialGiftCardTemplate.id)
+        const initialCoverList = hasSpecial ? [...temp] : [...temp, res.data.specialGiftCardTemplate]
+        const goodsInfo = res.data.cartInfo[0]
+        const { coverList, template } = this.adjustCoverListForProductStory(initialCoverList, goodsInfo && goodsInfo.productInfo, res.data.specialGiftCardTemplate)
+        this.coverList = coverList
         this.giftNotice = res.data.giftCardGiftNotice
         this.orderKey = res.data.orderKey
-        this.goodsInfo = res.data.cartInfo[0]
-        this.templateId = res.data.specialGiftCardTemplate.id
-        this.selectedCover = res.data.specialGiftCardTemplate.cover
-        this.giftImage = res.data.specialGiftCardTemplate.image
+        this.goodsInfo = goodsInfo
+        this.templateId = template.id
+        this.selectedCover = template.cover
+        this.giftImage = template.image
         this.blindImage = res.data.giftCardBlindBoxShareImage
         this.defaultIndex = this.coverList.findIndex(item => item.id === this.templateId)
         // if(!this.couponId) {
@@ -752,4 +787,4 @@ export default {
   width: 100%;
   border-radius: 16rpx;
 }
-</style>
\ No newline at end of file
+</style>