From 6a526eb41cfd27c4f3ccf17bbb8e1764a3873f20 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Thu, 13 Nov 2025 11:41:34 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A4221=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=B7=B2=E8=A2=AB=E9=A2=86?=
 =?UTF-8?q?=E5=8F=96=E7=9A=84=E7=A4=BC=E5=8C=85=E5=9C=A824=E5=B0=8F?=
 =?UTF-8?q?=E6=97=B6=E5=90=8E=E6=9F=A5=E7=9C=8B=E9=A2=86=E5=8F=96=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=9A=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A4=BC=E5=8C=85?=
 =?UTF-8?q?=E5=B7=B2=E5=A4=B1=E6=95=88=EF=BC=88=E5=BA=94=E8=AF=A5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E5=B7=B2=E9=A2=86=E5=8F=96=E7=9A=84=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/receive.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue
index cbc7807..03f0f0d 100644
--- a/pkg_user/views/gift/receive.vue
+++ b/pkg_user/views/gift/receive.vue
@@ -1,13 +1,13 @@
 <template>
   <view v-if="!loading">
     <GiftCard 
-      v-if="!giftCard.isExpire"
+      v-if="showGift"
       :card="giftCard"
       :isTravelGroup="isTravelGroup"
       :addr="giftChooseAddress"
        @receive="onReceive($event)" />
     <view v-else>
-      <view class="no-img-wrap">
+      <view class="no-img-wrap" v-if="isExpire">
         <view class="wrap-box" >
           <image :src="webUrl + '/icon/no-gift.png'" mode="widthFix"></image>
           <view class="v12-font-28 v12-dark1-text v12-mt-8">礼包超过24小时未领取，订单已取消</view>
@@ -31,7 +31,8 @@ export default {
       giftCard: {},
       giftChooseAddress: {},
       loading: false,
-      isTravelGroup: false
+      isTravelGroup: false,
+      isExpire: false
     }
   },
   onLoad(opts) {
@@ -41,7 +42,11 @@ export default {
     } else {
       this.getGiftCard(opts.code)
     }
-    
+  },
+  computed: {
+    showGift() {
+      return !this.giftCard.isExpire || !!this.giftCard.isUserReceive
+    }
   },
   onShow() {
     this.giftChooseAddress = uni.getStorageSync('giftChooseAddress') || {}
@@ -78,6 +83,7 @@ export default {
         code: code
       }).then(res => {
         this.giftCard = res.data || {}
+        this.isExpire = this.giftCard.isExpire === 1
         if(this.isTravelGroup && res.data.isUserReceive === 1) {
           const obj = {
             ...res.data,
@@ -86,10 +92,11 @@ export default {
             }
           }
           uni.reLaunch({ url: '/pkg_user/views/gift/receiveDone?obj=' + JSON.stringify(obj) })
+        } else {
+          this.loading = false
         }
         uni.hideLoading()
       }).finally(() => {
-        this.loading = false
       })
     },
 
@@ -114,6 +121,7 @@ export default {
       }).then(res => {
         this.giftCard = res.data || {}
         this.loading = false
+        this.isExpire = this.giftCard.isExpire === 1
         if(this.giftCard.canTransfer === 0 ) {
           uni.hideShareMenu()
           return