From b85a619027099bb2361b0192140b3d1eea3cfa62 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Thu, 27 Feb 2025 19:02:33 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3306=20=E3=80=90=E7=A4=BC=E5=93=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=91=E7=A4=BC=E5=93=81=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=A4=E8=BE=B9=E8=BF=98=E8=A6=81=E5=86=8D=E4=BD=8E=E4=BA=8E?=
 =?UTF-8?q?=E4=B8=AD=E9=97=B4=EF=BC=8C=E5=B7=A6=E5=8F=B3=E4=B8=A4=E8=BE=B9?=
 =?UTF-8?q?=E5=BE=80=E4=B8=8B=E7=A7=BB=EF=BC=8C=E5=BA=95=E9=83=A8=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E5=B9=B3=E8=A1=8C=EF=BC=8C=E9=A1=B6=E9=83=A8=E4=BD=8E?=
 =?UTF-8?q?=E4=BA=8E=E4=B8=AD=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 6afa92a..9aa5e9a 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -13,18 +13,18 @@
         :circular="true"
         :indicator-dots="false"
         @change="onChange"
-        previous-margin="180rpx"
+        previous-margin="160rpx"
         next-margin="180rpx"
         class="cover-swiper"
       >
         <swiper-item v-for="(item, index) in list" :key="index">
-          <view class="cover-item">
-            <view class="img-wrap"  :class="currentIndex === index ? 'v12-mt-8' : 'v12-mt-4'">
-              <view class="pro-img-wrap " v-show="currentIndex === index ">
+          <view class="cover-item" >
+            <view class="img-wrap"  :class="currentIndex === index ? 'v12-mt-10' : 'v12-mt-18'">
+              <view class="pro-img-wrap ">
                 <image :src="product.image" class="pro-cover-image" mode="widthFix|heightFix" />
               </view>
               <image :src="item.cover" class="cover-image" mode="widthFix|heightFix" />
-              <view class="message-text">{{ message || '礼笺轻启，礼藏心意' }}</view>
+              <view class="message-text" :style="{top: currentIndex !== index ? '260rpx' : '220rpx'}">{{ message || '礼笺轻启，礼藏心意' }}</view>
             </view>
             <view class="cover-name">{{ item.name }} </view>
           </view>
@@ -104,6 +104,8 @@ export default {
   margin: auto;
   border: 10rpx solid #FDF0D3;
   top: -40px;
+  border-radius: 16rpx;
+  overflow: hidden;
 }
 .img-wrap{
   position: relative;
@@ -116,7 +118,7 @@ export default {
   margin-top: 20rpx;
 }
 .cover-swiper{
-  height: 540rpx;
+  height: 620rpx;
 }
 .cover-picker {
   .cover-title {
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index c7f7c7e..8b0acb0 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -84,7 +84,9 @@ export default {
   },
   computed: {
     isReceive() {
-      return this.card.recipientsNum === this.card.receiveNum
+      const gitfNum = this.card.giftProducts && this.card.giftProducts.length
+      const isReceiveNum = this.card.giftProducts && this.card.giftProducts.filter(e => e.isReceive === 1).length
+      return gitfNum === isReceiveNum
     },
     isLogin() {
       return !!cookie.get('login_status');
@@ -243,15 +245,15 @@ export default {
 .share-btn{
   width: fit-content;
   border-radius: 100rpx;
-  font-size: 24rpx;
+  font-size: 32rpx;
   margin-top: 40rpx;
   z-index: 999;
   align-items: center;
   border: 1rpx solid #C52733 ;
   margin-left: 10rpx;
   font-weight: bold;
-  height: 70rpx;
-  line-height: 70rpx;
+  height: 80rpx;
+  line-height: 80rpx;
 }
 .share-btn::before{
   border: none;
@@ -261,10 +263,12 @@ export default {
 }
 .address-btn{
   width: fit-content;
-  padding: 10rpx 30rpx;
+  padding: 10rpx 40rpx;
   border-radius: 100rpx;
   font-size: 32rpx;
   font-weight: bold;
+  height: 80rpx;
+  line-height: 80rpx;
   /* margin-top: 40rpx; */
   z-index: 999;
 }