From a7c320d4061d85fb134b50afd8a77f32f796e3be Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Mon, 30 Jun 2025 15:40:24 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E6=94=B6=E7=A4=BC=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8D=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue | 8 ++++++--
 pkg_user/views/giftList.vue        | 7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 85fb753..90a3b87 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="order-details" style="padding: 30rpx;" @click="handleBody">
     <!-- 给header上与data上加on为退款订单-->
-    <view class=" v12-pa-3 v12-white" :class="refundOrder ? 'on' : ''" style="border-radius: 20rpx;">
+    <view class=" v12-pa-3 v12-white" :class="refundOrder ? 'on' : ''" style="border-radius: 20rpx;" v-if="!isGift">
       <!-- <view class="status-img-box">
         <image class="status-img" :src="getStatusImg(orderInfo)" mode=""></image>
       </view> -->
@@ -492,7 +492,8 @@ export default {
       payPassword: null,
       webUrl: this.$VUE_APP_RESOURCES_URL,
       pageKeyId: Object.freeze('userOrderInfo'),
-      logistics: {}
+      logistics: {},
+      isGift: false
     };
   },
   computed: {
@@ -501,6 +502,9 @@ export default {
     },
     ...mapGetters(["userInfo"])
   },
+  onLoad(opts) {
+    this.isGift = !!opts.isGift
+  },
   onShow() {
     const chooseAddress = uni.getStorageSync('chooseAddress') || {}
     const addressId = chooseAddress.id || ''
diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index 69feab8..1b59f29 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -403,11 +403,14 @@ export default {
       this.$refs.giftTips.showTips = true
     },
     giftItemClickHanlde(item) {
-      if (this.cateIndex === 0) return
+      console.log(item);
+      
+      // if (this.cateIndex === 0) return
       this.$yrouter.push({
         path: '/pages/order/OrderDetails/index',
         query: {
-          id: item.orderId
+          id: item.orderId,
+          isGift: 1
         }
       })
     }