From 25ca6799d58cd5ce86eddb68d2aa56237629c76b Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Tue, 21 Oct 2025 23:23:20 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E6=97=85=E5=B1=85=E7=A4=BC?=
 =?UTF-8?q?=E5=93=81=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/gift.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 75fb084..0e0946a 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -87,7 +87,7 @@
         </view>
       </view>
     </view>
-    <view class="price-wrap">
+    <view class="price-wrap" v-if="!(isGroupBuy && isPayOk)">
       <view class="v12-font-28 v12-dark-text v12-font-bold">价格明细</view>
       <view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1">
         <view class="v12-font-24 v12-dark-text">商品总价：</view>
@@ -141,7 +141,7 @@
     <view class="btn-wrap v12-mt-12 v12-justify-center" v-if="!isPayOk">
       <view class="gift-submit" @click="showPayPicker = true">付款并赠送</view>
     </view>
-    <view class="btn-wrap v12-mt-14 v12-justify-center" v-if="isPayOk">
+    <view class="btn-wrap v12-mt-14 v12-justify-center" v-if="isPayOk && !isGroupBuy">
       <view class="gift-submit" @click="makeAgain">再送一份</view>
     </view>
     <view class="tip-wrap v12-justify-center">
@@ -460,6 +460,7 @@ export default {
           templateId: this.templateId,
           message : this.message || '礼笺轻启，礼藏心意',
           canTransfer: this.canTransfer ? 1 : 0,
+          passwordPay: this.payPassword || '',
           payType: this.payType,
         } : {
           orderKey: this.orderKey,
@@ -572,11 +573,13 @@ export default {
       }
       createGroupBuyGift(params).then(res => {
         if (res.status === 200) {
-          this.coverList = res.data.giftCardGiftNotice || []
+          this.coverList = res.data.giftCardTemplates || []
+          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.goodsInfo = {
             ...res.data.travelGroupProduct,
-
           }
           this.giftNotice = res.data.giftCardGiftNotice
         }