From e6d8bff7721b82067a52ddc2ec4470eb3f649389 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 11 Sep 2026 10:11:41 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E9=80=81=E7=A4=BC):[#6073]=E5=9C=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B6=85=E6=97=B6=E5=90=8E=EF=BC=8C=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BB=98=E6=AC=BE=E5=B9=B6=E8=B5=A0=E9=80=81=EF=BC=8C?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA=E2=80=9C=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=B7=B2=E8=BF=87=E6=9C=9F=EF=BC=8C=E8=AF=B7=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=95=8C=E9=9D=A2=E2=80=9D=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0=E8=AF=A5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/gift.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 55ffb2a..91c61e9 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -1,5 +1,8 @@
 <template>
-  <view class="gift-page" v-if="(goodsInfo.productInfo && goodsInfo.productInfo.storeName) || isGroupBuy">
+  <view
+    v-if="isLoad && ((goodsInfo.productInfo && goodsInfo.productInfo.storeName) || isGroupBuy)"
+    class="gift-page"
+  >
     <view class="top-card" v-if="!isPayOk">
       <view class="top-tab-nav-wrap">
         <view
@@ -323,6 +326,7 @@ export default {
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,
+      isLoad: false,
       loading: true,
       // 盲盒礼包
       isBlind: false,
@@ -681,6 +685,7 @@ export default {
       const params = {
         orderId: this.orderId,
       }
+      this.isLoad = false
       getGiftCardResend(params).then(res => {
         this.isPayOk = false
         const temp = res.data.giftCardTemplates.filter(e => e.isTravelGroup === 0)
@@ -832,6 +837,7 @@ export default {
         //   this.couponId = res.data.couponList.usable[0] && res.data.couponList.usable[0].id || ''
         // }
         this.computedPrice(this.goodsInfo.cartNum)
+        this.isLoad = true
       }).finally(() => {
         this.loading = false
       })
@@ -990,7 +996,7 @@ export default {
             });
             break;
         }
-      }) .catch(err => {
+      }).catch(err => {
         console.log(err);
         uni.hideLoading();
         uni.showToast({
@@ -998,6 +1004,14 @@ export default {
           icon: "none",
           duration: 2000
         });
+        // Fix bug#6073-订单超时后需自动刷新该页面
+        if (err.res.statusCode === 5113) {
+          if(this.isGroupBuy) {
+            this.getGroupBuyInfo()
+          } else {
+            this.getGift()
+          }
+        }
       }).finally(() => {
         this.isShowPayPwdPop = false;
         this.$refs.payPwdPop.clear();//清空支付密码
@@ -1008,6 +1022,7 @@ export default {
       const params = {
         travelGroupProductId: this.cartId
       }
+      this.isLoad = false
       createGroupBuyGift(params).then(res => {
         if (res.status === 200) {
           this.coverList = res.data.giftCardTemplates || []
@@ -1023,6 +1038,7 @@ export default {
           }
           this.giftNotice = res.data.giftCardGiftNotice
           this.computedTravelGroupPrice(true)
+          this.isLoad = true
         }
       })
     }