From d6bc12d23ae89368a38e5b37e19527b5bd8d312a Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 26 Feb 2025 10:05:38 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3299=20=E3=80=90=E7=A4=BC=E5=93=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=91=E6=9C=89=E8=BD=AC=E8=B5=A0=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=EF=BC=8C=E5=A1=AB=E5=86=99=E5=9C=B0=E5=9D=80=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BC=9A=E6=8C=A4=E5=8E=8B=E5=8F=98=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/GiftCard.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index a61fc96..9ebc4ca 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -16,21 +16,21 @@
       
     </view>
     <view class="btn-wrap">
-      <view v-if="!isReceive && card.giftProducts[0].isCurrentUser !== 1" class="address-btn v12-white-text v12-primary" @click="setAddress(0)">
+      <button v-if="!isReceive && card.giftProducts[0].isCurrentUser !== 1" class="share-btn v12-white-text v12-primary" @click="setAddress(0)">
         填写地址并收下
-      </view>
+      </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" >
         点击转赠给好友
         <u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
       </button>
     </view>
-    <view v-if="isReceive || card.giftProducts[0].isCurrentUser === 1" @click="toOrder" style="z-index: 89999">
+    <view v-if="!isReceive && card.giftProducts[0].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.giftProducts[0].isCurrentUser === 0" @click="toHome" style="z-index: 89999">
+    <view v-if="isReceive && card.giftProducts[0].isCurrentUser === 0" @click="toHome" style="z-index: 10">
       <view class="address-btn v12-white-text v12-primary">
         礼包已被领取
       </view>
@@ -138,13 +138,12 @@ export default {
         this.$refs.addressDialog.close()
         this.$refs.AddressList.close()
         this.order = res.data.orderId
-        this.$emit('receive')
+        this.$emit('receive', this.order)
       }).finally(() => {
         uni.hideLoading()
       })
     },
     setAddress(flag) {
-      console.log(flag);
       getAddressList().then(res => {
         if (res.data.length === 0) {
           this.$refs.addressDialog.open()