From f08818a7d73fa526f673a97b95afad1f2eb7c71e Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Sat, 1 Nov 2025 13:02:38 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A4309=20=E3=80=90=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E6=94=B6=E7=A4=BC=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue               | 2 +-
 pkg_user/views/gift/components/GiftCard.vue | 4 ++--
 pkg_user/views/gift/gift.vue                | 4 ++--
 pkg_user/views/gift/receive.vue             | 7 ++++++-
 pkg_user/views/giftList.vue                 | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index fdc6120..e966a10 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -494,7 +494,7 @@ export default {
     })
     return {
       title: '礼笺轻启，礼藏心意',
-      path: `/pkg_user/views/gift/receive?code=${this.giftItem.giftCardInfo.code}`,
+      path: `/pkg_user/views/gift/receive?code=${this.giftItem.giftCardInfo.code}&isTravelGroup=${this.giftItem.isTravelGroup ? 1 : 0}`,
       imageUrl: this.giftItem.giftCardInfo.giftCardImage
     }
   },
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 9f2484b..eeffd12 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -64,13 +64,13 @@
           <u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
         </button>
       </view>
-      <view v-if="card.isUserReceive === 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
+      <view v-if="card.isOverReceive === 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
         <view class="address-btn v12-white-text v12-primary">
           礼包已被领取
         </view>
         <view class="info-btn v12-text-center  v12-font-32  v12-mt-3" style="z-index: 10">去商城看看>></view>
       </view>
-      <view v-if="card.isUserReceive === 1" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
+      <view v-if="card.isUserReceive === 1 && card.isOverReceive === 0" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
         <view style="width: fit-content;" class="address-btn v12-white-text v12-primary" @click="toOrder">
           您已领取礼包，去看看>>
         </view>
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index b8fa003..620930f 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -290,7 +290,7 @@ export default {
     })
     return {
       title: '礼笺轻启，礼藏心意',
-      path: `/pkg_user/views/gift/receive?code=${this.giftKey}&isTravelGroup=${this.isGroupBuy}`,
+      path: `/pkg_user/views/gift/receive?code=${this.giftKey}&isTravelGroup=${this.isGroupBuy ? 1 : 0}`,
       imageUrl: this.shareImage
     }
   },
@@ -577,7 +577,7 @@ export default {
           this.giftNotice = res.data.giftCardGiftNotice
           this.templateId = res.data.giftCardTemplates[0].id || ''
           this.orderKey = res.data.orderKey
-          this.giftImage = res.data.giftCardTemplates[0].id
+          this.giftImage = res.data.giftCardTemplates[0].image
           this.goodsInfo = {
             ...res.data.travelGroupProduct,
           }
diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue
index 7242646..3012891 100644
--- a/pkg_user/views/gift/receive.vue
+++ b/pkg_user/views/gift/receive.vue
@@ -53,7 +53,7 @@ export default {
     })
       return {
         title: '礼笺轻启，礼藏心意',
-        path: `/pkg_user/views/gift/receive?code=${this.giftCard.code}&isTravelGroup=${this.isTravelGroup}`,
+        path: `/pkg_user/views/gift/receive?code=${this.giftCard.code}&isTravelGroup=${this.isTravelGroup ? 1 : 0}`,
         imageUrl: this.giftCard.image
       }
     },
@@ -69,10 +69,15 @@ export default {
      * 获取旅居团购礼品卡订单详情
      */
     getSojoumGroupBuyGiftDetail(code) {
+      uni.showLoading({
+        title: '加载中...',
+        mask: true
+      })
       fetchSojoumGroupBuyGiftDetail({
         code: code
       }).then(res => {
         this.giftCard = res.data || {}
+        uni.hideLoading()
       })
     },
 
diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index 16ccdc9..4be6cf0 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -303,7 +303,7 @@ export default {
     })
     return {
       title: '礼笺轻启，礼藏心意',
-      path: `/pkg_user/views/gift/receive?code=${this.giftItem.code}&isTravelGroup=${this.giftItem.isTravelGroup}`,
+      path: `/pkg_user/views/gift/receive?code=${this.giftItem.code}&isTravelGroup=${this.giftItem.isTravelGroup ? 1 : 0}`,
       imageUrl: this.giftItem.templateInfo.image
     }
   },