From d1cd9900d376ca94b1bf59a07a6b7db56eccf132 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Mon, 23 Jun 2025 01:08:15 +0800
Subject: [PATCH 1/4] =?UTF-8?q?Fix=EF=BC=9A=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD=E4=B8=8D?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index da1cfd6..9b381af 100644
--- a/manifest.json
+++ b/manifest.json
@@ -134,7 +134,8 @@
     "mp-weixin" : {
         "appid" : "wx9417047e1a0c340b",
         "setting" : {
-            "urlCheck" : false
+            "urlCheck" : true,
+            "minified" : true
         },
         "usingComponents" : true,
         "permission" : {

From 19d247c41c3afe26b3a26abc83773083a38ddf92 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Mon, 30 Jun 2025 15:35:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?Fix=EF=BC=9A3928=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=B5=84=E8=AE=AF?=
 =?UTF-8?q?=E2=80=94=E7=94=A8=E6=88=B7@=E6=A5=BC=E4=B8=BB=E8=AF=84?=
 =?UTF-8?q?=E8=AE=BA=E5=AE=8C=E6=88=90=E5=90=8E=E8=BE=93=E5=85=A5=E6=A1=86?=
 =?UTF-8?q?=E4=BB=8D=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA@=E6=A5=BC?=
 =?UTF-8?q?=E4=B8=BB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesInn/inn/innInfoDetail.vue | 1 +
 pkg_common/views/message.vue   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pagesInn/inn/innInfoDetail.vue b/pagesInn/inn/innInfoDetail.vue
index 02c0903..a27f44a 100644
--- a/pagesInn/inn/innInfoDetail.vue
+++ b/pagesInn/inn/innInfoDetail.vue
@@ -309,6 +309,7 @@ export default {
         uni.hideLoading();
         this.getComment()
         this.reply = ''
+        this.currentComment = {}
         this.item.replyCount === null ? this.item.replyCount = 1 : this.item.replyCount++
       })
     },
diff --git a/pkg_common/views/message.vue b/pkg_common/views/message.vue
index 6720fa8..befce58 100644
--- a/pkg_common/views/message.vue
+++ b/pkg_common/views/message.vue
@@ -181,7 +181,7 @@ export default {
       }
       replyMessage(params).then(res => {
         this.fetchList() // 查询消息列表
-        uni.hideLoading
+        uni.hideLoading()
       })
 
     },

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 3/4] =?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
         }
       })
     }

From e20a5efc173182951155d21eb290e6fe60137946 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Mon, 30 Jun 2025 15:40:33 +0800
Subject: [PATCH 4/4] =?UTF-8?q?Fix=EF=BC=9A3950=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=B5=84=E8=AE=AF?=
 =?UTF-8?q?=E2=80=94=E8=AF=84=E8=AE=BA=E6=9D=A1=E6=95=B0=E8=BE=83=E5=B0=91?=
 =?UTF-8?q?=E6=88=96=E6=97=A0=E8=AF=84=E8=AE=BA=E6=97=B6=EF=BC=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=BA=95=E8=89=B2=E6=98=BE=E7=A4=BA=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesInn/inn/innInfoDetail.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pagesInn/inn/innInfoDetail.vue b/pagesInn/inn/innInfoDetail.vue
index a27f44a..3c8f219 100644
--- a/pagesInn/inn/innInfoDetail.vue
+++ b/pagesInn/inn/innInfoDetail.vue
@@ -766,6 +766,7 @@ export default {
 }
 .info-section {
   word-break: break-all;
+  min-height: 100vh;
   .info-item + .info-item {
     margin: 32rpx 0 0 0;
   }