From 1319517a410ec68e6c427f02ecc7009fdccfc0d0 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Mon, 24 Feb 2025 17:20:18 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3289=20=E3=80=90=E7=A4=BC=E5=93=81?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=91=E8=BF=9B=E5=85=A5=E7=A4=BC=E5=8C=85?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E7=A4=BC?=
 =?UTF-8?q?=E5=8C=85=E8=B5=A0=E9=80=81=E5=8C=BA=E5=9F=9F=E4=BC=9A=E5=85=88?=
 =?UTF-8?q?=E9=97=AA=E7=83=81=E5=90=8E=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/GoodsCon/index.vue               | 5 +++--
 pkg_user/views/gift/components/GiftCard.vue | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index aea9a3a..3d1eddc 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -64,8 +64,8 @@
           </view>
           <view class="introduce bold">{{ storeInfo.storeName }}</view>
           <view v-if="storeInfo.isGiftCard === 1" class="v12-primary v12-white-text v12-px-2 v12-py-1 v12-mt-2 v12-radius-20 v12-font-bold v12-justify-between v12-align-center">
-            <view class="v12-font-28 v12-align-center">
-              <img class="gift-img" :src="webUrl + '/orderIcon/gift.png'" mode="widthFix">
+            <view class="v12-font-28 v12-align-center" style="height: 74rpx">
+              <image class="gift-img" :src="webUrl + '/orderIcon/gift.png'" mode="widthFix" ></image>
               支持礼包赠送
             </view>
             <view @click="toGift" class="v12-white v12-dark-text v12-radius-20 v12-font-28 gift-btn">
@@ -2130,6 +2130,7 @@ export default {
 }
 .gift-img{
   width: 34rpx;
+  height: 34rpx;
   margin-right: 10rpx;
 }
 </style>
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index c58104b..9333b1a 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -85,7 +85,7 @@ export default {
       handler(newVal, oldVal) {
         if (newVal && newVal.id) {
           // this.address = newVal
-          this.setAddress()
+          this.setAddress(1)
         }
       },
       deep: true  
@@ -128,12 +128,13 @@ export default {
         uni.hideLoading()
       })
     },
-    setAddress() {
+    setAddress(flag) {
       getAddressList().then(res => {
         if (res.data.length === 0) {
           this.$refs.addressDialog.open()
         } else {
           this.address = res.data
+          if(flag) return
           this.$refs.AddressList.open()
         }
       })