From a050e3909970e25033f3d6980f5dc1efa39283bb Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 12 Nov 2025 14:16:57 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A4441=20=E3=80=90=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BE=85?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E8=AE=A2=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue               | 1 -
 pkg_user/views/gift/components/GiftCard.vue | 2 +-
 pkg_user/views/gift/receive.vue             | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 75a9cd9..715e887 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -235,7 +235,6 @@
           <view class="flex">
             <template v-if="parseInt(order._status._type) === 0">
               <view
-                v-if="order.isTravelGroup === 0"
                 class="bnt cancelBnt v12-dark-text v12-dark-border"
                 @click="cancelOrder(order)"
               >取消订单</view>
diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 8147ca5..884f1d0 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -268,7 +268,7 @@ export default {
           title: '领取成功',
           icon: 'success'
         });
-        uni.navigateTo({ url: '/pkg_user/views/gift/receiveDone?obj=' + JSON.stringify(res.data) })
+        uni.reLaunch({ url: '/pkg_user/views/gift/receiveDone?obj=' + JSON.stringify(res.data) })
       }).catch(() => {
         uni.showToast({
           title: '领取失败，请重试',
diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue
index 632bddb..a3fdcc0 100644
--- a/pkg_user/views/gift/receive.vue
+++ b/pkg_user/views/gift/receive.vue
@@ -84,7 +84,7 @@ export default {
               travelGroupProduct: res.data.travelGroupProduct || {}
             }
           }
-          uni.navigateTo({ url: '/pkg_user/views/gift/receiveDone?obj=' + JSON.stringify(obj) })
+          uni.reLaunch({ url: '/pkg_user/views/gift/receiveDone?obj=' + JSON.stringify(obj) })
         }
         uni.hideLoading()
       })