From 12fa155630f03f250c0930202e5b320a2fb3b349 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Mon, 24 Feb 2025 21:42:50 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E6=94=B6=E7=A4=BC=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=82=B9=E5=87=BB=E5=A1=AB=E5=86=99=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/AddressList.vue | 13 +++++++++----
 pkg_user/views/gift/components/GiftCard.vue    |  5 ++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkg_user/views/gift/components/AddressList.vue b/pkg_user/views/gift/components/AddressList.vue
index 6e2eef3..2cbe42b 100644
--- a/pkg_user/views/gift/components/AddressList.vue
+++ b/pkg_user/views/gift/components/AddressList.vue
@@ -37,8 +37,10 @@
         </view>
       </view>
       <!-- 添加新地址按钮 -->
-      <view class="add-btn v12-primary v12-white-text" @click="addNewAddress">
-        <text>添加新地址</text>
+      <view class="v12-white btn-wrap">
+        <view class="add-btn v12-primary v12-white-text" @click="addNewAddress">
+          <text>添加新地址</text>
+        </view>
       </view>
     </view>
   </u-popup>
@@ -114,7 +116,7 @@ export default {
   margin-bottom: 20rpx;
 }
 .address-list {
-  padding: 20rpx;
+  padding: 20rpx 20rpx 0rpx;
   width: 640rpx;
   height: 800rpx;
   overflow: auto;
@@ -147,13 +149,16 @@ export default {
 }
 
 .add-btn {
-  margin-top: 30rpx;
   padding: 20rpx;
   text-align: center;
   background-color: #fff;
   border: 1rpx solid #ddd;
   border-radius: 100rpx;
+}
+.btn-wrap{
   position: sticky;
   bottom: 0;
+  width: 100%;
+  padding: 20rpx 0;
 }
 </style>
\ No newline at end of file
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 82fce00..cca3c8e 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -26,7 +26,7 @@
         <view class="v12-text-center v12-font-26 v12-white-text v12-mt-3">去商城看看>></view>
       </view>
       <!-- 弹窗内容 -->
-      <view v-if="!isReceive && card.giftProducts[0].isReceive !== 1" class="address-btn v12-white v12-primary-text" @click="setAddress">
+      <view v-if="!isReceive && card.giftProducts[0].isReceive !== 1" class="address-btn v12-white v12-primary-text" @click="setAddress(0)">
         填写地址并收下
       </view>
       <button open-type="share" class="share-btn v12-white v12-primary-text v12-d-flex" v-if="card.canTransfer !== 0 && !isReceive && card.giftProducts[0].isReceive !== 1">
@@ -129,11 +129,14 @@ export default {
       })
     },
     setAddress(flag) {
+      console.log(flag);
       getAddressList().then(res => {
         if (res.data.length === 0) {
           this.$refs.addressDialog.open()
         } else {
           this.address = res.data
+          console.log(flag);
+          
           if(flag) return
           this.$refs.AddressList.open()
         }