From e25741935152519390288467e5e06c953e416dc3 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Thu, 27 Feb 2025 12:39:36 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E6=94=B6=E7=A4=BC=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=80=BB=E8=BE=91=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/GiftCard.vue | 20 ++++++++++++--------
 pkg_user/views/gift/gift.vue                |  1 +
 pkg_user/views/gift/receive.vue             | 11 ++++++++---
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index ecbcec7..a4f8237 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="dialog-conent" v-if="isLogin">
+  <view class="dialog-conent" v-show="isLogin">
     <view class="gift-card-modal" >
       <image class="bg-image" :src="card.cover" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
       <view class="image-wrap">
@@ -16,25 +16,25 @@
       
     </view>
     <view class="btn-wrap">
-      <button v-if="!isReceive && card.giftProducts[0].isCurrentUser !== 1" class="share-btn v12-white-text v12-primary" @click="setAddress(0)">
+      <button v-if="!isReceive && myGift.isCurrentUser !== 1" class="share-btn v12-white-text v12-primary" @click="setAddress(0)">
         填写地址并收下
       </button>
-      <button v-if="card.canTransfer !== 0 && !isReceive && card.giftProducts[0].isCurrentUser !== 1" open-type="share" class="share-btn v12-white v12-primary-text v12-d-flex" >
+      <button v-if="card.canTransfer !== 0 && !isReceive && myGift.isCurrentUser !== 1" open-type="share" class="share-btn v12-white v12-primary-text v12-d-flex" >
         点击转赠给好友
         <u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
       </button>
     </view>
-    <view v-if=" card && card.giftProducts[0] && card.giftProducts[0].isCurrentUser === 1" @click="toOrder" style="z-index: 10">
+    <view v-if="myGift.isCurrentUser === 1" @click="toOrder" style="z-index: 10">
       <view class="address-btn v12-white-text v12-primary">
         您已领取礼包
       </view>
       <view class="v12-text-center v12-font-26 v12-primary-text v12-mt-3">查看礼包详情>></view>
     </view>
-    <view v-if="isReceive && card && card.giftProducts[0] && card.giftProducts[0].isCurrentUser === 0" @click="toHome" style="z-index: 10">
+    <view v-if="isReceive && myGift.isCurrentUser === 0" @click="toHome" style="z-index: 10">
       <view class="address-btn v12-white-text v12-primary">
         礼包已被领取
       </view>
-      <view class="v12-text-center v12-font-26 v12-primary-text v12-mt-3">去商城看看>></view>
+      <view @click="toHome"  class="v12-text-center v12-font-26 v12-primary-text v12-mt-3" style="z-index: 10">去商城看看>></view>
     </view>
     <view class="tips">
       <view class="tip-text v12-mr-1"  @click="showTips">
@@ -88,6 +88,9 @@ export default {
     },
     isLogin() {
       return !!cookie.get('login_status');
+    },
+    myGift() {
+      return this.card && this.card.giftProducts.filter(item => item.isCurrentUser === 1).length > 0 && this.card.giftProducts.filter(item => item.isCurrentUser === 1)[0] || this.card.giftProducts[0]
     }
   },
   watch: {
@@ -137,14 +140,15 @@ export default {
       // 领取礼包
       getGiftCardReceive({
         code: this.card.code,
+        recipientsNum : 1,
         addressId: e
       }).then(res => {
         this.$refs.addressDialog.close()
         this.$refs.AddressList.close()
         this.order = res.data.orderId
-        this.$emit('receive', this.order)
-      }).finally(() => {
+        this.$emit('receive', this.card.code)
         uni.hideLoading()
+      }).finally(() => {
       })
     },
     setAddress(flag) {
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 493c999..8c1c068 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -281,6 +281,7 @@ export default {
         from: 'routine',
         cartId: this.cartId,
         couponId: this.couponId,
+        recipientsNum: this.goodsInfo.cartNum,
         templateId: this.templateId,
         message : this.message || '礼笺轻启，礼藏心意',
         cover: this.selectedCover,
diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue
index 4c7343a..442367c 100644
--- a/pkg_user/views/gift/receive.vue
+++ b/pkg_user/views/gift/receive.vue
@@ -1,12 +1,12 @@
 <template>
   <view>
-    <GiftCard v-if="!giftCard.expireTime" :card="giftCard" :addr="giftChooseAddress" @receive="getGiftCard($event)" />
+    <GiftCard v-if="!giftCard.isExpire" :card="giftCard" :addr="giftChooseAddress" @receive="getGiftCard($event)" />
     <view v-else>
       <view class="no-img-wrap">
-        <view class="wrap-box">
+        <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>
-          <view class="v12-font-28 v12-primary-text v12-primary-border go-btn">去商城看看</view>
+          <view  @click="toHome"  class="v12-font-28 v12-primary-text v12-primary-border go-btn">去商城看看</view>
         </view>
       </view>
     </view>
@@ -41,6 +41,11 @@ export default {
       }
     },
   methods: {
+    toHome() {
+      uni.switchTab({
+        url: '/pages/home/index'
+      })
+    },
     getGiftCard(code) {
       getGiftCardDetail({
         code: code