From 459f6b31e655d962c733cc01245a8148a112281d Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 11 Mar 2024 11:04:54 +0800
Subject: [PATCH 01/20] =?UTF-8?q?Fix(=E5=AF=BB=E8=B6=A3=E5=91=B3):?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=9A=E4=BD=8D=E5=92=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=AF=E5=BC=82=E6=AD=A5=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=AE=9A=E4=BD=8D=E6=88=90=E5=8A=9F=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E8=8E=B7=E5=BE=97=E7=9A=84=E5=9F=8E=E5=B8=82=E4=B8=8E=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit cb92a1f44fd85763a700a2ad88e07d0d60e0d79a)
---
 pages/cloud/haveFun.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 6ce0365..97ec84d 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -10,7 +10,7 @@ export default {
       page: 1,
       typeList: [],
       typeIndex: 0,
-      cityName: "昆明市",
+      cityName: "",
       hotelList: [],
     }
   },
@@ -18,8 +18,6 @@ export default {
     this.getMapData();
     getHotelTypeList().then(({data}) => {
       this.typeList = data;
-      console.log("getHotelTypeList")
-      this.search();
     });
   },
   onShow() {
@@ -32,6 +30,9 @@ export default {
     }
   },
   onReachBottom() {
+    if (!this.cityName) {
+      return
+    }
     this.page++;
     this.fetchList();
   },
@@ -54,6 +55,7 @@ export default {
         const {latitude, longitude} = map[1];
         const address = await getCurAddress(latitude, longitude);
         this.cityName = address[1].data.result.ad_info.city;
+        this.search();
       }
     },
 

From a27c35ba2d7afa68a86491836ba166dbd9dc817d Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 10:31:51 +0800
Subject: [PATCH 02/20] =?UTF-8?q?Fix=EF=BC=9A3443=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=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5--=E6=8F=90=E7=8E=B0=E7=94=B3=E8=AF=B7--?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95=E5=A2=9E=E5=8A=A0=E6=9A=82?=
 =?UTF-8?q?=E6=97=A0=E8=AE=B0=E5=BD=95=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 17810ee741ca459727ad596519d45ba1efc2bc0f)
---
 pkg_user/views/withdrawalLog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_user/views/withdrawalLog.vue b/pkg_user/views/withdrawalLog.vue
index 9813651..0e3d0e8 100644
--- a/pkg_user/views/withdrawalLog.vue
+++ b/pkg_user/views/withdrawalLog.vue
@@ -28,7 +28,7 @@
         
       </view>
     </view>
-    <view>
+    <view v-if="list.length === 0">
       <image class="empty-img" :src="webUrl + '/orderIcon/nodata1.png'" mode="heightFix" lazy-load="false">
       </image>
     </view>

From e21c4aa669a92d9e9af08aa6a57be359bb69cf78 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 10:57:47 +0800
Subject: [PATCH 03/20] =?UTF-8?q?Fix=EF=BC=9A3385=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=E5=A4=9A=E4=BB=BD?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E7=A4=BC=E5=8C=85=E6=98=BE=E7=A4=BA=E5=B7=B2?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f2b6bc18e21ad3e4a7d2e18a3aba59cdef0a5453)
---
 pkg_user/views/giftList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index cc8e735..82f7c94 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -46,7 +46,7 @@
                     <view class="price">
                       <text class="prefix">￥</text>{{ item.payPrice }}
                     </view>
-                    <view class="num">数量&nbsp;X&nbsp;{{ cart.cartNum }}</view>
+                    <view class="num">已领取{{cart.receiveNum}}/{{ cart.cartNum }}</view>
                   </view>
                 </view>
               </view>

From 6af66ec5e0c69ceaa93f661c2a4c51cac05187d9 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 11:02:52 +0800
Subject: [PATCH 04/20] =?UTF-8?q?Fix=EF=BC=9A3537=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=E5=95=86=E8=AF=A6?=
 =?UTF-8?q?=E9=A1=B5=E8=BE=93=E5=85=A5=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E8=B6=85=E8=BF=873=E4=BD=8D=E6=88=964=E4=BD=8D=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 8728c6e738cb714803f97e025348d4cc0afa9342)
---
 components/ProductWindow.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue
index a75f2f9..63c57c0 100644
--- a/components/ProductWindow.vue
+++ b/components/ProductWindow.vue
@@ -52,7 +52,7 @@
             :max="attrObj.productSelect.stock"
             @input="inputNumer"
             v-model="cartNumber" 
-            style="height: 55rpx !important;"
+            style="height: 55rpx !important; width:80rpx !important"
             class="item v12-font-36 v12-font-bold v12-dark-text cart-btn" />
           <view
             style="border-radius:0 40rpx 40rpx 0"

From b8ca3b66fb48cbd0b26827911ad31a6508a5a5bd Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 11:05:27 +0800
Subject: [PATCH 05/20] =?UTF-8?q?Fix=EF=BC=9A3531=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=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=94=B9=E4=B8=BA=E7=BA=A2=E8=89=B2=E8=89=B2?=
 =?UTF-8?q?=E5=80=BC=EF=BC=9A#BD3124?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 426348932faee6f1d32052bb1fe0e1e1ca7f4503)
---
 pagesInn/components/jin-edit/homeList.vue | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pagesInn/components/jin-edit/homeList.vue b/pagesInn/components/jin-edit/homeList.vue
index f66523b..8559e6d 100644
--- a/pagesInn/components/jin-edit/homeList.vue
+++ b/pagesInn/components/jin-edit/homeList.vue
@@ -88,15 +88,5 @@ export default {
   width: fit-content;
   margin-bottom: 20rpx;
 }
-.pop-title::after{
-  content: '';
-  position: absolute;
-  bottom: 0rpx; 
-  left: 0;
-  width: 100%;
-  height: 5px;
-  background-color: #BD3124;
-  border-radius: 20rpx;
-  opacity: 0.5;
-}
+
 </style>
\ No newline at end of file

From 23dc945f439ea659696caa2f8483474e6f2a7d27 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 11:08:58 +0800
Subject: [PATCH 06/20] =?UTF-8?q?Fix=EF=BC=9A3525=20=E3=80=90=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E9=93=BE=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=AE=A2?=
 =?UTF-8?q?=E6=9C=8D=E6=B6=88=E6=81=AF=E2=80=94=E5=9C=A8=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E5=88=A0=E9=99=A4=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=AE=B0=E5=BD=95=E5=90=8E=EF=BC=8C=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E9=93=BE=E5=B0=8F=E7=A8=8B=E5=BA=8F=EF=BC=88=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E7=AB=AF=EF=BC=89=E7=9A=84=E5=AE=A2=E6=9C=8D=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BC=9A=E8=B7=9F=E7=9D=80=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 4dcfa23a10ffc64374135e8b3fdc0b974ca398aa)
---
 pkg_common/views/roomLogs.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg_common/views/roomLogs.vue b/pkg_common/views/roomLogs.vue
index 045e4df..3fafe72 100644
--- a/pkg_common/views/roomLogs.vue
+++ b/pkg_common/views/roomLogs.vue
@@ -89,7 +89,10 @@ export default {
             uni.request({
               url: _this.$SERVICE_API_URL + '//chat-remove',
               method: 'POST',
-              data: {room_id: id},
+              data: {
+                room_id: id,
+                remove_from: 'user'
+                },
               success:(res)=>{
                 if(res.data.status_code === 200) {
                   _this.fetchList()

From 26145a1259fac505bbe3a352cd969ca115c5a7b6 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 11:27:01 +0800
Subject: [PATCH 07/20] =?UTF-8?q?Fix=EF=BC=9A3347=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=E9=80=81=E7=A4=BC?=
 =?UTF-8?q?=E6=96=B9=E4=B9=B0=E7=A4=BC=E5=93=81=E5=90=8E=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E6=B2=A1=E9=80=81=E5=87=BA=E5=8E=BB=E5=B0=B1=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=80=E6=AC=BE=EF=BC=8C=E8=A6=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=80=80=E6=AC=BE=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A24=E5=B0=8F=E6=97=B6=E5=90=8E=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit da929cfe3b1bfde4392f07767047fb7ed6d1f652)
---
 pkg_user/views/giftList.vue | 41 +++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index 82f7c94..ffa594e 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -55,6 +55,7 @@
                   赠言：{{ item.message || ''  }}
                 </view>
                 <!-- 状态 0-待领取 1-已全部领取 2-已失效 -->
+                <button v-if="item.status === 0" @click="tuikuan(item)" class="btn1">退款</button>
                 <button
                   v-if="item.status === -1"
                   class="btn"
@@ -193,7 +194,8 @@ import Payment from "@/components/Payment";
 import {
   giftCardReceiveList,
   giftCardSendList,
-  giftNotice
+  giftNotice,
+  refund
 } from '@/api/giftList'
 import {mapGetters} from "vuex";
 import giftTips from '@/pkg_user/views/gift/components/giftTips.vue'
@@ -245,6 +247,29 @@ export default {
     }
   },
   methods: {
+    tuikuan(item) {
+      uni.showModal({
+        title: '提示',
+        content: '是否确定退款？', 
+        success: (res) => {
+          if (res.confirm) {
+            uni.showLoading({
+              title: '退款中...',
+              mask: true
+            })
+            refund({
+              id: item.id
+            }).then(qRes => {
+              if (qRes.success) {
+                this.getGiftCardSendList()
+              }
+            }).finally(() => {
+              uni.hideLoading()
+            })
+          } 
+        }
+      })
+    },
     pwdPopFinish(payPwd) {
       this.payPassword = payPwd;
 
@@ -500,7 +525,7 @@ export default {
           height: 46rpx;
           padding: 0 12rpx;
           margin: 0 0 0 24rpx;
-          border-radius: 8rpx;
+          border-radius: 100rpx;
           color: #fff;
           line-height: 46rpx;
           font-size: 26rpx;
@@ -550,4 +575,16 @@ export default {
     }
   }
 }
+.btn1{
+  background-color: #fff;
+  color: #333;
+  border-radius: 100rpx;
+  border: 1px solid #333;
+  font-weight: bold;
+  height: 46rpx;
+  padding: 0 12rpx;
+  margin: 0 0 0 24rpx;
+  line-height: 40rpx;
+  font-size: 26rpx;
+}
 </style>
\ No newline at end of file

From b18b593afa66c9ea8d259ed260f173004b831e56 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 11:27:08 +0800
Subject: [PATCH 08/20] =?UTF-8?q?Fix=EF=BC=9A3347=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=E9=80=81=E7=A4=BC?=
 =?UTF-8?q?=E6=96=B9=E4=B9=B0=E7=A4=BC=E5=93=81=E5=90=8E=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E6=B2=A1=E9=80=81=E5=87=BA=E5=8E=BB=E5=B0=B1=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=80=E6=AC=BE=EF=BC=8C=E8=A6=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=80=80=E6=AC=BE=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A24=E5=B0=8F=E6=97=B6=E5=90=8E=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 4333e8e76aa0019432ad68986a19e03b2d86baed)
---
 api/giftList.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/api/giftList.js b/api/giftList.js
index ade0a4f..b2ea842 100644
--- a/api/giftList.js
+++ b/api/giftList.js
@@ -20,3 +20,10 @@ export function giftCardSendList(param) {
 export function giftNotice(param) {
     return request.get('/giftCard/giftNotice', param)
 }
+
+/**
+ * 退款
+ */
+export function refund(param) {
+    return request.get('/giftCard/sendList', param) 
+}
\ No newline at end of file

From 01028a85b0cf5a2f69297b5eae285aa3081379d3 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 11:33:13 +0800
Subject: [PATCH 09/20] =?UTF-8?q?Fix=EF=BC=9A3440=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=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E2=80=94=E6=9F=A5=E7=9C=8B=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=90=8E=E8=BF=94=E5=9B=9E=E6=9C=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=BD=8D=E5=88=B0=E8=AF=A5=E8=AE=A2=E5=8D=95=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit cf0c180efd3a3a2109e46af2c34621aff13e4120)
---
 pages/order/MyOrder/index.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index c819cba..fe861e7 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -293,10 +293,13 @@ export default {
         }
       })
     } else {
-      _this.type = _this.type || parseInt(_this.$yroute.query.type) || 0;
-      _this.changeType(_this.type);
+      
     }
   },
+  onLoad() {
+    this.type = this.type || parseInt(this.$yroute.query.type) || 0;
+    this.changeType(this.type);
+  },
   methods: {
     handleBody() {
       this.orderList.forEach((e) => {

From 26b0ce03cdf42069c8b54fc9a652ca54c1d044fa Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 11:57:48 +0800
Subject: [PATCH 10/20] =?UTF-8?q?Fix=EF=BC=9A3170=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=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=89=B9=E8=89=B2=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E5=90=8E=E8=BF=94=E5=9B=9E=E8=AF=A5=E5=BA=97=E9=93=BA=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=88=97=E8=A1=A8=EF=BC=8C=E4=B8=8B=E6=BB=91=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E8=BF=87=E7=A8=8B=E4=B8=AD=E4=BC=9A=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E9=87=8D=E5=A4=8D=E5=B1=95=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=88=E4=BB=A5=E6=98=86=E6=98=8E=E7=9A=84?=
 =?UTF-8?q?=E5=AE=A2=E6=A0=88/=E6=B0=91=E5=AE=BF=E3=80=81=E4=B9=A1?=
 =?UTF-8?q?=E6=9D=91=E6=B8=B8=E5=88=97=E8=A1=A8=E4=B8=BA=E4=BE=8B=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 632886c81c2972b4cd6f4489ddb38d483f83d75a)
---
 pages/cloud/haveFun.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue
index 64d2817..378d00f 100644
--- a/pages/cloud/haveFun.vue
+++ b/pages/cloud/haveFun.vue
@@ -230,7 +230,6 @@ export default {
   },
   onShow() {
     const memCityName = uni.getStorageSync('cityName')
-    this.page = 1
     // this.typeIndex = 0
     this.name = ''
     if (memCityName.length) {

From 5d6ca1f03df931d04f69b75b0fb81c44d9f5d179 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 12:05:05 +0800
Subject: [PATCH 11/20] =?UTF-8?q?Fix=EF=BC=9A3478=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=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=88=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E5=BA=97=E9=93=BA=E3=80=81=E7=89=B9=E8=89=B2?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E3=80=81=E5=86=9C=E6=B0=91=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E3=80=81=20=E5=9F=8E=E5=B8=82=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=EF=BC=89=E6=BB=91=E5=8A=A8=E6=97=B6=E9=A1=B6=E9=83=A8=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E9=A2=9C=E8=89=B2=E6=94=B9=E4=B8=BA=E9=80=8F=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f2fba444a00ee09f07890b55d8e1c838aaa4313c)
---
 pagesInn/inn/farmerStore.vue                    | 2 +-
 pagesInn/inn/innHome.vue                        | 2 +-
 pkg_product/views/famousQianxianShop.vue        | 2 +-
 pkg_product/views/famousQianxianTheme.vue       | 2 +-
 pkg_product/views/famousQianxianVillageShop.vue | 2 +-
 pkg_product/views/festival.vue                  | 2 +-
 pkg_product/views/homestay.vue                  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pagesInn/inn/farmerStore.vue b/pagesInn/inn/farmerStore.vue
index 2aa02fd..00b67c8 100644
--- a/pagesInn/inn/farmerStore.vue
+++ b/pagesInn/inn/farmerStore.vue
@@ -2,7 +2,7 @@
   <view class="container">
     <hx-navbar
       :fixed="true"
-      :background-color="[[13,197,197],[13,197,197]]"
+      :background-color="[[0,0,0],[0,0,0]]"
       :pageScroll.sync="scrollData"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index c791e19..10c9fbe 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -3,7 +3,7 @@
     <!-- title="店铺主页" -->
     <hx-navbar
       :fixed="true"
-      :background-color="[[13,197,197],[13,197,197]]"
+      :background-color="[[0,0,0],[0,0,0]]"
       :pageScroll.sync="scrollData"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index a987516..5816a5b 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -2,7 +2,7 @@
   <view class="container">
     <hx-navbar
       :fixed="true"
-      :background-color="[[13,197,197],[13,197,197]]"
+      :background-color="[[0,0,0],[0,0,0]]"
       :pageScroll.sync="scrollData"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
diff --git a/pkg_product/views/famousQianxianTheme.vue b/pkg_product/views/famousQianxianTheme.vue
index e55ebd1..4182313 100644
--- a/pkg_product/views/famousQianxianTheme.vue
+++ b/pkg_product/views/famousQianxianTheme.vue
@@ -2,7 +2,7 @@
   <view>
     <hx-navbar
       :fixed="true"
-      :background-color="[[13,197,197],[13,197,197]]"
+      :background-color="[[0,0,0],[0,0,0]]"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
       transparent="auto"
diff --git a/pkg_product/views/famousQianxianVillageShop.vue b/pkg_product/views/famousQianxianVillageShop.vue
index eb6043d..e5f5507 100644
--- a/pkg_product/views/famousQianxianVillageShop.vue
+++ b/pkg_product/views/famousQianxianVillageShop.vue
@@ -2,7 +2,7 @@
   <view class="container">
     <hx-navbar
       :fixed="true"
-      :background-color="[[13,197,197],[13,197,197]]"
+      :background-color="[[0,0,0],[0,0,0]]"
       :pageScroll.sync="scrollData"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
diff --git a/pkg_product/views/festival.vue b/pkg_product/views/festival.vue
index e7662f0..b754602 100644
--- a/pkg_product/views/festival.vue
+++ b/pkg_product/views/festival.vue
@@ -2,7 +2,7 @@
   <view class="pkg-product-festival">
     <hx-navbar
       :fixed="true"
-      :background-color="[[13,197,197],[13,197,197]]"
+      :background-color="[[0,0,0],[0,0,0]]"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
       transparent="auto"
diff --git a/pkg_product/views/homestay.vue b/pkg_product/views/homestay.vue
index f866cd0..a93ddac 100644
--- a/pkg_product/views/homestay.vue
+++ b/pkg_product/views/homestay.vue
@@ -2,7 +2,7 @@
   <view class="pkg-product-homestay">
     <hx-navbar
       :fixed="true"
-      :background-color="[[13,197,197],[13,197,197]]"
+      :background-color="[[0,0,0],[0,0,0]]"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
       transparent="auto"

From f16793a06a5993569df05251a6d21ebda90adfcb Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 12:40:53 +0800
Subject: [PATCH 12/20] =?UTF-8?q?Fix=EF=BC=9A3477=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=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E4=BA=86=E4=BB=B7=E6=A0=BC=E9=9D=A2=E8=AE=AE=E7=9A=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BB=B7=E6=A0=BC=E5=8C=BA=E5=9F=9F=E9=9C=80=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E3=80=90=E4=BB=B7=E6=A0=BC=E9=9D=A2=E8=AE=AE?=
 =?UTF-8?q?=E3=80=91=EF=BC=88=E9=A1=B5=E9=9D=A2=EF=BC=9A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=88=97=E8=A1=A8=E3=80=81=E5=95=86=E8=AF=A6?=
 =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E5=BA=93=E5=AD=98=E5=90=8E=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E8=A7=84=E6=A0=BC=E5=BC=B9=E7=AA=97=E3=80=81?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E5=95=86=E5=93=81=E6=94=B6=E8=97=8F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E3=80=81=E5=95=86=E5=93=81=E8=B6=B3=E8=BF=B9?=
 =?UTF-8?q?=E3=80=81=E6=96=87=E7=8E=A9=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 3bbd796a85724528e99bcb817b0538bf39ca76b2)
---
 components/ProductWindow.vue   | 7 ++++++-
 pages/shop/GoodsCon/index.vue  | 1 +
 pages/shop/GoodsList/index.vue | 3 ++-
 pages/user/History/index.vue   | 3 ++-
 pagesInn/inn/innHome.vue       | 3 ++-
 pkg_user/views/myFavorite.vue  | 3 ++-
 wenwan/views/goodsClass.vue    | 3 ++-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue
index 63c57c0..5800a60 100644
--- a/components/ProductWindow.vue
+++ b/components/ProductWindow.vue
@@ -6,7 +6,7 @@
           <image :src="attrObj.productSelect.image" class="image" />
         </view>
         <view class="text">
-          <view class="money font-color-lightred v12-font-">
+          <view v-if="!isNegotiable" class="money font-color-lightred v12-font-">
             ￥
             <text class="num v12-font-40">{{ attrObj.productSelect.price }}</text>
             <text class="v12-ml-2 v12-font-weight-300 v12-font-22" style="color: #BBBBBB; text-decoration: line-through;">￥</text>
@@ -14,6 +14,7 @@
             <text class="v12-white-text v12-red v12-font-22 v12-radius-40 v12-px-1 v12-font-weight-400">会员价</text>
             <!-- <text class="stock">库存: {{ attrObj.productSelect.stock }}</text> -->
           </view>
+          <view class="v12-primary-text" v-else>价格面议</view>
           <view class="more-t">{{ attrObj.productSelect.store_name }}</view>
         </view>
         <view class="iconfont icon-guanbi" @click="closeAttr"></view>
@@ -90,6 +91,10 @@
 export default {
   name: "ProductWindow",
   props: {
+    isNegotiable: {
+      type: Boolean,
+      default: false
+    },
     isGift: {
       type: Boolean,
       default: false
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 8f38f0f..9623fcc 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -482,6 +482,7 @@
           :attr="attr"
           :cartNum="cart_num"
           @changeFun="changeFun"
+          :isNegotiable="storeInfo.isNegotiable === 1"
           @gift="gift"
           :isGift="isGift"
         />
diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue
index 2c5856c..d1149c6 100644
--- a/pages/shop/GoodsList/index.vue
+++ b/pages/shop/GoodsList/index.vue
@@ -73,7 +73,7 @@
           <view class="text">
             <view class="name more-t">{{ item.storeName }}</view>
             <view class="vip acea-row row-between-wrapper">
-              <view class="ai-end" :class="{'flex': force2Decimal(item.price).length < 6}">
+              <view v-if="!item.isNegotiable" class="ai-end" :class="{'flex': force2Decimal(item.price).length < 6}">
                 <view class="money">
                   ￥
                   <text class="num" v-if="item.vipPrice && item.vipPrice > 0">{{ force2Decimal(item.vipPrice) }}</text>
@@ -81,6 +81,7 @@
                 </view>
                 <view class="vip-money">￥{{ force2Decimal(item.otPrice) }}</view>
               </view>
+              <view v-else class="money">价格面议</view>
               <view class="" @click.stop="addToCart(item)">
                 <image class="logo" :src="webUrl+'/orderIcon/组 355.png'" mode="" style="margin-right:0; width: 34rpx; height:34rpx"/>
               </view>
diff --git a/pages/user/History/index.vue b/pages/user/History/index.vue
index ca89ea1..66a3887 100644
--- a/pages/user/History/index.vue
+++ b/pages/user/History/index.vue
@@ -45,7 +45,7 @@
                 </view>
                 <view class="more-t v12-font-20 v12-mt-2">{{ historyItem.storeName }}</view>
                 <view class="v12-justify-between v12-mt-2 price">
-                  <view class="v12-font-bold v12-primary-text" :class="{'v12-align-center': (historyItem.price).toString().length < 5 && (historyItem.otPrice).toString().length < 5 }">
+                  <view v-if="!historyItem.isNegotiable" class="v12-font-bold v12-primary-text" :class="{'v12-align-center': (historyItem.price).toString().length < 5 && (historyItem.otPrice).toString().length < 5 }">
                     <text class="v12-font-16">￥</text>
                     <text class="v12-font-24 v12-mr-1">{{ historyItem.price }}</text>
                     <view class="ot-price v12-font-weight-400">
@@ -54,6 +54,7 @@
                       <view class="under-line"></view>
                     </view>
                   </view>
+                  <view v-else class="v12-font-26 v12-primary-text v12-font-bold">价格面议</view>
                   <image
                     :src="webUrl+'/orderIcon/组 355.png'"
                     class="icon"
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index 10c9fbe..765dad2 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -179,7 +179,7 @@
                   />
                   <view class="">
                     <view class="name more-t">{{ item.storeName }}</view>
-                    <view class="price-line flex ai-center">
+                    <view class="price-line flex ai-center" v-if="!item.isNegotiable">
                       <image
                         :src="webUrl + '/20221118104357701129.png'"
                         class="label"
@@ -187,6 +187,7 @@
                       />
                       <text>￥{{ item.price }}</text>
                     </view>
+                    <view class="v12-primary-text v12-font-26" v-else>价格面议</view>
                   </view>
                   <view class="sales-line flex ai-center">
                     <image
diff --git a/pkg_user/views/myFavorite.vue b/pkg_user/views/myFavorite.vue
index 9cf896e..2223e1e 100644
--- a/pkg_user/views/myFavorite.vue
+++ b/pkg_user/views/myFavorite.vue
@@ -86,11 +86,12 @@
           >{{ item['storeName'] }}</view>
           <view class="sub" @click="navToGoods(item)">规格:{{ item['sku'] }}</view>
           <view class="flex jc-between ai-end">
-            <view class="price flex ai-end" @click="navToGoods(item)">
+            <view v-if="!item.isNegotiable" class="price flex ai-end" @click="navToGoods(item)">
               <text style="color:#E92727">￥</text>
               <text style="color:#E92727;font-size: 32rpx;line-height: 48rpx">{{ item['price'] }}</text>
               <text style="margin-left: 10rpx;text-decoration:line-through">￥{{ item['otPrice'] }}</text>
             </view>
+            <view v-else class="v12-primary-text v12-font-26">价格面议</view>
             <view class="cart flex jc-center ai-center">
               <image :src="webUrl+'/20240107224527293534.png'" mode="scaleToFill" @click="addCart(item)"/>
             </view>
diff --git a/wenwan/views/goodsClass.vue b/wenwan/views/goodsClass.vue
index 1801127..3bf2919 100644
--- a/wenwan/views/goodsClass.vue
+++ b/wenwan/views/goodsClass.vue
@@ -52,7 +52,8 @@
 <!--              <text>单位:{{ item.unitName || "" }}</text>-->
             </view>
 <!--            <view class="info-line" style="margin-top: 4rpx">规格:{{ item.storeInfo || "" }}</view>-->
-            <view class="price-line">￥{{ item.price }}</view>
+            <view class="price-line" v-if="!item.isNegotiable">￥{{ item.price }}</view>
+            <view class="price-line" v-else>价格面议</view>
 
           </view>
         </view>

From 1510d5e9d98246484b8be55b3b9057804dac7571 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Tue, 1 Apr 2025 12:55:36 +0800
Subject: [PATCH 13/20] =?UTF-8?q?Fix=EF=BC=9A3416=20=E3=80=90=E7=A4=BC?=
 =?UTF-8?q?=E5=93=81=E5=8A=9F=E8=83=BD=E3=80=91=E9=80=81=E7=A4=BC=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=89=8B=E5=8A=A8=E5=88=A0=E9=99=A4=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=AF=A5=E6=95=B0=E9=87=8F=E6=A1=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=A9=BA=E7=99=BD=EF=BC=8C=E5=88=A0=E9=99=A4=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E5=90=8E=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=BA1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 68cfae2893c487ed6663690cf95d8f05dc52a6eb)
---
 components/ProductWindow.vue | 20 ++++++++------------
 pkg_user/views/gift/gift.vue | 10 +++++++++-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue
index 5800a60..8e53443 100644
--- a/components/ProductWindow.vue
+++ b/components/ProductWindow.vue
@@ -51,7 +51,7 @@
             type="number"
             :min="1"
             :max="attrObj.productSelect.stock"
-            @input="inputNumer"
+            @blur="inputNumer(cartNumber)"
             v-model="cartNumber" 
             style="height: 55rpx !important; width:80rpx !important"
             class="item v12-font-36 v12-font-bold v12-dark-text cart-btn" />
@@ -139,16 +139,8 @@ export default {
     },
     cartNumber(val) {
       console.log(+val <= 1 || val === '', 'cartNumber');
-      if(+val <= 1 || val === '') {
-        this.cartNumber = 1
-        this.$forceUpdate()
-        this.$emit('input', 1)
-        this.$emit("changeFun", { action: "ChangeCartNum", value: 1 })
-        return
-      } else {
-        this.$emit('input', +val)
-        this.$emit("changeFun", { action: "ChangeCartNum", value: +val })
-      }
+      this.$emit('input', +val)
+      this.$emit("changeFun", { action: "ChangeCartNum", value: +val })
     }
   },
   created() {
@@ -157,7 +149,11 @@ export default {
   },
   methods: {
     inputNumer(e) {
-      
+      console.log(e);
+      if(e === '') {
+        this.cartNumber = 1
+        this.$forceUpdate()
+      }
     },
     reRender(data) {
       this.$set(this, 'attrObj', JSON.parse(JSON.stringify(data)))
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index af4b2ef..d781d6a 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -54,7 +54,6 @@
               <text class="v12-primary-text v12-font-bold v12-font-30">{{ payPrice }}</text>
             </view>
             <view>
-              
               <u-number-box
                 v-if="!isPayOk"
                 v-model="goodsInfo.cartNum"
@@ -63,6 +62,7 @@
                 iconStyle="color: #fff"
                 class="num-step"
                 @change="numberChange"
+                @blur="numberBlur(goodsInfo.cartNum)"
                 
               >
                 <template v-slot:minus>
@@ -230,6 +230,14 @@ export default {
     numberChange(e) {
       this.computedPrice(e.value)
     },
+    numberBlur(e) {
+      console.log(e);
+      this.isPayOk = true
+      setTimeout(() => {
+        this.isPayOk = false 
+      },10)
+      this.$forceUpdate()
+    },
     computedPrice(num) {
       const params = {
         cartId: this.cartId,

From 35b57bbcccc420aa09ab16f0b2bb7351fc3d63ad Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 2 Apr 2025 00:07:41 +0800
Subject: [PATCH 14/20] =?UTF-8?q?Fix=EF=BC=9A3347=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=E9=80=81=E7=A4=BC?=
 =?UTF-8?q?=E6=96=B9=E4=B9=B0=E7=A4=BC=E5=93=81=E5=90=8E=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E6=B2=A1=E9=80=81=E5=87=BA=E5=8E=BB=E5=B0=B1=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=80=E6=AC=BE=EF=BC=8C=E8=A6=81=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E9=80=80=E6=AC=BE=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A24=E5=B0=8F=E6=97=B6=E5=90=8E=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/giftList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/giftList.js b/api/giftList.js
index b2ea842..c950ace 100644
--- a/api/giftList.js
+++ b/api/giftList.js
@@ -25,5 +25,5 @@ export function giftNotice(param) {
  * 退款
  */
 export function refund(param) {
-    return request.get('/giftCard/sendList', param) 
+    return request.post('/giftCard/refund', param) 
 }
\ No newline at end of file

From 610ea7ece12e8e0d6c26f9bf98f10f24df6c5e4a Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 2 Apr 2025 00:21:22 +0800
Subject: [PATCH 15/20] =?UTF-8?q?Fix=EF=BC=9A3580=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=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E4=BA=86=E4=BB=B7=E6=A0=BC=E9=9D=A2=E8=AE=AE=E7=9A=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BB=B7=E6=A0=BC=E5=8C=BA=E5=9F=9F=E9=9C=80=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E3=80=90=E4=BB=B7=E6=A0=BC=E9=9D=A2=E8=AE=AE?=
 =?UTF-8?q?=E3=80=91=EF=BC=88=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E3=80=81?=
 =?UTF-8?q?=E5=95=86=E8=AF=A6=E9=A1=B5=E7=9A=84=E5=BA=97=E9=93=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8C=BA=E5=9F=9F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/GoodsCon/index.vue | 3 ++-
 pagesInn/inn/innGoodList.vue  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 9623fcc..ae19de3 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -328,7 +328,8 @@
                 <view class="more-t bold">{{ item.storeName }}</view>
               </view>
               <view class="v12-justify-between">
-                <view class="price bold">￥{{ item.price }}</view>
+                <view class="price bold" v-if="!item.isNegotiable">￥{{ item.price }}</view>
+                <view class="price bold" v-else>价格面议</view>
                 <view class="">
                   <image class="logo" :src="webUrl+'/orderIcon/组 355.png'" mode="" style="margin-right:0; width: 28rpx; height:28rpx"/>
                 </view>
diff --git a/pagesInn/inn/innGoodList.vue b/pagesInn/inn/innGoodList.vue
index 2334d1c..d9b1481 100644
--- a/pagesInn/inn/innGoodList.vue
+++ b/pagesInn/inn/innGoodList.vue
@@ -14,7 +14,7 @@
           />
           <view class="">
             <view class="name more-t">{{ item.storeName }}</view>
-            <view class="price-line flex ai-center">
+            <view class="price-line flex ai-center" v-if="!item.isNegotiable">
               <image
                 :src="webUrl + '/20221118104357701129.png'"
                 class="label"
@@ -22,6 +22,7 @@
               />
               <text>￥{{ item.price }}</text>
             </view>
+            <view v-else class="price-line">价格面议</view>
           </view>
           <view class="sales-line flex ai-center">
             <image

From 6f2957f5149878c405792c9abcffd29e2d2fb3b7 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 2 Apr 2025 00:23:18 +0800
Subject: [PATCH 16/20] =?UTF-8?q?Fix=EF=BC=9A3581=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=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E4=BA=86=E4=BB=B7=E6=A0=BC=E9=9D=A2=E8=AE=AE=E7=9A=84=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E3=80=90=E5=8A=A0=E5=85=A5=E8=B4=AD=E7=89=A9=E8=BD=A6=E3=80=91?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shop/GoodsCon/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index ae19de3..fb0e9be 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -1365,6 +1365,10 @@ export default {
     },
     // 点击加入购物车按钮
     joinCart() {
+      if(this.storeInfo.isNegotiable === 1) {
+        this.$u.toast('该商品为面议商品，无法加入购物车')
+        return
+      }
       if ((this.attr.productSelect.stock === 0 && this.attr.cartAttr) || this.storeInfo.stock === 0 || this.storeInfo.isNegotiable === 1) {
         return
       }

From eb9533fb7d35d0c85a91e248d660c4e615d3f863 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 2 Apr 2025 00:33:20 +0800
Subject: [PATCH 17/20] =?UTF-8?q?Fix=EF=BC=9A3583=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=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E2=80=94=E6=9C=89=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=87=E6=8D=A2=E8=87=B3=E6=97=A0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E5=BA=97=E9=93=BA=E6=97=B6=EF=BC=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E4=B8=AD=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E9=A1=B9=EF=BC=9B=E6=97=A0=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=87=E6=8D=A2=E8=87=B3=E6=9C=89=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E5=BA=97=E9=93=BA=E6=97=B6=EF=BC=8C=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=95=86=E5=93=81=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesInn/inn/innHome.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index 765dad2..11437cc 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -617,6 +617,7 @@ export default {
         this.fetchInnInfoList()
       }
       this.fetchInnDetail()
+      this.fetchGoods(this.id)
     },
     changeHome() {
       uni.showLoading()
@@ -931,11 +932,11 @@ export default {
           break
       }
     },
-    fetchGoods() {
+    fetchGoods(id) {
       this.isLoadGoodListoSuccess = false
       this.goodsList = []
       getHotelGoodList({
-        id: this.inn.id,
+        id: id || this.inn.id,
         page: 1,
         limit: 12
       }).then(res => {

From 2a274766a10d50245027568525c6c0a8354c6a78 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 2 Apr 2025 10:13:38 +0800
Subject: [PATCH 18/20] =?UTF-8?q?Fix=EF=BC=9A3583=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=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E2=80=94=E6=9C=89=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=87=E6=8D=A2=E8=87=B3=E6=97=A0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E5=BA=97=E9=93=BA=E6=97=B6=EF=BC=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E4=B8=AD=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E9=A1=B9=EF=BC=9B=E6=97=A0=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=87=E6=8D=A2=E8=87=B3=E6=9C=89=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E5=BA=97=E9=93=BA=E6=97=B6=EF=BC=8C=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=95=86=E5=93=81=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesInn/inn/farmerStore.vue                    | 2 +-
 pagesInn/inn/innHome.vue                        | 2 +-
 pkg_product/views/famousQianxianShop.vue        | 2 +-
 pkg_product/views/famousQianxianTheme.vue       | 2 +-
 pkg_product/views/famousQianxianVillageShop.vue | 2 +-
 pkg_product/views/festival.vue                  | 2 +-
 pkg_product/views/homestay.vue                  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pagesInn/inn/farmerStore.vue b/pagesInn/inn/farmerStore.vue
index 00b67c8..46dc48a 100644
--- a/pagesInn/inn/farmerStore.vue
+++ b/pagesInn/inn/farmerStore.vue
@@ -2,7 +2,7 @@
   <view class="container">
     <hx-navbar
       :fixed="true"
-      :background-color="[[0,0,0],[0,0,0]]"
+      :background-color="[0,[0,0,0,0],[0,0,0,0]]"
       :pageScroll.sync="scrollData"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index 11437cc..7964ec1 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -3,7 +3,7 @@
     <!-- title="店铺主页" -->
     <hx-navbar
       :fixed="true"
-      :background-color="[[0,0,0],[0,0,0]]"
+      :background-color="[0,[0,0,0,0],[0,0,0,0]]"
       :pageScroll.sync="scrollData"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 5816a5b..f82d26b 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -2,7 +2,7 @@
   <view class="container">
     <hx-navbar
       :fixed="true"
-      :background-color="[[0,0,0],[0,0,0]]"
+      :background-color="[0,[0,0,0,0],[0,0,0,0]]"
       :pageScroll.sync="scrollData"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
diff --git a/pkg_product/views/famousQianxianTheme.vue b/pkg_product/views/famousQianxianTheme.vue
index 4182313..727c3db 100644
--- a/pkg_product/views/famousQianxianTheme.vue
+++ b/pkg_product/views/famousQianxianTheme.vue
@@ -2,7 +2,7 @@
   <view>
     <hx-navbar
       :fixed="true"
-      :background-color="[[0,0,0],[0,0,0]]"
+      :background-color="[0,[0,0,0,0],[0,0,0,0]]"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
       transparent="auto"
diff --git a/pkg_product/views/famousQianxianVillageShop.vue b/pkg_product/views/famousQianxianVillageShop.vue
index e5f5507..af1e40e 100644
--- a/pkg_product/views/famousQianxianVillageShop.vue
+++ b/pkg_product/views/famousQianxianVillageShop.vue
@@ -2,7 +2,7 @@
   <view class="container">
     <hx-navbar
       :fixed="true"
-      :background-color="[[0,0,0],[0,0,0]]"
+      :background-color="[0,[0,0,0,0],[0,0,0,0]]"
       :pageScroll.sync="scrollData"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
diff --git a/pkg_product/views/festival.vue b/pkg_product/views/festival.vue
index b754602..226bc7a 100644
--- a/pkg_product/views/festival.vue
+++ b/pkg_product/views/festival.vue
@@ -2,7 +2,7 @@
   <view class="pkg-product-festival">
     <hx-navbar
       :fixed="true"
-      :background-color="[[0,0,0],[0,0,0]]"
+      :background-color="[0,[0,0,0,0],[0,0,0,0]]"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
       transparent="auto"
diff --git a/pkg_product/views/homestay.vue b/pkg_product/views/homestay.vue
index a93ddac..4f68c9b 100644
--- a/pkg_product/views/homestay.vue
+++ b/pkg_product/views/homestay.vue
@@ -2,7 +2,7 @@
   <view class="pkg-product-homestay">
     <hx-navbar
       :fixed="true"
-      :background-color="[[0,0,0],[0,0,0]]"
+      :background-color="[0,[0,0,0,0],[0,0,0,0]]"
       statusBarFontColor="#ffffff"
       barPlaceholder="hidden"
       transparent="auto"

From 8c85c4465e55da466a915de08e4c7b6bab409885 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 2 Apr 2025 11:01:01 +0800
Subject: [PATCH 19/20] =?UTF-8?q?Fix=EF=BC=9A3156=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=E5=AE=A2=E6=9C=8D?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF--=E7=82=B9=E5=87=BB=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E5=9C=A8=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=AD=E7=82=B9=E5=87=BB=E2=80=9C?=
 =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E2=80=9D=EF=BC=8C=E8=81=8A=E5=A4=A9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=98=BE=E7=A4=BA=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_common/views/room.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_common/views/room.vue b/pkg_common/views/room.vue
index 7371e94..ec6df9a 100644
--- a/pkg_common/views/room.vue
+++ b/pkg_common/views/room.vue
@@ -129,7 +129,7 @@ export default {
     this.content = uni.getStorageSync(this.merName+this.uid+this.storeId)
     this.connectSocketInit()
   },
-  onUnload() {
+  onHide() {
     if (this.socketOpen) {
       this.socketTask.close();
     }

From 72725d051eff65242bb543add3d83de9e1ec674a Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 2 Apr 2025 11:30:10 +0800
Subject: [PATCH 20/20] =?UTF-8?q?Fix=EF=BC=9A3583=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=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E2=80=94=E6=9C=89=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=87=E6=8D=A2=E8=87=B3=E6=97=A0=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E5=BA=97=E9=93=BA=E6=97=B6=EF=BC=8C=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E4=B8=AD=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E9=A1=B9=EF=BC=9B=E6=97=A0=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=87=E6=8D=A2=E8=87=B3=E6=9C=89=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E5=BA=97=E9=93=BA=E6=97=B6=EF=BC=8C=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=95=86=E5=93=81=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesInn/inn/innHome.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue
index 7964ec1..99e5a19 100644
--- a/pagesInn/inn/innHome.vue
+++ b/pagesInn/inn/innHome.vue
@@ -611,13 +611,14 @@ export default {
   methods: {
     goHome(e) {
       this.id = e.id
+      this.isLoad = false
       if(this.activeIndex !==1) {
         this.activeInde = 1
       } else {
         this.fetchInnInfoList()
       }
       this.fetchInnDetail()
-      this.fetchGoods(this.id)
+      // this.fetchGoods(this.id)
     },
     changeHome() {
       uni.showLoading()
@@ -852,6 +853,8 @@ export default {
               _this.activeIndex = 1
               _this.tabList[0].isShow = false
             } else {
+              _this.activeIndex = 0
+              this.tabList[0].isShow = true
               _this.fetchGoods()
             }
           }