From f12fb1012d7977e58c115a4f7865b9db52f81a7e Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 14 Nov 2025 17:55:45 +0800
Subject: [PATCH 01/78] =?UTF-8?q?Feat(=E9=9D=9E=E9=81=97=E6=96=87=E5=88=9B?=
 =?UTF-8?q?):=E5=A2=9E=E5=8A=A0AI=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/heritage/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg_product/views/heritage/index.vue b/pkg_product/views/heritage/index.vue
index 2f3abd6..7cc81eb 100644
--- a/pkg_product/views/heritage/index.vue
+++ b/pkg_product/views/heritage/index.vue
@@ -87,12 +87,17 @@
         class="img-nodata"
       />
     </view>
+    <AiEntrance />
   </view>
 </template>
 
 <script>
 import { getIch, getIchRecommend } from '@/api/heritage'
+import AiEntrance from '@/components/aiChat/entrance'
 export default {
+  components: {
+    AiEntrance
+  },
   data() {
     return {
       webUrl: this.$VUE_APP_RESOURCES_URL,

From 98472cb048b4a62c54fc39a2ab58189af62d8e50 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 14 Nov 2025 17:56:07 +0800
Subject: [PATCH 02/78] =?UTF-8?q?Feat(=E9=9D=9E=E9=81=97=E6=96=87=E5=88=9B?=
 =?UTF-8?q?):=E5=9B=BE=E7=89=87=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/heritage.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg_product/views/heritage.vue b/pkg_product/views/heritage.vue
index 06f1eb8..85f7b75 100644
--- a/pkg_product/views/heritage.vue
+++ b/pkg_product/views/heritage.vue
@@ -196,8 +196,10 @@ export default {
     }
 
     .img-item {
+      display: block;
       width: 160rpx;
       height: 160rpx;
+      transform: scale(1.33);
     }
   }
 }

From 89102815275f0b939822ee149838167f3346c25f Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 14 Nov 2025 17:57:02 +0800
Subject: [PATCH 03/78] =?UTF-8?q?Feat(=E5=8D=83=E5=8E=BF):=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0AI=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/famousQianxianShop.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 0324713..5a5b4dc 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -711,6 +711,7 @@
       @ok="handleOk"
     />
     <FunctionGuide @hide="setGuide('countyFamousIndex')" :maxStep="2" :guideData="functionGuideData" ref="FunctionGuide"></FunctionGuide>
+    <AiEntrance />
   </view>
 </template>
 
@@ -743,12 +744,14 @@ import cookie from '@/utils/store/cookie'
 import { pageListenMixins } from '@/mixins/pageListenMixins'
 import FunctionGuide from '@/components/FunctionGuide'
 import GuideMixins from '@/mixins/GuideMixins'
+import AiEntrance from '@/components/aiChat/entrance'
 export default {
   components: {
     imgBox,
     XddProductItem,
     ProductWindow,
-    FunctionGuide
+    FunctionGuide,
+    AiEntrance
   },
   mixins: [pageListenMixins, goCartMixin, GuideMixins],
   data() {

From 036ae02b7b38f28336bb7f337df59700537e4e87 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 14 Nov 2025 17:57:36 +0800
Subject: [PATCH 04/78] =?UTF-8?q?Feat(=E5=8D=83=E5=8E=BF):=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E4=BA=AB=E6=9C=8B=E5=8F=8B=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/famousQianxianShop.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 5a5b4dc..132c6f5 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -821,6 +821,17 @@ export default {
       countyId: null,
     }
   },
+  onShareAppMessage() {
+    uni.updateShareMenu({ 
+      isPrivateMessage: false,
+      withShareTicket: false
+    })
+    return {
+      title: this.inn.countyName || this.share.title,
+      path: '/pkg_product/views/famousQianxianShop?id=' + this.id,
+      imageUrl: this.inn.cover || this.share.imageUrl
+    }
+  },
   // 必须在页面加 onPageScroll(e){} ，才能滑动显示背景
   onPageScroll(e) {
     this.scrollData = e

From bc5f60d58c00e63d39fb74bcda5c4a1d07764114 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 14 Nov 2025 17:58:07 +0800
Subject: [PATCH 05/78] =?UTF-8?q?Feat(=E4=B8=93=E9=A2=98=E9=A1=B5):?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E4=BA=AB=E6=9C=8B=E5=8F=8B=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/mixins/themeMixins.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkg_product/mixins/themeMixins.js b/pkg_product/mixins/themeMixins.js
index dd6c687..6d99d78 100644
--- a/pkg_product/mixins/themeMixins.js
+++ b/pkg_product/mixins/themeMixins.js
@@ -44,6 +44,18 @@ export const themeMixins = {
       }
     }
   },
+  onShareTimeline() {
+    uni.updateShareMenu({ 
+      isPrivateMessage: false,
+      withShareTicket: false
+    })
+    const title = this.pageData.forwardTitle || this.share.title
+    return {
+      title,
+      query: `id=${this.pageData.id}`,
+      imageUrl: this.pageData.forwardImage || this.share.imageUrl
+    }
+  },
   methods: {
     topImageClick() {
       if (this.templateProperties.page1CouponEnable === 1 && this.templateProperties.page1CouponId) {

From 19b9a268115d54df05762b3d223ebaa4dccd2fb9 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 14 Nov 2025 17:58:37 +0800
Subject: [PATCH 06/78] =?UTF-8?q?Feat(=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?):=E5=A2=9E=E5=8A=A0=E5=88=86=E4=BA=AB=E6=9C=8B=E5=8F=8B?=
 =?UTF-8?q?=E5=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 03e485f..e3d6b4e 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -688,6 +688,43 @@ export default {
       }
     })
   },
+  onShareTimeline() {
+    uni.updateShareMenu({ 
+      isPrivateMessage: false,
+      withShareTicket: false
+    })
+    const storeName = this.storeInfo.storeName
+    const promise = new Promise(async (resolve, reject) => {
+      let result = null
+      let query = `id=${this.id}&partnerId=${this.userInfo.uid}`
+      if (this.source === 'famous') {
+        result = await famousGoodsShareImage(this.id)
+      }
+      if (this.source === 'kill') {
+        result = await secKillGoodsShareImage(this.activityId)
+        query += `&activityId=${this.activityId}`
+      }
+      if (result && result.status === 200) {
+        resolve({
+          title: storeName,
+          query,
+          imageUrl: result.data
+        })
+      } else {
+        resolve({
+          title: storeName,
+          query,
+          imageUrl: this.storeInfo.image
+        })
+      }
+    })
+    return {
+      title: storeName,
+      query: `id=${this.id}&partnerId=${this.userInfo.uid}`,
+      imageUrl: this.storeInfo.image,
+      promise
+    }
+  },
   onLoad(options) {
     // test data
     console.log("getLaunchOptionsSync", uni.getLaunchOptionsSync())

From e475238946769a1a3c99691b0762c795afa43e31 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 14 Nov 2025 17:59:13 +0800
Subject: [PATCH 07/78] =?UTF-8?q?Feat(AI):=E5=A2=9E=E5=8A=A0=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=9C=AA=E5=AE=9A=E4=BD=8D=E8=BF=9B=E5=85=A5=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=A4=A9=E6=B0=94=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/aiChat/entrance.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/aiChat/entrance.vue b/components/aiChat/entrance.vue
index ccbb31d..84abd48 100644
--- a/components/aiChat/entrance.vue
+++ b/components/aiChat/entrance.vue
@@ -24,7 +24,8 @@ export default {
   data() {
     return {
       showImg: false,
-      settingInfo: {}
+      settingInfo: {},
+      localCityName: uni.getStorageSync('locationCityName') || ''
     }
   },
   created() {
@@ -42,7 +43,7 @@ export default {
     },
     enterAiChat() {
       uni.navigateTo({
-        url: '/aiChat/views/index?click=1&cityName=' + this.cityName
+        url: '/aiChat/views/index?click=1&cityName=' + (this.cityName || this.localCityName)
       })
     }
   }

From 1d34f4dd08b9e6de44aa8d9cfb2242f6e5b7ff0a Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Nov 2025 11:10:34 +0800
Subject: [PATCH 08/78] =?UTF-8?q?Fix=EF=BC=9A4602=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=9B=A2=E8=B4=AD=E8=AE=A2=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=81=94=E7=B3=BB=E5=95=86=E5=AE=B6-?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=AB=8B=E5=8D=B3=E6=8B=A8=E6=89=93=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/submitOrder.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_product/views/submitOrder.vue b/pkg_product/views/submitOrder.vue
index bc354ed..ec8de6c 100644
--- a/pkg_product/views/submitOrder.vue
+++ b/pkg_product/views/submitOrder.vue
@@ -210,9 +210,9 @@ export default {
         confirmText: '立即拨打',
         cancelText: '取消',
         success: (res) => {
-          if (res.confirm && this.detail.merPhone) {
+          if (res.confirm && this.orderInfo.merPhone) {
             uni.makePhoneCall({
-              phoneNumber: this.detail.merPhone,
+              phoneNumber: this.orderInfo.merPhone,
             })
           }
         }

From 2d8f2b16a94cdd1ecfa2b83c7479a28d9fc18d18 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Nov 2025 11:26:44 +0800
Subject: [PATCH 09/78] =?UTF-8?q?Fix=EF=BC=9A4600=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E2=80=94=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=88=86=E7=B1=BB=E4=B8=BA=E2=80=9C=E5=BA=B7?=
 =?UTF-8?q?=E5=85=BB=E9=A1=B6=E9=83=A8=E2=80=9D=EF=BC=8C=E5=9C=A8=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=89=80=E6=9C=89=E5=BA=B7?=
 =?UTF-8?q?=E5=85=BB=E5=9F=8E=E5=B8=82=E9=A1=B6=E9=83=A8=E9=83=BD=E4=BC=9A?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/healthSanctum.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue
index 9b7afd2..adbd70a 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -126,7 +126,7 @@ export default {
     getList() {
       const params = {
         // countyId: this.cityId,
-        // cityId: this.cityId,
+        cityId: this.cityId,
         wellnessPlaceCateId : this.categoryId,
         shopType: 'wellness',
         page: 1,
@@ -144,7 +144,7 @@ export default {
     },
     getTop() {
       const params = {
-        // cityId: this.cityId,
+        cityId: this.cityId,
         shopType: 'wellness',
         page: 1,
         limit: 9999

From 3d8df506e0472e0b7aa1d76e32f63532abaa53c7 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Nov 2025 11:51:15 +0800
Subject: [PATCH 10/78] =?UTF-8?q?Fix=EF=BC=9A4388=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E5=8F=B7=E7=A0=81=E5=9C=A8=E5=89=8D=E7=AB=AF=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=9C=AA=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/sojoumOrderDetails.vue | 2 +-
 pkg_product/views/sojoumStore.vue        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_product/views/sojoumOrderDetails.vue b/pkg_product/views/sojoumOrderDetails.vue
index 30eaa7d..ffa2be4 100644
--- a/pkg_product/views/sojoumOrderDetails.vue
+++ b/pkg_product/views/sojoumOrderDetails.vue
@@ -74,7 +74,7 @@
         <view class="phone-actions v12-align-center" v-if="title === '商家电话'">
           <!-- <button class="action-btn cancel" @click="showPhonePopup = false">取消</button>
           <button class="action-btn call" @click="makePhoneCall">立即拨打</button> -->
-          <view  class="v12-font-28 v12-primary-text v12-primary-border v12-radius-100 v12-primary-text" @click="contactMerchant('phone')">立即拨打</view> | <view class="v12-font-28" @click="showPhonePopup = false">取消</view>
+          <view  class="v12-font-28 v12-primary-text v12-primary-border v12-radius-100 v12-primary-text v12-px-2" @click="contactMerchant('phone')">立即拨打</view><view class="v12-font-28 v12-dark-border v12-radius-100 v12-px-2" @click="showPhonePopup = false">取消</view>
         </view>
         <view class="phone-actions v12-align-center" v-if="title === '商家微信'">
           <!-- <button class="action-btn cancel" @click="showPhonePopup = false">取消</button>
diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index 90ca899..7c1edd0 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -658,10 +658,10 @@ export default {
       })
     },
     call() {
-      if (this.store.tel != undefined && this.store.tel.length > 0) {
+      if (this.store.phone != undefined && this.store.phone.length > 0) {
         uni.makePhoneCall({
           // 手机号
-          phoneNumber: this.store.tel,
+          phoneNumber: this.store.phone,
           // 成功回调
           success: (res) => {
             console.log('调用成功!')

From 51ff86e4f8c82cc30a8d60c98b0c2575cd240a28 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Nov 2025 14:03:59 +0800
Subject: [PATCH 11/78] =?UTF-8?q?Fix=EF=BC=9A4519=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E9=80=81=E7=A4=BC=E2=80=94=E7=A4=BC=E5=8C=85=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA=E2=80=9C=E7=A4=BC=E5=8C=85?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/sojoumOrderDetails.vue b/pkg_product/views/sojoumOrderDetails.vue
index ffa2be4..a2f98d3 100644
--- a/pkg_product/views/sojoumOrderDetails.vue
+++ b/pkg_product/views/sojoumOrderDetails.vue
@@ -120,7 +120,7 @@
       </view>
       <view class="info-item">
         <text class="label">订单类型</text>
-        <text class="value">其他类型</text>
+        <text class="value">{{ orderInfo.isGiftCardReceive > 0 || orderInfo.isGiftCardSend > 0 ? '礼包订单' : '其他类型'}}</text>
       </view>
       <view class="info-item">
         <text class="label">支付状态</text>

From b260bb9e34c2af8ae0d4ba5a54fea120d9cc5a73 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Nov 2025 14:04:56 +0800
Subject: [PATCH 12/78] =?UTF-8?q?Fix=EF=BC=9A4373=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=B8=AD=E7=8A=B6=E6=80=81=E4=B8=8B=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=92=A4=E9=94=80=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=88=E5=8F=82=E8=80=83=E4=BE=9B=E5=BA=94=E5=95=86=E5=92=8C?=
 =?UTF-8?q?=E7=89=B9=E8=89=B2=E5=BA=97=E9=93=BA=E7=9A=84=E5=85=A5=E9=A9=BB?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E3=80=90=E5=AE=A1=E6=A0=B8=E4=B8=AD?=
 =?UTF-8?q?=E3=80=91=E7=8A=B6=E6=80=81=E6=A0=87=E8=AF=86=E6=8F=90=E5=88=B0?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E3=80=90=E6=92=A4=E9=94=80=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E3=80=91=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/join.js                        |  7 +++++++
 pkg_join/views/travelResidence.vue | 33 ++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/api/join.js b/api/join.js
index 253f96a..47ea1ec 100644
--- a/api/join.js
+++ b/api/join.js
@@ -85,3 +85,10 @@ export function saveTravel(params) {
 export function saveTravelDraft(params) {
     return request.post("/merchantApply/travel/saveDraft", params, {login: true})
 }
+
+/**
+ * 旅居管家撤销申请
+ */
+export function revokeTravel(params) {
+    return request.post("/travel/revoke", params, {login: true})
+}
diff --git a/pkg_join/views/travelResidence.vue b/pkg_join/views/travelResidence.vue
index ffcd73d..c03b6b2 100644
--- a/pkg_join/views/travelResidence.vue
+++ b/pkg_join/views/travelResidence.vue
@@ -3,6 +3,9 @@
     <view class="v12-pa-2 reason-box" v-if="form.reviewStatus === 2">
       驳回原因: {{ form.reviewMsg }}
     </view>
+    <view class="v12-pa-2 reason-box" v-if="form.isDraft === 0 && form.reviewStatus !== 1 &&form.reviewStatus === 0">
+      审核中
+    </view>
     <view class="form-item">
       <view class="title">
         <text class="required">* </text>
@@ -318,7 +321,7 @@
     </view>
     <view v-if="form.isDraft === 0 && form.reviewStatus !== 1">
       <view class="v12-primary v12-white-text submit-btn" @click="submitForm" :style="{'background': form.reviewStatus === 0 ? '#FA979F !important' : '#4A97FC'}">
-        {{ form.reviewStatus === 0 ? '审核中' : form.reviewStatus === 2 ? '重新提交' : '提交审核' }}
+        {{ form.reviewStatus === 0 ? '撤销申请' : form.reviewStatus === 2 ? '重新提交' : '提交审核' }}
       </view>
     </view>
     <view v-if="form.isDraft === 1">
@@ -364,7 +367,8 @@ import {
   getShopData,
   getTravelInfo,
   saveTravel,
-  saveTravelDraft
+  saveTravelDraft,
+  revokeTravel
 } from '@/api/join'
 export default {
   components: {
@@ -535,10 +539,35 @@ export default {
         // uni.$u.toast(err.msg)
       })
     },
+    /**
+     * 撤销申请
+     */
+    revokeTravel() {
+      uni.showModal({
+        title: '提示',
+        content: '确定撤销申请吗？',
+        success: (res) => {
+          if (res.confirm) {
+            revokeTravel().then(res => {
+              if (res.status === 200) {
+                uni.$u.toast('撤销申请成功')
+                this.initInfo()
+              }
+            }).catch(err => {
+              uni.$u.toast(err.msg)
+            })
+          }
+        }
+      })
+    },
     /**
      * 提交表单
      */
     submitForm() {
+      if(this.form.reviewStatus === 0 && this.form.isDraft === 0 && this.form.reviewStatus !== 1) {
+        this.revokeTravel()
+        return
+      }
       if(this.form.isDraft === 0 && (this.form.reviewStatus === 0 || this.form.reviewStatus === 1)) return
       this.form.cover = this.coverImg.filter(item => item.url).map(item => item.url).join(',')
       this.form.avatar = this.avatarImg.filter(item => item.url).map(item => item.url).join(',')

From 7786f88896dc52596f5bb73939abcabeebeaa484 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Nov 2025 15:03:12 +0800
Subject: [PATCH 13/78] =?UTF-8?q?Fix=EF=BC=9A4373=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E4=B8=AD=E7=8A=B6=E6=80=81=E4=B8=8B=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=92=A4=E9=94=80=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=88=E5=8F=82=E8=80=83=E4=BE=9B=E5=BA=94=E5=95=86=E5=92=8C?=
 =?UTF-8?q?=E7=89=B9=E8=89=B2=E5=BA=97=E9=93=BA=E7=9A=84=E5=85=A5=E9=A9=BB?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E3=80=90=E5=AE=A1=E6=A0=B8=E4=B8=AD?=
 =?UTF-8?q?=E3=80=91=E7=8A=B6=E6=80=81=E6=A0=87=E8=AF=86=E6=8F=90=E5=88=B0?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E3=80=90=E6=92=A4=E9=94=80=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E3=80=91=EF=BC=89/=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/api/join.js b/api/join.js
index 47ea1ec..a32d760 100644
--- a/api/join.js
+++ b/api/join.js
@@ -90,5 +90,5 @@ export function saveTravelDraft(params) {
  * 旅居管家撤销申请
  */
 export function revokeTravel(params) {
-    return request.post("/travel/revoke", params, {login: true})
+    return request.post("/merchantApply/travel/revoke", params, {login: true})
 }

From 31ce97db6a11ddf7468ce50ba3b4329b64332176 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Nov 2025 15:03:29 +0800
Subject: [PATCH 14/78] =?UTF-8?q?Fix=EF=BC=9A4432=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=BE=85=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95=E6=9C=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=A1=AE=E8=AE=A4=E5=80=92=E8=AE=A1=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 8a1827e..2bc6f47 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -187,11 +187,11 @@
           </text>
         </view>
         <view v-if="order._status && ['1'].includes(order._status._type) && order.confirmTimeout" class="v12-ml-4 v12-mb-2" >
-          <text class="v12-primary-text v12-font-24">
+          <view class="v12-primary-text v12-font-24 v12-align-center">
               等待商家确认时间，剩余
               <u-count-down format="HH:mm:ss" autoStart :time="$global.diffSSS(order.confirmTimeout)" />
               订单将自动取消
-            </text>
+            </view>
         </view>
         <view
           v-if="!order.isGiftCardSend"

From f884d1c7648d35aae5fe9844e540ba8eb8d3a61c Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Nov 2025 15:03:43 +0800
Subject: [PATCH 15/78] =?UTF-8?q?Fix=EF=BC=9A4260=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E6=88=B7=E5=90=8E=EF=BC=8C=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E8=BF=9B=E5=85=A5=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=82=B9=E5=87=BB=E5=85=A5=E9=A9=BB?=
 =?UTF-8?q?=E5=85=A5=E5=8F=A3=EF=BC=8C=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E7=AA=97=EF=BC=8C=E5=8D=B3=E5=B0=86=E6=89=93=E5=BC=80=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E9=93=BE=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=82=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E5=90=8E=E6=89=93=E5=BC=80=E4=BE=9B=E5=BA=94=E9=93=BE?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=EF=BC=8C=E5=A6=82=E4=B8=8B=E5=9B=BE?=
 =?UTF-8?q?=E6=89=80=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_join/views/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg_join/views/index.vue b/pkg_join/views/index.vue
index b33aa7a..7a5376f 100644
--- a/pkg_join/views/index.vue
+++ b/pkg_join/views/index.vue
@@ -56,6 +56,7 @@ export default {
       hasHotel: null,
       hasSupplier: null,
       hasWholesaler: null,
+      hasTravel: null,
       images: null,
       pageKeyId: Object.freeze('merchantApplyIndex'),
       canApplyHotel: false
@@ -71,6 +72,7 @@ export default {
       this.hasSupplier = data.hasSupplier
       this.hasWholesaler = data.hasWholesaler
       this.canApplyHotel = data.canApplyHotel
+      this.hasTravel = data.hasTravel
     })
   },
   methods: {
@@ -78,7 +80,11 @@ export default {
      * 跳转旅游 residences
      */
     toTravelResidence() {
-      this.$yrouter.push('/pkg_join/views/travelResidence?partnerId=' + this.partnerId)
+      if (this.hasTravel === 1) {
+        this.$global.goSupplierMini()
+      } else {
+        this.$yrouter.push('/pkg_join/views/travelResidence?partnerId=' + this.partnerId)
+      }
     },
     /**
      * 跳转

From d5ae4bb1b1d67ba866d04d83c24330123415c09d Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 18 Nov 2025 14:19:19 +0800
Subject: [PATCH 16/78] =?UTF-8?q?Fix=EF=BC=9A4610=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E8=B5=84=E8=AE=AF=E6=AD=A3=E6=96=87=E7=9A=84=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=88=E6=8D=A2=E8=A1=8C=E3=80=81=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E5=8A=A0=E7=B2=97=E7=AD=89=EF=BC=89=E5=9C=A8=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=9C=AA=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 48284adb6b4ef1eea81a0b7bf5729b96a5b3d543)
---
 pkg_product/views/sojoumStore.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index 7c1edd0..a3980ab 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -119,7 +119,7 @@
                       {{ item.title }}
                     </view>
                     <view class="intro">
-                      {{ item.content }}
+                      <rich-text :nodes="item.content"></rich-text>
                     </view>
                   </view>
                   <view class="info-item-body" v-if="item.images && item.images.length > 0">

From ac3be5ad0007b3942eadfa9c3e5ad24cb30da87e Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 18 Nov 2025 14:22:41 +0800
Subject: [PATCH 17/78] =?UTF-8?q?Fix=EF=BC=9A4598=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=A7=86=E9=A2=91=E8=B5=84=E8=AE=AF=EF=BC=8C=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E8=A7=86=E9=A2=91=E6=9C=AA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 2e1fa524fa01ad076fa7a902264d5c0ef5590042)
---
 pkg_product/views/sojoumStore.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index a3980ab..a37ad6c 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -122,15 +122,15 @@
                       <rich-text :nodes="item.content"></rich-text>
                     </view>
                   </view>
-                  <view class="info-item-body" v-if="item.images && item.images.length > 0">
+                  <view class="info-item-body" v-if="item.images && item.images.length > 0 || item.video">
                     <view v-if="item.type === 2" class="video">
                       <view @click="infoItemViewClick(item, index)"  v-if="activeVideo !== 'video-item' + index" class="play-icon">
                         <u-icon name="play-right-fill" color="#fff" size="48"></u-icon>
                       </view>
                       <image
                         v-if="activeVideo !== 'video-item' + index"
-                        :src="item.images[0] + '?vframe/jpg/offset/1'"
-                        :poster="item.images[0] + '?vframe/jpg/offset/1'"
+                        :src="item.images[0] ? item.images[0] + '?vframe/jpg/offset/1' : item.video + '?vframe/jpg/offset/1'"
+                        :poster="item.images[0] ? item.images[0] + '?vframe/jpg/offset/1' : item.video + '?vframe/jpg/offset/1'"
                         controls
                         play-btn-position="center"
                         :show-fullscreen-btn="false"

From 5a1d35bbf2deee98380f47668221d47581bbe8f6 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 18 Nov 2025 14:28:34 +0800
Subject: [PATCH 18/78] =?UTF-8?q?Fix=EF=BC=9A4613=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=8F=AF?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a535c8192e82f2e54736fdb8073ac10ca3c14ce8)
---
 pages/order/MyOrder/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 2bc6f47..fb259f7 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -1002,7 +1002,7 @@ page {
   position: sticky;
   top: 0;
   background-color: #f5f5f5;
-  z-index: 54;
+  z-index: 1;
 }
 /deep/ .u-tabs {
   position: fixed;

From 13dee18ef1f9d8d19939e0d880e08e8b7e6080ed Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 19 Nov 2025 10:26:32 +0800
Subject: [PATCH 19/78] =?UTF-8?q?Fix=EF=BC=9A4623=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E8=A7=86=E9=A2=91=E8=B5=84=E8=AE=AF?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit fe0397a4835f91500e3cd4307c20ace67dbaced2)
---
 pkg_product/views/groupBuyDetails.vue | 2 +-
 pkg_product/views/sojoumStore.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_product/views/groupBuyDetails.vue b/pkg_product/views/groupBuyDetails.vue
index 2cd0a38..1f8c15a 100644
--- a/pkg_product/views/groupBuyDetails.vue
+++ b/pkg_product/views/groupBuyDetails.vue
@@ -145,7 +145,7 @@
           </view> -->
         </view>
       </view>
-      <view class="v12-px-3 v12-mt-3">
+      <view class="v12-px-3 v12-mt-3" v-if="detail.detailImages && detail.detailImages.length > 0">
         <u-divider text="图片详情"></u-divider>
       </view>
       <!-- 图片 -->
diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index a37ad6c..f5e352b 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -140,7 +140,7 @@
                       />
                       <video
                         v-else
-                        :src="item.images[0]"
+                        :src="item.images[0] ? item.images[0] : item.video"
                         controls
                         autoplay
                         play-btn-position="center"

From 7a49c7c493a6b2e409f87b2d2864670cd606b328 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Thu, 20 Nov 2025 12:03:51 +0800
Subject: [PATCH 20/78] =?UTF-8?q?Feat(=E9=A6=96=E9=A1=B5):=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E6=9C=8B=E5=8F=8B=E5=9C=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 997a61b..126d49c 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -381,6 +381,7 @@ import {
   getLocationSetting,
   openLocationSettting
 } from "@/utils/common"
+import { getWeixinShareConfig } from '@/api/public'
 export default {
   name: 'IndexPage',
   components: {
@@ -431,7 +432,8 @@ export default {
       tabIconPostion: {},
       messageIcon: {},
       recommendKeyword: [],
-      keywordIndex: 0
+      keywordIndex: 0,
+      shareData: {}
     }
   },
   onLoad() {
@@ -452,6 +454,12 @@ export default {
         _this.statusBarHeight = statusBar
       }
     })
+    getWeixinShareConfig().then(res => {
+      const { success, data } = res
+      if (success) {
+        this.shareData = data
+      }
+    })
   },
   onHide() {
     this.pageToHideHandle()
@@ -459,6 +467,17 @@ export default {
   onPageScroll(e) {
     this.scrollTop = e.scrollTop
   },
+  onShareTimeline() {
+    uni.updateShareMenu({ 
+      isPrivateMessage: false,
+      withShareTicket: false
+    })
+    return {
+      title: this.shareData.title || this.share.title,
+      query: '',
+      imageUrl: this.shareData.image || this.share.imageUrl
+    }
+  },
   methods: {
     changeRecommendKeyword(e) {
       this.keywordIndex = e

From d9ee41d8f3c25ff3d9bec1f3eec27c100e1165b3 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 21 Nov 2025 11:48:01 +0800
Subject: [PATCH 21/78] =?UTF-8?q?Fix=EF=BC=9A4639=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=A5=E6=9C=9F=E5=8C=85=E5=90=AB=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8B=E5=87=A0=E4=B8=AA=E6=97=B6=E9=97=B4=E6=AE=B5=E6=97=B6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=A2=84=E7=BA=A6=EF=BC=9A1.31-2.1=EF=BC=8C3?=
 =?UTF-8?q?.31-4.1=EF=BC=8C5.31-6.1=EF=BC=8C8.31-9.1=EF=BC=8C10.31-11.1?=
 =?UTF-8?q?=EF=BC=88=E5=BA=94=E6=94=B9=E4=B8=BA=EF=BC=9A=E5=8F=AA=E8=A6=81?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E6=97=B6=E9=97=B4=E6=AE=B5=E5=8F=AF?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E3=80=81=E5=B9=B6=E4=B8=94=E7=AD=89=E4=BA=8E?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E5=A4=A9=E6=95=B0=EF=BC=8C=E5=B0=B1=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E9=A2=84=E7=BA=A6=E6=88=90=E5=8A=9F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DateRangePicker/DateRangePicker.vue       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/DateRangePicker/DateRangePicker.vue b/components/DateRangePicker/DateRangePicker.vue
index 83c54fc..0c2967f 100644
--- a/components/DateRangePicker/DateRangePicker.vue
+++ b/components/DateRangePicker/DateRangePicker.vue
@@ -395,18 +395,18 @@ export default {
       }
   
       // 验证选择的日期范围内是否包含禁用日期
-      const currentDate = new Date(this.tempStartDate)
-      while (currentDate <= this.tempEndDate) {
-        const day = currentDate.getDate()
-        if (this.isDisabled(day)) {
-          uni.showToast({
-            title: '所选日期范围包含不可预约日期，请重新选择',
-            icon: 'none'
-          })
-          return
-        }
-        currentDate.setDate(currentDate.getDate() + 1)
-      }
+      // const currentDate = new Date(this.tempStartDate)
+      // while (currentDate <= this.tempEndDate) {
+      //   const day = currentDate.getDate()
+      //   if (this.isDisabled(day)) {
+      //     uni.showToast({
+      //       title: '所选日期范围包含不可预约日期，请重新选择',
+      //       icon: 'none'
+      //     })
+      //     return
+      //   }
+      //   currentDate.setDate(currentDate.getDate() + 1)
+      // }
       sojoumOrderCheckDate({
         travelGroupProductId: this.travelGroupProductId,
         orderStartDate: this.formatDate(this.tempStartDate),

From 896f8dee7f42d238cdb33f7ea1c10c0446c6a89f Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 21 Nov 2025 12:06:24 +0800
Subject: [PATCH 22/78] =?UTF-8?q?Fix=EF=BC=9A4632=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85=E8=BD=AE=E6=92=AD=E5=9B=BE?=
 =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/groupBuyDetails.vue b/pkg_product/views/groupBuyDetails.vue
index 1f8c15a..c552eb9 100644
--- a/pkg_product/views/groupBuyDetails.vue
+++ b/pkg_product/views/groupBuyDetails.vue
@@ -11,7 +11,7 @@
     />
     <scroll-view scroll-y class="page-scroll">
       <!-- 顶部大图/轮播 -->
-      <swiper class="hero-swiper" indicator-dots autoplay interval="3000">
+      <swiper class="hero-swiper" indicator-dots autoplay circular interval="3000">
         <swiper-item v-for="(img, idx) in detail.carouselImages" :key="idx">
           <image :src="img" class="hero-img" mode="aspectFill" />
         </swiper-item>

From 4686c6d87a37adcdad2395be5de7aa4ef4468dee Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 21 Nov 2025 12:08:40 +0800
Subject: [PATCH 23/78] =?UTF-8?q?Fix=EF=BC=9A4634=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E8=B5=84=E8=AE=AF=E8=A7=86=E9=A2=91=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=97=85=E5=B1=85=E5=BA=97=E9=93=BA=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=9C=AA=E6=9A=82=E5=81=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/sojoumStore.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index f5e352b..4f4917a 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -14,7 +14,7 @@
         <swiper
           style="height: 500rpx"
           :autoplay="swiperAutoplay"
-          :circular="true"
+          circular
           @change="swiperChange"
         >
           <swiper-item v-for="(item, index) in store.banner" :key="index">
@@ -22,6 +22,7 @@
               v-if="item.type === 'video'"
               :src="item.url"
               style="width: 100%; height: 100%"
+              id="coverVideo"
               @play="videoPlay"
               @ended="videoEnd"
               @pause="videoEnd"

From 6e316a9f2cc61fea9c19e34b944511790e37a8a8 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 21 Nov 2025 12:12:58 +0800
Subject: [PATCH 24/78] =?UTF-8?q?Fix=EF=BC=9A4629=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E4=BE=9B=E5=BA=94=E9=93=BE=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E3=80=91=E4=BE=9B=E5=BA=94=E9=93=BE=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?/PC=E7=AB=AF=E4=BF=AE=E6=94=B9=E8=B5=84=E8=AE=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=86=E5=9B=BE=E7=89=87=E8=B5=84=E8=AE=AF=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=90=8E=EF=BC=8C=E8=A7=86=E9=A2=91=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/sojoumStore.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index 4f4917a..dfbf196 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -130,8 +130,8 @@
                       </view>
                       <image
                         v-if="activeVideo !== 'video-item' + index"
-                        :src="item.images[0] ? item.images[0] + '?vframe/jpg/offset/1' : item.video + '?vframe/jpg/offset/1'"
-                        :poster="item.images[0] ? item.images[0] + '?vframe/jpg/offset/1' : item.video + '?vframe/jpg/offset/1'"
+                        :src="item.video + '?vframe/jpg/offset/1'"
+                        :poster="item.video + '?vframe/jpg/offset/1'"
                         controls
                         play-btn-position="center"
                         :show-fullscreen-btn="false"
@@ -141,7 +141,7 @@
                       />
                       <video
                         v-else
-                        :src="item.images[0] ? item.images[0] : item.video"
+                        :src="item.video"
                         controls
                         autoplay
                         play-btn-position="center"

From 889b0de9b7aaadb1590d838771b69938ab255252 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 21 Nov 2025 12:22:17 +0800
Subject: [PATCH 25/78] =?UTF-8?q?Fix=EF=BC=9A4601=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E2=80=94=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=88=86=E7=B1=BB=E4=B8=BA=E2=80=9C=E5=BA=B7?=
 =?UTF-8?q?=E5=85=BB=E5=88=86=E7=B1=BB=E2=80=9D=EF=BC=8C=E5=9C=A8=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/healthList.vue b/pkg_product/views/healthList.vue
index f48c3b6..532683e 100644
--- a/pkg_product/views/healthList.vue
+++ b/pkg_product/views/healthList.vue
@@ -113,7 +113,7 @@
             <view
               v-if="tabIndex === 0"
               class="city-item"
-              @click="goStore(item.id, item.cityName)"
+              @click="goStore(item.cityId, item.cityName)"
             >
               <image
                 :src="item.icon"

From c9f3767cbd1e65dbd973e3893e8b03e86eb1d33e Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 21 Nov 2025 12:26:19 +0800
Subject: [PATCH 26/78] =?UTF-8?q?Fix=EF=BC=9A4643=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=B2=A1=E5=BC=80=E8=BD=AC=E8=B5=A0=E7=9A=84=E5=9B=A2=E8=B4=AD?=
 =?UTF-8?q?=E7=A4=BC=E5=8C=85=E9=A2=86=E5=8F=96=E9=A1=B5=E9=9D=A2=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=8D=95=E7=8B=AC=E5=85=B3=E9=97=AD=E5=8F=B3=E4=B8=8A?=
 =?UTF-8?q?=E8=A7=92=E8=BD=AC=E5=8F=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/receive.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg_user/views/gift/receive.vue b/pkg_user/views/gift/receive.vue
index 03f0f0d..dad9485 100644
--- a/pkg_user/views/gift/receive.vue
+++ b/pkg_user/views/gift/receive.vue
@@ -83,6 +83,9 @@ export default {
         code: code
       }).then(res => {
         this.giftCard = res.data || {}
+        if(this.giftCard.canTransfer === 0 ) {
+          uni.hideShareMenu()
+        }
         this.isExpire = this.giftCard.isExpire === 1
         if(this.isTravelGroup && res.data.isUserReceive === 1) {
           const obj = {

From 9c022a5a318f826fcf2085bcc4a280210a54c0b7 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 21 Nov 2025 18:57:51 +0800
Subject: [PATCH 27/78] =?UTF-8?q?Conf(=E8=B7=AF=E7=94=B1):=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=E6=89=93=E5=8C=85=E6=8E=A7=E5=88=B6=E4=B8=BB?=
 =?UTF-8?q?=E5=8C=85=E4=BD=93=E7=A7=AF=E5=9C=A82M=E4=BB=A5=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json             |   93 ----
 pages_bak20251121.json | 1124 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 1124 insertions(+), 93 deletions(-)
 create mode 100644 pages_bak20251121.json

diff --git a/pages.json b/pages.json
index c5abb3a..00a1b2d 100644
--- a/pages.json
+++ b/pages.json
@@ -22,12 +22,6 @@
         "navigationBarTitleText": "登录"
       }
     },
-    {
-      "path": "pages/user/RetrievePassword/index",
-      "style": {
-        "navigationBarTitleText": "重置密码"
-      }
-    },
     {
       "path": "pages/home/index",
       "style": {
@@ -94,12 +88,6 @@
         "navigationBarTitleText": "搜索"
       }
     },
-    {
-      "path": "pages/NotDefined/index",
-      "style": {
-        "navigationBarTitleText": "404"
-      }
-    },
     {
       "path": "pages/cloud/haveFun",
       "style": {
@@ -140,18 +128,6 @@
         "navigationBarTitleText": "商品评价"
       }
     },
-    {
-      "path": "pages/shop/GoodsPromotion/index",
-      "style": {
-        "navigationBarTitleText": "促销商品"
-      }
-    },
-    {
-      "path": "pages/shop/HotNewGoods/index",
-      "style": {
-        "navigationBarTitleText": "热门商品"
-      }
-    },
     {
       "path": "pages/shop/GoodsCon/index",
       "style": {
@@ -185,43 +161,12 @@
         "navigationBarTitleText": "收货地址"
       }
     },
-    {
-      "path": "pages/user/promotion/Poster/index",
-      "style": {
-        "navigationBarTitleText": "推广名片"
-      }
-    },
-    {
-      "path": "pages/user/signIn/Sign/index",
-      "style": {
-        "navigationBarTitleText": "签到"
-      }
-    },
-    {
-      "path": "pages/user/signIn/SignRecord/index",
-      "style": {
-        "navigationBarTitleText": "签到记录"
-      }
-    },
     {
       "path": "pages/user/promotion/CashAudit/index",
       "style": {
         "navigationBarTitleText": "提现结果"
       }
     },
-    {
-      "path": "pages/user/promotion/PromoterOrder/index",
-      "style": {
-        "navigationBarTitleText": "分销详情"
-      }
-    },
-    {
-      "path": "pages/user/promotion/PromoterList/index",
-      "style": {
-        "navigationBarTitleText": "分销列表",
-        "navigationBarBackgroundColor": "#FFFFFF"
-      }
-    },
     {
       "path": "pages/user/promotion/UserPromotion/index",
       "style": {
@@ -255,12 +200,6 @@
         "navigationBarTitleText": "我的积分"
       }
     },
-    {
-      "path": "pages/user/UserVip/index",
-      "style": {
-        "navigationBarTitleText": "用户vip"
-      }
-    },
     {
       "path": "pages/user/promotion/UserCash/index",
       "style": {
@@ -343,13 +282,6 @@
         "navigationBarBackgroundColor": "#FFFFFF"
       }
     },
-    {
-      "path": "pages/user/MemberUpgradeIntro/MemberUpgradeIntro",
-      "style": {
-        "navigationBarTitleText": "升级说明",
-        "navigationBarBackgroundColor": "#FFFFFF"
-      }
-    },
     {
       "path": "pages/VideoPlayBackList/VideoPlayBackList",
       "style": {
@@ -364,31 +296,6 @@
         "navigationBarBackgroundColor": "#FFFFFF"
       }
     },
-    {
-      "path": "pages/user/UpgradeElectronicProtocol/UpgradeElectronicProtocol",
-      "style": {
-        "navigationBarTitleText": "升级",
-        "navigationBarBackgroundColor": "#FFFFFF"
-      }
-    },
-    {
-      "path": "pages/user/UpgradeProtocolDetail/UpgradeProtocolDetail",
-      "style": {
-        "navigationBarTitleText": "共享股东协议"
-      }
-    },
-    {
-      "path": "pages/LiveAndShortVideo/LiveAndShortVideo",
-      "style": {
-        "navigationBarTitleText": "直播/视频"
-      }
-    },
-    {
-      "path": "pages/LiveBroadcastList/LiveBroadcastList",
-      "style": {
-        "navigationBarTitleText": "直播列表"
-      }
-    },
     {
       "path": "pages/user/UserFavorite/UserFavorite",
       "style": {
diff --git a/pages_bak20251121.json b/pages_bak20251121.json
new file mode 100644
index 0000000..c5abb3a
--- /dev/null
+++ b/pages_bak20251121.json
@@ -0,0 +1,1124 @@
+{
+  "easycom": {
+    "^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue"
+  },
+  "pages": [
+    {
+      "path": "pages/Loading/index",
+      "style": {
+        "navigationBarTitleText": "香道滇",
+        "navigationStyle": "custom"
+      }
+    },
+    {
+      "path": "pages/authorization/index",
+      "style": {
+        "navigationBarTitleText": "微信授权"
+      }
+    },
+    {
+      "path": "pages/user/Login/index",
+      "style": {
+        "navigationBarTitleText": "登录"
+      }
+    },
+    {
+      "path": "pages/user/RetrievePassword/index",
+      "style": {
+        "navigationBarTitleText": "重置密码"
+      }
+    },
+    {
+      "path": "pages/home/index",
+      "style": {
+        "navigationBarTitleText": "香道滇",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/home/landMark",
+      "style": {
+        "navigationBarTitleText": "寻地标好物"
+      }
+    },
+    {
+      "path": "pages/home/searchPage",
+      "style": {
+        "navigationBarTitleText": "搜索"
+      }
+    },
+    {
+      "path": "pages/home/newZone",
+      "style": {
+        "navigationBarTitleText": "新品专区",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/chose-city/chose-city",
+      "style": {
+        "navigationBarTitleText": "选择城市"
+      }
+    },
+    {
+      "path": "pages/cart",
+      "style": {
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "购物车"
+      }
+    },
+    {
+      "path": "pages/shop/GoodSearch/index",
+      "style": {
+        "navigationBarTitleText": "搜索"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsClass/index",
+      "style": {
+        "navigationBarTitleText": "分类",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/shop/StoreList/index",
+      "style": {
+        "navigationBarTitleText": "商家列表"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsList/index",
+      "style": {
+        "navigationBarTitleText": "搜索"
+      }
+    },
+    {
+      "path": "pages/NotDefined/index",
+      "style": {
+        "navigationBarTitleText": "404"
+      }
+    },
+    {
+      "path": "pages/cloud/haveFun",
+      "style": {
+        "navigationBarTitleText": "趣游生活"
+      }
+    },
+    {
+      "path": "pages/town/index",
+      "style": {
+        "navigationBarTextStyle": "white",
+        "navigationStyle": "custom",
+        "navigationBarTitleText": "趣游生活"
+      }
+    },
+    {
+      "path": "pages/user/User/index",
+      "style": {
+        "navigationBarTitleText": "我的",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsCollection/index",
+      "style": {
+        "navigationBarTitleText": "商品收藏"
+      }
+    },
+    {
+      "path": "pages/shop/EvaluateList/index",
+      "style": {
+        "navigationBarTitleText": "评价列表"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsEvaluate/index",
+      "style": {
+        "navigationBarTitleText": "商品评价"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsPromotion/index",
+      "style": {
+        "navigationBarTitleText": "促销商品"
+      }
+    },
+    {
+      "path": "pages/shop/HotNewGoods/index",
+      "style": {
+        "navigationBarTitleText": "热门商品"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsCon/index",
+      "style": {
+        "navigationBarTitleText": "商品详情",
+        "navigationStyle": "custom",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/shop/GoodsCon/qualifications",
+      "style": {
+        "navigationBarTitleText": "商家资质",
+        "navigationBarTextStyle": "black"
+      }
+    },
+    {
+      "path": "pages/user/address/AddAddress/index",
+      "style": {
+        "navigationBarTitleText": "新增收货地址"
+      }
+    },
+    {
+      "path": "pages/user/UserAccount/index",
+      "style": {
+        "navigationBarTitleText": "账户余额"
+      }
+    },
+    {
+      "path": "pages/user/address/AddressManagement/index",
+      "style": {
+        "navigationBarTitleText": "收货地址"
+      }
+    },
+    {
+      "path": "pages/user/promotion/Poster/index",
+      "style": {
+        "navigationBarTitleText": "推广名片"
+      }
+    },
+    {
+      "path": "pages/user/signIn/Sign/index",
+      "style": {
+        "navigationBarTitleText": "签到"
+      }
+    },
+    {
+      "path": "pages/user/signIn/SignRecord/index",
+      "style": {
+        "navigationBarTitleText": "签到记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CashAudit/index",
+      "style": {
+        "navigationBarTitleText": "提现结果"
+      }
+    },
+    {
+      "path": "pages/user/promotion/PromoterOrder/index",
+      "style": {
+        "navigationBarTitleText": "分销详情"
+      }
+    },
+    {
+      "path": "pages/user/promotion/PromoterList/index",
+      "style": {
+        "navigationBarTitleText": "分销列表",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/promotion/UserPromotion/index",
+      "style": {
+        "navigationBarTitleText": "团队管理",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/History/index",
+      "style": {
+        "navigationBarTitleText": "商品足迹",
+        "navigationBarBackgroundColor": "#FFFFFF",
+        "enablePullDownRefresh": false
+      }
+    },
+    {
+      "path": "pages/user/UserBill/index",
+      "style": {
+        "navigationBarTitleText": "账单记录"
+      }
+    },
+    {
+      "path": "pages/user/promotion/CommissionDetails/index",
+      "style": {
+        "navigationBarTitleText": "佣金明细"
+      }
+    },
+    {
+      "path": "pages/user/signIn/Integral/index",
+      "style": {
+        "navigationBarTitleText": "我的积分"
+      }
+    },
+    {
+      "path": "pages/user/UserVip/index",
+      "style": {
+        "navigationBarTitleText": "用户vip"
+      }
+    },
+    {
+      "path": "pages/user/promotion/UserCash/index",
+      "style": {
+        "navigationBarTitleText": "提现"
+      }
+    },
+    {
+      "path": "pages/user/CustomerList/index",
+      "style": {
+        "navigationBarTitleText": "客服列表"
+      }
+    },
+    {
+      "path": "pages/user/Recharge/index",
+      "style": {
+        "navigationBarTitleText": "充值"
+      }
+    },
+    {
+      "path": "pages/order/MyOrder/index",
+      "style": {
+        "navigationBarTitleText": "我的订单",
+        "navigationBarBackgroundColor": "#fff"
+      }
+    },
+    {
+      "path": "pages/order/Logistics/index",
+      "style": {
+        "navigationBarTitleText": "查看物流"
+      }
+    },
+    {
+      "path": "pages/order/OrderDetails/index",
+      "style": {
+        "navigationBarTitleText": "订单详情"
+      }
+    },
+    {
+      "path": "pages/order/OrderSubmission/index",
+      "style": {
+        "navigationBarTitleText": "提交订单",
+        "navigationBarBackgroundColor": "#fff"
+      }
+    },
+    {
+      "path": "pages/order/PaymentStatus/index",
+      "style": {
+        "navigationBarTitleText": "支付状态"
+      }
+    },
+    {
+      "path": "pages/order/GoodsReturn/index",
+      "style": {
+        "navigationBarTitleText": "申请退款"
+      }
+    },
+    {
+      "path": "pages/order/ReturnList/index",
+      "style": {
+        "navigationBarTitleText": "退货列表"
+      }
+    },
+    {
+      "path": "pages/map/index",
+      "style": {
+        "navigationBarTitleText": "地图"
+      }
+    },
+    {
+      "path": "pages/user/Message/Message",
+      "style": {
+        "navigationBarTitleText": "消息",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/MessageDetail/MessageDetail",
+      "style": {
+        "navigationBarTitleText": "消息详情",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/MemberUpgradeIntro/MemberUpgradeIntro",
+      "style": {
+        "navigationBarTitleText": "升级说明",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/VideoPlayBackList/VideoPlayBackList",
+      "style": {
+        "navigationBarTitleText": "寻看点",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/VideoPlayBackList/VideoPlayBackDetail",
+      "style": {
+        "navigationBarTitleText": "视频详情",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/UpgradeElectronicProtocol/UpgradeElectronicProtocol",
+      "style": {
+        "navigationBarTitleText": "升级",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
+    {
+      "path": "pages/user/UpgradeProtocolDetail/UpgradeProtocolDetail",
+      "style": {
+        "navigationBarTitleText": "共享股东协议"
+      }
+    },
+    {
+      "path": "pages/LiveAndShortVideo/LiveAndShortVideo",
+      "style": {
+        "navigationBarTitleText": "直播/视频"
+      }
+    },
+    {
+      "path": "pages/LiveBroadcastList/LiveBroadcastList",
+      "style": {
+        "navigationBarTitleText": "直播列表"
+      }
+    },
+    {
+      "path": "pages/user/UserFavorite/UserFavorite",
+      "style": {
+        "navigationBarTitleText": "我的喜欢"
+      }
+    },
+    {
+      "path": "pages/user/Points/index",
+      "style": {
+        "navigationBarTitleText": "积分"
+      }
+    }
+  ],
+  "subPackages": [
+    {
+      "root": "pagesInn",
+      "pages": [
+        {
+          "path": "inn/innHome",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "inn/farmerStore",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "inn/innGoodList",
+          "style": {
+            "navigationBarTitleText": "店铺商品列表"
+          }
+        },
+        {
+          "path": "inn/innApply",
+          "style": {
+            "navigationBarTitleText": "店铺申请"
+          }
+        },
+        {
+          "path": "inn/innInfoPublish",
+          "style": {
+            "navigationBarTitleText": "发布店铺动态"
+          }
+        },
+        {
+          "path": "inn/innProfileEdit",
+          "style": {
+            "navigationBarTitleText": "修改店铺资料"
+          }
+        },
+        {
+          "path": "inn/innInfoDetail",
+          "style": {
+            "navigationBarTitleText": "资讯详情",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "inn/innPartnerAgreement",
+          "style": {
+            "navigationBarTitleText": "店主合伙人条款协议"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pkg-video",
+      "pages": [
+        {
+          "path": "views/watch",
+          "style": {
+            "navigationBarTitleText": "寻看点"
+          }
+        },
+        {
+          "path": "views/city",
+          "style": {
+            "navigationBarTitleText": "选择城市"
+          }
+        },
+        {
+          "path": "views/lottery",
+          "style": {
+            "navigationBarTitleText": "抽奖"
+          }
+        },
+        {
+          "path": "views/lottery-log",
+          "style": {
+            "navigationBarTitleText": "抽奖记录"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pkg_common",
+      "pages": [
+        {
+          "path": "views/pdf",
+          "style": {
+            "navigationBarTitleText": "详情"
+          }
+        },
+        {
+          "path": "views/room",
+          "style": {
+            "navigationBarTitleText": "客服"
+          }
+        },
+        {
+          "path": "views/roomLogs",
+          "style": {
+            "navigationBarTitleText": "历史会话"
+          }
+        },
+        {
+          "path": "views/message",
+          "style": {
+            "navigationBarTitleText": "互动消息",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/xiaoZhi",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        }
+      ]
+    },
+    {
+      "root": "pkg_join",
+      "pages": [
+        {
+          "path": "views/index",
+          "style": {
+            "navigationBarTitleText": "商户入驻"
+          }
+        },
+        {
+          "path": "views/shop",
+          "style": {
+            "navigationBarTitleText": "店铺入驻"
+          }
+        },
+        {
+          "path": "views/supplier",
+          "style": {
+            "navigationBarTitleText": "供应商入驻"
+          }
+        },
+        {
+          "path": "views/wholesaler",
+          "style": {
+            "navigationBarTitleText": "采购批发商入驻"
+          }
+        },
+        {
+          "path": "views/travelResidence",
+          "style": {
+            "navigationBarTitleText": "旅居商家入驻",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pkg_orders",
+      "pages": [
+        {
+          "path": "views/refund",
+          "style": {
+            "navigationBarTitleText": "申请退款"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pkg_product",
+      "pages": [
+        {
+          "path": "views/festival",
+          "style": {
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "views/healthList",
+          "style": {
+            "navigationBarTitleText": "选择城市",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/expoList",
+          "style": {
+            "navigationBarTitleText": "康养旅居",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/expoDetails",
+          "style": {
+            "navigationBarTitleText": "文化艺术",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/healthSanctum",
+          "style": {
+            "navigationBarTitleText": "康养旅居",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/healthFoods",
+          "style": {
+            "navigationBarTitleText": "康养旅居",
+            "navigationBarBackgroundColor": "#FAEED8"
+          }
+        },
+        {
+          "path": "views/healthFoodDetails",
+          "style": {
+            "navigationBarTitleText": "康养旅居",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/healthSearch",
+          "style": {
+            "navigationBarTitleText": "搜索",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/heritage",
+          "style": {
+            "navigationBarTitleText": "非遗文创"
+          }
+        },
+        {
+          "path": "views/heritageGoods",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "views/heritage/index",
+          "style": {
+            "navigationBarTitleText": "非遗文创",
+            "navigationBarBackgroundColor": "#FAEED8"
+          }
+        },
+        {
+          "path": "views/heritage/details",
+          "style": {
+            "navigationBarTitleText": "非遗文创",
+            "navigationBarBackgroundColor": "#FAEED8"
+          }
+        },
+        {
+          "path": "views/heritageVideo",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "views/heritageGoodAndVideo",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "views/homestay",
+          "style": {
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "views/giftList",
+          "style": {
+            "navigationBarTitleText": "特色礼品"
+          }
+        },
+        {
+          "path": "views/giftContent",
+          "style": {
+            "navigationBarTitleText": "特色礼品",
+            "navigationBarTextStyle": "black"
+          }
+        },
+        {
+          "path": "views/famousList",
+          "style": {
+            "navigationBarTitleText": "寻千县万村"
+          }
+        },
+        {
+          "path": "views/famousQianxian",
+          "style": {
+            "navigationBarTitleText": "寻千县万村"
+          }
+        },
+        {
+          "path": "views/famousQianxianShop",
+          "style": {
+            "navigationBarTitleText": "寻千县万村",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "views/famousQianxianTheme",
+          "style": {
+            "navigationBarTitleText": "寻千县万村",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "views/famousQianxianVillageShop",
+          "style": {
+            "navigationBarTitleText": "寻千县万村",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "views/sojoumStore",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "views/housekeeperDetail",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        },
+        {
+          "path": "views/groupBuyDetails",
+          "style": {
+            "navigationBarTitleText": "团购详情",
+            "navigationStyle": "custom",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/famousQianxianInvestment",
+          "style": {
+            "navigationBarTitleText": "招商政策"
+          }
+        },
+        {
+          "path": "views/famousStory",
+          "style": {
+            "navigationBarTitleText": "名品故事"
+          }
+        },
+        {
+          "path": "views/famousHot",
+          "style": {
+            "navigationBarTitleText": "爆款主推"
+          }
+        },
+        {
+          "path": "views/scenicSpot",
+          "style": {
+            "navigationBarTitleText": "景点门票"
+          }
+        },
+        {
+          "path": "views/seckill",
+          "style": {
+            "navigationBarTitleText": "天天秒杀"
+          }
+        },
+        {
+          "path": "views/sharpList",
+          "style": {
+            "navigationBarTitleText": "尖货推荐"
+          }
+        },
+        {
+          "path": "views/nativeList",
+          "style": {
+            "navigationBarTitleText": "特产",
+            "navigationBarTextStyle": "black",
+            "navigationBarBackgroundColor": "#fff"
+          }
+        },
+        {
+          "path": "views/seasonList",
+          "style": {
+            "navigationBarTitleText": "时令尝鲜"
+          }
+        },
+        {
+          "path": "views/season",
+          "style": {
+            "navigationBarTitleText": "时令尝鲜"
+          }
+        },
+        {
+          "path": "views/submitOrder",
+          "style": {
+            "navigationBarTitleText": "提交订单",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/sojoumOrderDetails",
+          "style": {
+            "navigationBarTitleText": "订单详情",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/sojoumOrderRefund",
+          "style": {
+            "navigationBarTitleText": "申请退款",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        }
+      ]
+    },
+    {
+      "root": "pkg_user",
+      "pages": [
+        {
+          "path": "views/giftList",
+          "style": {
+            "navigationBarTitleText": "我的礼品卡"
+          }
+        },
+        {
+          "path": "views/gift/gift",
+          "style": {
+            "navigationBarTitleText": "送礼包"
+          }
+        },
+        {
+          "path": "views/gift/receive",
+          "style": {
+            "navigationBarTitleText": "好友赠送的礼包"
+          }
+        },
+        {
+          "path": "views/gift/receiveDone",
+          "style": {
+            "navigationBarTitleText": "收礼完成",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/myFavorite",
+          "style": {
+            "navigationBarTitleText": "我的收藏"
+          }
+        },
+        {
+          "path": "views/bankCardList",
+          "style": {
+            "navigationBarTitleText": "银行卡列表",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/addBankCard",
+          "style": {
+            "navigationBarTitleText": "添加银行卡",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/withdrawal",
+          "style": {
+            "navigationBarTitleText": "提现",
+            "navigationBarBackgroundColor": "#FFFFFF"
+          }
+        },
+        {
+          "path": "views/withdrawalLog",
+          "style": {
+            "navigationBarTitleText": "提现记录"
+          }
+        },
+        {
+          "path": "views/personalData",
+          "style": {
+            "navigationBarTitleText": "个人资料"
+          }
+        },
+        {
+          "path": "views/bindPhone",
+          "style": {
+            "navigationBarTitleText": "绑定手机号"
+          }
+        },
+        {
+          "path": "views/myCoupons",
+          "style": {
+            "navigationBarTitleText": "我的优惠券"
+          }
+        },
+        {
+          "path": "views/payPassword",
+          "style": {
+            "navigationBarTitleText": "修改支付密码"
+          }
+        }
+      ]
+    },
+    {
+      "root": "aiChat",
+      "pages": [
+        {
+          "path": "views/index",
+          "style": {
+            "navigationBarTitleText": "云灵AI助手",
+            "navigationStyle": "custom",
+            "navigationBarTextStyle": "white"
+          }
+        },
+        {
+          "path": "views/history",
+          "style": {
+            "navigationBarTitleText": "云灵AI助手",
+            "navigationStyle": "custom",
+            "navigationBarTextStyle": "white"
+          }
+        }
+      ]
+    },
+    {
+      "root": "v4",
+      "pages": [
+        {
+          "path": "views/preSale/preSale",
+          "style": {
+            "navigationBarTitleText": "预售"
+          }
+        },
+        {
+          "path": "views/seckill/seckill",
+          "style": {
+            "navigationBarTitleText": "限时秒杀"
+          }
+        },
+        {
+          "path": "views/offer/offer",
+          "style": {
+            "navigationBarTitleText": "每天特价"
+          }
+        },
+        {
+          "path": "components/select-city",
+          "style": {
+            "navigationBarTitleText": ""
+          }
+        },
+        {
+          "path": "views/specialty/specialty",
+          "style": {
+            "navigationBarTitleText": "特产",
+            "enablePullDownRefresh": true
+          }
+        },
+        {
+          "path": "views/shop/shop",
+          "style": {
+            "navigationBarTitleText": "店铺"
+          }
+        },
+        {
+          "path": "views/shop/detail",
+          "style": {
+            "navigationBarTitleText": "店铺详情"
+          }
+        },
+        {
+          "path": "views/trial/trial",
+          "style": {
+            "navigationBarTitleText": "体验店"
+          }
+        },
+        {
+          "path": "views/live/live",
+          "style": {
+            "navigationBarTitleText": "直播"
+          }
+        },
+        {
+          "path": "views/attract/attract",
+          "style": {
+            "navigationBarTitleText": "招商"
+          }
+        },
+        {
+          "path": "views/attract/project",
+          "style": {
+            "navigationBarTitleText": "招商项目"
+          }
+        },
+        {
+          "path": "views/attract/projectList",
+          "style": {
+            "navigationBarTitleText": "招商项目"
+          }
+        }
+      ]
+    },
+    {
+      "root": "wenwan",
+      "pages": [
+        {
+          "path": "views/goodsClass",
+          "style": {
+            "navigationBarTitleText": "文玩"
+          }
+        },
+        {
+          "path": "views/storeList",
+          "style": {
+            "navigationBarTitleText": "文玩"
+          }
+        }
+      ]
+    }
+  ],
+  "preloadRule": {
+    "pages/user/User/index": {
+      "network": "all",
+      "packages": [
+        "pagesInn"
+      ]
+    }
+  },
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "地标文化特产",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8"
+  },
+  "tabBar": {
+    "color": "#8B8F99",
+    "custom": true,
+    "selectedColor": "#FF564A",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/home/index",
+        "iconPath": "/static/images/tabbar/tabbar-01-on.png",
+        "selectedIconPath": "/static/images/tabbar/tabbar-01-on.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/cloud/haveFun",
+        "iconPath": "/static/images/tabbar/tabbar-01-on.png",
+        "selectedIconPath": "/static/images/tabbar/tabbar-01-on.png",
+        "text": "寻趣味"
+      },
+      {
+        "pagePath": "pages/cart",
+        "iconPath": "/static/images/tabbar/tabbar-01-on.png",
+        "selectedIconPath": "/static/images/tabbar/tabbar-01-on.png",
+        "text": "购物车"
+      },
+      {
+        "pagePath": "pages/user/User/index",
+        "iconPath": "/static/images/tabbar/tabbar-01-on.png",
+        "selectedIconPath": "/static/images/tabbar/tabbar-01-on.png",
+        "text": "我的"
+      }
+    ]
+  },
+  "condition": {
+    "current": 1,
+    "list": [
+      {
+        "name": "商品详情",
+        "path": "pages/shop/GoodsCon/index",
+        "query": "id=588"
+      },
+      {
+        "name": "店铺详情",
+        "path": "pagesInn/inn/innHome",
+        "query": "id=15"
+      },
+      {
+        "name": "提现记录",
+        "path": "pkg_user/views/withdrawalLog",
+        "query": "id=2539"
+      },
+      {
+        "name": "抽奖",
+        "path": "pkg-video/views/lottery",
+        "query": ""
+      },
+      {
+        "name": "寻看点",
+        "path": "pkg-video/views/watch",
+        "query": ""
+      },
+      {
+        "name": "寻看点-选择城市",
+        "path": "pkg-video/views/city",
+        "query": ""
+      },
+      {
+        "name": "我的收藏",
+        "path": "pkg_user/views/myFavorite",
+        "query": "id=2597"
+      },
+      {
+        "name": "购物车",
+        "path": "pages/cart",
+        "query": ""
+      },
+      {
+        "name": "搜索",
+        "path": "pages/shop/GoodsList/index",
+        "query": ""
+      }
+    ]
+  }
+}

From 19e598bce73f8a633e7094640e5da5cdd08433f7 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Sat, 22 Nov 2025 14:23:46 +0800
Subject: [PATCH 28/78] =?UTF-8?q?Feat=EF=BC=9A=E7=94=84=E9=80=89=E5=A5=BD?=
 =?UTF-8?q?=E7=A4=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json             |  2 +-
 pages/home/index.vue   | 56 +++++++++++++++++++++++++++--
 pages/home/newZone.vue | 81 +++++++++++++++++++++++++++++++++++++++---
 3 files changed, 131 insertions(+), 8 deletions(-)

diff --git a/pages.json b/pages.json
index c5abb3a..7bac17c 100644
--- a/pages.json
+++ b/pages.json
@@ -51,7 +51,7 @@
     {
       "path": "pages/home/newZone",
       "style": {
-        "navigationBarTitleText": "新品专区",
+        "navigationBarTitleText": "甄选好礼",
         "navigationBarBackgroundColor": "#FFFFFF"
       }
     },
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 126d49c..198c1e5 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -183,7 +183,24 @@
             </swiper-item>
           </swiper> -->
           <view class="new-zone-wrap">
-            <view v-if="indexVideo" class="kd" id="xkd">
+            <image class="bg-img" :src="newZone.indexBackgroundImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
+            <view class="swiper-wrap-zx v12-mt-2" @click="toNewZone">
+                <swiper autoplay @change="changeIndex"  :current="currentIndex" next-margin="40rpx" previous-margin="80rpx" circular style="width: 100%;height: 400rpx;" interval="3000">
+                  <swiper-item style="position: absolute; width: 100%; transform: translate(200%, 0px) translateZ(0px);" v-for="(item, index) in newZone.indexProducts" :key="index" class="s-item" :class="{'n-actived': currentIndex !== index}">
+                    <view class="zx-item">
+                      <image :src="item.productImage" style="width: 192rpx; height: 192rpx; border-radius:10rpx"></image>
+                      <view class="v12-pa-2">
+                        <view class="v12-font-28 more-t v12-font-bold" style="text-align: center;">{{ item.productName }}</view>
+                        <view class="v12-primary-text v12-font-bold price-wrap" style="text-align: center;">
+                          <text class="v12-font-16">￥</text>
+                          <text class="v12-font-24">{{ item.productPrice }}</text>
+                        </view>
+                      </view>
+                    </view>
+                  </swiper-item>
+                </swiper>
+              </view>
+            <!-- <view v-if="indexVideo" class="kd" id="xkd">
               <view class="img-wrap" style="padding-top: 10rpx; box-sizing:border-box">
                 <image  style="width: 112rpx; height:26rpx" :src="webUrl + '/orderIcon/kd.png'" mode="heightFix|widthFix"></image>
               </view>
@@ -215,7 +232,7 @@
                   </swiper-item>
                 </swiper>
               </view>
-            </view>
+            </view> -->
           </view>
         </view>
       </view>
@@ -433,7 +450,8 @@ export default {
       messageIcon: {},
       recommendKeyword: [],
       keywordIndex: 0,
-      shareData: {}
+      shareData: {},
+      currentIndex: 0
     }
   },
   onLoad() {
@@ -479,6 +497,9 @@ export default {
     }
   },
   methods: {
+    changeIndex(e) {
+      this.currentIndex = e.detail.current
+    },
     changeRecommendKeyword(e) {
       this.keywordIndex = e
     },
@@ -1550,6 +1571,27 @@ export default {
 </script>
 
 <style scoped lang="less">
+.n-actived{
+  bottom: 20rpx !important;
+}
+.s-item{
+  height: fit-content !important;
+   bottom: 0rpx;
+}
+.zx-item{
+  width: 192rpx;
+  background: #fff;
+  border-radius: 16rpx;
+  height: 346rpx;
+}
+.swiper-wrap-zx{
+  position: absolute;
+  bottom: 20rpx;
+  z-index: 2;
+  /* height: 50%; */
+  width: 100%;
+  left: 0;
+}
 .swiper-item {
   height: 100%;
 }
@@ -1833,6 +1875,14 @@ export default {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
+  position: relative;
+  .bg-img{
+    height: 100%;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+  }
   .kd{
     width: 100%;
     height: 266rpx;
diff --git a/pages/home/newZone.vue b/pages/home/newZone.vue
index 8a30c21..003aa5f 100644
--- a/pages/home/newZone.vue
+++ b/pages/home/newZone.vue
@@ -29,8 +29,31 @@
         </swiper>
       </view>
     </view>
-
-    <view class="v12-mt-2 v12-align-center">
+    <view class="v12-align-center tabs-wrap v1-py-1 v12-mt-2">
+      <view class="tab-item v12-font-bold" v-for="(tab, index) in tabs" :key="index" @click="handleClick(index, tab)">
+        {{ tab.cateName }}
+        <view class="tab-line" v-if="activeIndex == index"></view>
+      </view>
+    
+    </view>
+    <view class="product-wrap v12-mt-3">
+      <view class="product-card" v-for="(item, index) in products" :key="index" @click="toGoods(item)">
+        <image :src="item.productImage" class="product-card-img" mode="heightFix|widthFix"></image>
+        <view class="new-info">
+          <view class="v12-font-26 more-t" style="width: 100%;">{{ item.productName }}</view>
+          <view style="width: 100%;" class="v12-font-bold v12-primary-text v12-align-center v12-justify-between">
+            <view>
+              <text>￥</text>
+                <text class=" v12-font-36">{{ item.productPrice }}</text>
+            </view>
+            <view>
+              <u-icon :name="webUrl + '/home/icon-cart.png'" size="24"></u-icon>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- <view class="v12-mt-2 v12-align-center">
       <view class="primary-title" v-if="details.contentTitle">
         {{ details.contentTitle }}
         <view class="title-line"></view>
@@ -42,7 +65,7 @@
     </view>
     <view class="cover-img v12-mt-2" v-for="(item, index) in details.contents" :key="index" @click="toGoods(item)">
       <image :src="item.contentImage" class="cover-img" mode="heightFix|widthFix"></image>
-    </view>
+    </view> -->
   </view>
 </template>
 <script>
@@ -50,13 +73,19 @@ import { queryNewZone } from '@/api/activity'
 export default{
   data() {
     return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
       details: {},
       current: 0,
+      tabs: [],
+      activeIndex: 0,
+      products: []
     }
   },
   onLoad() {
     queryNewZone().then(res => {
       this.details = res.data 
+      this.tabs = res.data.categories
+      this.handleClick(0, this.tabs[0])
     })
   },
   computed: {
@@ -66,6 +95,10 @@ export default{
 
   },
   methods: {
+    handleClick(index, tab) {
+      this.activeIndex = index
+      this.products = tab.products
+    },
     handleChange(e) {
       this.current = e.detail.current
     },
@@ -78,10 +111,50 @@ export default{
 }
 </script>
 <style lang="scss" scoped>
+.product-card{
+  width: 342rpx;
+  height: 520rpx;
+  background: #fff;
+  border-radius: 20rpx;
+  margin-bottom: 20rpx;
+}
+.product-card-img{
+  width: 344rpx;
+  height: 344rpx;
+  background: rgba(169,56,56,0.39);
+  border-radius: 20rpx;
+}
+.product-wrap{
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.tab-line{
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 6rpx;
+  background: linear-gradient(to right, #C52733 0%, rgba(202,56,67,0.92) 51%, rgba(255,255,255,0) 100%);
+  border-radius: 6rpx;
+}
+.tabs-wrap{
+  overflow: auto;
+  justify-content: space-around;
+}
+.tab-item{
+  margin-right: 20rpx;
+  white-space: nowrap;
+  position: relative;
+  &:last-child{
+    margin-right: 0;
+  }
+}
 .new-info{
   display: flex;
   align-items: center;
   flex-direction: column;
+  padding: 20rpx 20rpx 0 20rpx;
 }
 .box-emp{
   width: 100%;
@@ -160,7 +233,7 @@ export default{
 }
   .new-zone-page{
     min-height: 100vh;
-    background-color: #fff;
+    // background-color: #fff;
     padding: 20rpx;
   }
   .banner-zone{

From cdf1f24b7459e437ed019c51559b1e20804169cb Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Sat, 22 Nov 2025 14:37:58 +0800
Subject: [PATCH 29/78] =?UTF-8?q?Feat=EF=BC=9A=E9=80=89=E6=8B=A9=E7=A4=BC?=
 =?UTF-8?q?=E5=8C=85=E5=B0=81=E9=9D=A2=E6=8C=89=E9=92=AE=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=B9=E6=8D=AE=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/gift.js                  | 11 +++++++++++
 pkg_user/views/gift/gift.vue | 31 +++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/api/gift.js b/api/gift.js
index 436bdbb..1963088 100644
--- a/api/gift.js
+++ b/api/gift.js
@@ -101,3 +101,14 @@ export function receiveSojoumGroupBuyGift(params) {
     login: true
   })
 }
+
+/**
+ * 旅居礼品卡送礼入口轮播图
+ * @param {*} params
+ * @returns
+ */
+export function fetchSojoumGroupBuyGiftCarousel(params) {
+  return request.get("/travel/giftCardTravelBanner",params, {
+    login: true
+  })
+}
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 760de35..c306cd4 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -1,23 +1,8 @@
 <template>
   <view class="gift-page" v-if="(goodsInfo.productInfo && goodsInfo.productInfo.storeName) || isGroupBuy">
     <view class="top-card" v-if="!isPayOk ">
-      <view class="v12-justify-between v12-pa-2">
-        <view>
-          <view></view>
-          <view class="v12-font-28 v12-secondary-dark-text v12-d-flex">
-            <u-icon :name="webUrl + '/icon/gift-primary.png'"></u-icon>
-            <!-- 送礼寄语 -->
-          </view>
-        </view>
-        <view class="v12-primary-text v12-font-26 v12-d-flex v12-align-center">
-          <image class="custom-cover" :src="webUrl + '/icon/custom.png'" mode="heightFix" lazy-load="false">
-            
-          </image>
-          <view  @click="handleShowCover">{{ cover }}封面</view>
-          <view>
-            <u-icon name="arrow-right" color="#c52733"></u-icon>
-          </view>
-        </view>
+      <view class="v12-justify-between" @click="handleShowCover">
+        <image class="popCover" :src="popupCover" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
       </view>
     </view>
     <view  class="gift-good-card">
@@ -200,7 +185,8 @@ import {
   getGiftCardSendOrderAmount, 
   getGiftCardResend,
   createGroupBuyGift,
-  createSojoumGroupBuyGift
+  createSojoumGroupBuyGift,
+  fetchSojoumGroupBuyGiftCarousel
  } from '@/api/gift'
 import { weappPay } from "@/libs/wechat";
 import {mapGetters} from "vuex";
@@ -256,6 +242,7 @@ export default {
       showPopup: false,
       blindImage: '',
       isGroupBuy: false,
+      popupCover: ''
     }
   },
   watch: {
@@ -275,6 +262,9 @@ export default {
     } else {
       this.getGift()
     }
+    fetchSojoumGroupBuyGiftCarousel().then(res => {
+      this.popupCover = res.data[0]
+    })
   },
   computed: {
     ...mapGetters(["userInfo"]),
@@ -734,4 +724,9 @@ export default {
   background: #fff;
   border-radius: 30rpx;
 }
+.popCover{
+  width: 100%;
+  height: 280rpx;
+  border-radius: 16rpx;
+}
 </style>
\ No newline at end of file

From efd70ae003aa5c8e0fe3f46735327eb3eb55ca9a Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Sat, 22 Nov 2025 15:15:13 +0800
Subject: [PATCH 30/78] =?UTF-8?q?Feat=EF=BC=9A=E5=9B=A2=E8=B4=AD=E7=A4=BC?=
 =?UTF-8?q?=E5=93=81=E6=94=AF=E6=8C=81=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/gift.js                  | 12 +++++++++
 pkg_user/views/gift/gift.vue | 47 +++++++++++++++++++++++++-----------
 2 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/api/gift.js b/api/gift.js
index 1963088..3f33c62 100644
--- a/api/gift.js
+++ b/api/gift.js
@@ -112,3 +112,15 @@ export function fetchSojoumGroupBuyGiftCarousel(params) {
     login: true
   })
 }
+
+/**
+ * 计算旅居团购礼品订单价格
+ * @param {*} params
+ * @returns
+ */
+
+export function computedSojoumGroupBuyGiftOrderPrice(params) {
+  return request.post("/travel/giftCardOrder/computed/" + params.key, params, {
+    login: true
+  })
+}
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index c306cd4..ffc34d5 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -81,7 +81,7 @@
           <text class="v12-dark-text v12-font-30">{{ isGroupBuy ? goodsInfo.price : computedResult.totalPrice }}</text>
         </view>
       </view>
-      <view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1" v-if="!isGroupBuy">
+      <view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1">
         <view class="v12-font-24 v12-dark-text">平台折扣：</view>
         <view>
           -
@@ -89,7 +89,7 @@
           <text class="v12-dark-text v12-font-30">{{ computedResult.discountPrice }}</text>
         </view>
       </view>
-      <view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1" v-if="!isGroupBuy">
+      <view class="v12-justify-between v12-align-center v12-font-28 v12-mt-1">
         <view class="v12-font-24 v12-dark-text v12-align-center">
           <view class="">
             优惠券：
@@ -111,7 +111,7 @@
         <view class="v12-font-bold">合计：</view>
         <view class="">
           <text class="v12-primary-text v12-font-bold v12-font-22">￥</text>
-          <text class="v12-primary-text v12-font-bold v12-font-28">{{ isGroupBuy ? goodsInfo.price : computedResult.payPrice }}</text>
+          <text class="v12-primary-text v12-font-bold v12-font-28">{{ computedResult.payPrice }}</text>
         </view>
       </view>
     </view>
@@ -146,7 +146,7 @@
       ref='payPwdPop'
       showMoney
       v-if="isShowPayPwdPop"
-      :money="isGroupBuy ? goodsInfo.price : payPrice"
+      :money="payPrice"
       :show="isShowPayPwdPop"
       @close="isShowPayPwdPop = false"
       @finish="pwdPopFinish"
@@ -186,7 +186,8 @@ import {
   getGiftCardResend,
   createGroupBuyGift,
   createSojoumGroupBuyGift,
-  fetchSojoumGroupBuyGiftCarousel
+  fetchSojoumGroupBuyGiftCarousel,
+  computedSojoumGroupBuyGiftOrderPrice
  } from '@/api/gift'
 import { weappPay } from "@/libs/wechat";
 import {mapGetters} from "vuex";
@@ -249,7 +250,11 @@ export default {
     async couponId(value) {
       this.couponIndex = this.couponList['usable']?.findIndex(item => item.id === +value)
       this.couponTitle = this.couponList['usable']?.[this.couponIndex]?.couponTitle
-      await this.computedPrice(this.goodsInfo.cartNum, 1)
+      if(this.isGroupBuy) {
+        await this.computedTravelGroupPrice(true)
+      } else {
+        await this.computedPrice(this.goodsInfo.cartNum, 1)
+      }
     }
   },
   onLoad(opts) {
@@ -284,14 +289,23 @@ export default {
       imageUrl: this.shareImage
     }
   },
-  // onReady() {
-  //   this.$nextTick(() => {
-  //     this.$refs.textarea.setFormatter(val => {
-  //       return val.length > 30 ? val.substring(0, 30) : val
-  //     })
-  //   })
-  // },
   methods: {
+    // 团购价计算
+    computedTravelGroupPrice(useDefaultCouponId) {
+      const params = {
+        key: this.orderKey,
+        couponId: this.couponId
+      }
+      computedSojoumGroupBuyGiftOrderPrice(params).then(res => {
+        this.computedResult = res.data.result
+        this.couponList = res.data.result.couponList
+        this.payPrice = res.data.result.payPrice
+        this.$forceUpdate()
+        if(useDefaultCouponId) {
+          this.couponId = res.data.result.defaultCouponId || 0
+        }
+      })
+    },
     handleShowCover() {
       this.showCoverPicker = true
     },
@@ -310,7 +324,11 @@ export default {
       if(!item.id) {
         this.couponId = 0
         this.couponTitle = ''
-        this.computedPrice(this.goodsInfo.cartNum, 1)
+        if(this.isGroupBuy) {
+          this.computedTravelGroupPrice(false)
+        } else {
+          this.computedPrice(this.goodsInfo.cartNum, 1)
+        }
         return
       }
       this.couponId = item.id
@@ -576,6 +594,7 @@ export default {
             }
           }
           this.giftNotice = res.data.giftCardGiftNotice
+          this.computedTravelGroupPrice(true)
         }
       })
     }

From d43fc253c93189df923b357c9f8261d207a7c2b5 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Sat, 22 Nov 2025 15:22:46 +0800
Subject: [PATCH 31/78] =?UTF-8?q?Fix=EF=BC=9A4646=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E7=A4=BC=E5=8C=85=E9=80=80=E6=AC=BE=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B6=E7=A4=BC=E6=96=B9=E9=A2=86=E5=8F=96=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E2=80=9C=E7=A4=BC=E5=93=81=E5=8D=A1=E5=B7=B2=E5=A4=B1=E6=95=88?=
 =?UTF-8?q?=E2=80=9D=EF=BC=88iOS=E9=9C=80=E4=BF=AE=E6=94=B9=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=AE=89=E5=8D=93=E9=9C=80=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/GiftCard.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 884f1d0..3038f77 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -271,11 +271,11 @@ export default {
         uni.reLaunch({ url: '/pkg_user/views/gift/receiveDone?obj=' + JSON.stringify(res.data) })
       }).catch(() => {
         uni.showToast({
-          title: '领取失败，请重试',
+          title: '礼品卡已失效',
           icon: 'none'
         });
       }).finally(() => {
-        uni.hideLoading();
+        // uni.hideLoading();
       });
     },
     async showTips() {

From b2121e71efef99c60e77c573b8e83ec5484dfd6c Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Sat, 22 Nov 2025 15:59:16 +0800
Subject: [PATCH 32/78] =?UTF-8?q?Fix=EF=BC=9A4628=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AE=A2=E5=8D=95=E6=8F=90=E4=BA=A4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E2=80=94=E2=80=94=E8=BE=93=E5=85=A5=E6=A1=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=EF=BC=8C=E6=9C=AA=E5=9B=BA=E5=AE=9A=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/submitOrder.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_product/views/submitOrder.vue b/pkg_product/views/submitOrder.vue
index ec8de6c..c2dd0ca 100644
--- a/pkg_product/views/submitOrder.vue
+++ b/pkg_product/views/submitOrder.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="submit-order">
-    <scroll-view scroll-y class="page-scroll">
+    <view scroll-y class="page-scroll">
       <!-- 商品卡片 -->
       <view class="card">
         <view class="product-card">
@@ -91,7 +91,7 @@
         </view>
       </view>
       <view class="bottom-space"></view>
-    </scroll-view>
+    </view>
 
     <!-- 底部栏 -->
     <view class="bottom-bar">

From aaa29ef0f65a98b4c830d03b2171f35e74164fb3 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Sat, 22 Nov 2025 16:09:49 +0800
Subject: [PATCH 33/78] =?UTF-8?q?Feat=EF=BC=9A=E9=A6=96=E9=A1=B5=E7=94=84?=
 =?UTF-8?q?=E9=80=89=E5=A5=BD=E7=A4=BC=E8=BD=AE=E6=92=AD=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 198c1e5..b6f6d85 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1572,11 +1572,15 @@ export default {
 
 <style scoped lang="less">
 .n-actived{
-  bottom: 20rpx !important;
+  // bottom: 20rpx !important;
+  .zx-item {
+    transform: scale(0.8);
+    transition: all 0.3s ease-in-out;
+  }
 }
 .s-item{
   height: fit-content !important;
-   bottom: 0rpx;
+   bottom: 10rpx;
 }
 .zx-item{
   width: 192rpx;

From 7a44ed3265e418baa6d53ed5d19bf197056d8c38 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Sat, 22 Nov 2025 16:24:49 +0800
Subject: [PATCH 34/78] =?UTF-8?q?Fix:4004=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=9C=A8=E4=BA=92=E5=8A=A8?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=E5=9B=9E=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E8=AE=AF=E8=AF=84=E8=AE=BA=EF=BC=8C=E5=86=85=E5=AE=B9=E8=A2=AB?=
 =?UTF-8?q?=E9=A1=B6=E8=87=B3=E5=B1=8F=E5=B9=95=E4=B9=8B=E5=A4=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_common/views/message.vue | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkg_common/views/message.vue b/pkg_common/views/message.vue
index b092519..366bf97 100644
--- a/pkg_common/views/message.vue
+++ b/pkg_common/views/message.vue
@@ -71,10 +71,11 @@
        
       </view>
     </view>
-    <view v-if="showBtn" class="v12-align-center v12-justify-center v12-pa-3 v12-white sticky-bottom">
+    <view v-show="showBtn" class="v12-align-center v12-justify-center v12-pa-3 v12-white sticky-bottom" :style="{ bottom: inputBoxBottom + 'px' }">
       <view style="width: 100%">
         <u-textarea
           id="input"
+          fixed
           v-model="content"
           :maxlength="500"
           :maxheight="200"
@@ -87,6 +88,7 @@
             border: '1px solid #f7f7f7',
             borderRadius: '20rpx'
           }"
+          :adjustPosition="false"
           cursorSpacing="85"
           @blur="onBlur"
           @focus="commentInputFocus"
@@ -149,13 +151,32 @@ export default {
       content: '',
       currentComment: {},
       // 光标位置
-      cursorIndex: 0
+      cursorIndex: 0,
+      inputBoxBottom: 0
     }
   },
+  onLoad() {
+    // 监听键盘高度变化
+    uni.onKeyboardHeightChange((res) => {
+      if (res.height) {
+        this.onKeyboardShow(res.height)
+      } else {
+        this.onKeyboardHide()
+      }
+    })
+  },
   onShow() {
     this.fetchList()
   },
   methods: {
+    
+  onKeyboardShow(height) {
+    this.inputBoxBottom = height
+  },
+  onKeyboardHide() {
+      // 处理键盘收起逻辑
+      this.inputBoxBottom = 0
+    },
     toInfo(comment) {
       if(!comment.contentAvailable) {
         // 该内容已删除

From 99f613148b8a334791bbaee3891272cb976a752f Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Sat, 22 Nov 2025 16:34:10 +0800
Subject: [PATCH 35/78] =?UTF-8?q?Feat=EF=BC=9A=E9=A6=96=E9=A1=B5=E7=94=84?=
 =?UTF-8?q?=E9=80=89=E5=A5=BD=E7=A4=BC=E8=BD=AE=E6=92=AD=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96/=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index b6f6d85..5aea15f 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1575,7 +1575,6 @@ export default {
   // bottom: 20rpx !important;
   .zx-item {
     transform: scale(0.8);
-    transition: all 0.3s ease-in-out;
   }
 }
 .s-item{
@@ -1587,6 +1586,7 @@ export default {
   background: #fff;
   border-radius: 16rpx;
   height: 346rpx;
+  transition: all 0.3s ease-in-out;
 }
 .swiper-wrap-zx{
   position: absolute;

From 3c1578e51f60f94584c6a649fd74a734a7bf4d0f Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Sat, 22 Nov 2025 17:57:32 +0800
Subject: [PATCH 36/78] =?UTF-8?q?Feat=EF=BC=9A=E7=A4=BC=E5=93=81=E5=B0=81?=
 =?UTF-8?q?=E9=9D=A2=E5=B0=BA=E5=AF=B8=E5=A4=A7=E5=B0=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/gift/components/CoverPicker.vue     | 42 +++++++++++++------
 1 file changed, 29 insertions(+), 13 deletions(-)

diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 1a5f7b1..2537468 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -14,13 +14,13 @@
         :circular="true"
         :indicator-dots="false"
         @change="onChange"
-        previous-margin="200rpx"
+        previous-margin="180rpx"
         next-margin="180rpx"
         class="cover-swiper"
       >
-        <swiper-item v-for="(item, index) in list" :key="index">
+        <swiper-item v-for="(item, i) in list" :key="i" class="cover-swiper-item"  :class="{'n-actived' : currentIndex !== i}">
           <view class="cover-item" >
-            <view class="img-wrap"  :class="currentIndex === index ? 'v12-mt-10' : 'v12-mt-18'">
+            <view class="img-wrap">
               <view class="pro-img-wrap " :style="{
                 left: (item.productImageX*2 || 0)   + 'rpx',
                 top: (item.productImageY*2 || -40)  + 'rpx'
@@ -28,9 +28,9 @@
                 <image :src="product.image" class="pro-cover-image" mode="widthFix|heightFix" />
               </view>
               <image :src="item.cover" class="cover-image" mode="widthFix|heightFix" />
-              <view class="message-text" :style="{top: currentIndex !== index ? '260rpx' : '220rpx'}">{{ message }}</view>
+              <!-- <view class="message-text" :style="{top: currentIndex !== index ? '260rpx' : '220rpx'}">{{ message }}</view> -->
             </view>
-            <view class="cover-name">{{ item.name }} </view>
+            <!-- <view class="cover-name">{{ item.name }} </view> -->
           </view>
         </swiper-item>
       </swiper>
@@ -84,6 +84,7 @@ export default {
     },
     onChange(e) {
       this.currentIndex = e.detail.current
+      this.$forceUpdate()
     },
     confirm() {
       this.$emit('confirm', this.list[this.currentIndex])
@@ -94,6 +95,18 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.n-actived{
+  .cover-item{
+    transform: scale(0.8);
+    margin-bottom: -40rpx !important;
+  }
+
+}
+.cover-swiper-item{
+  height: fit-content !important;
+  bottom: 0;
+  overflow: visible;
+}
 .message-text{
   position: absolute;
   text-align: center;
@@ -105,24 +118,24 @@ export default {
   margin: auto;
 }
 .pro-cover-image{
-  width: 218rpx;
-  height: 218rpx;
+  width: 320rpx;
+  height: 320rpx;
+  border-radius: 16rpx;
 }
 .pro-img-wrap{
   position: absolute;
-  width: 218rpx;
-  height: 218rpx;
+  width: 320rpx;
+  height: 320rpx;
   left: 0;
   right: 0;  
   margin: auto;
   /*border: 10rpx solid #FDF0D3;*/
   top: -40px;
   border-radius: 16rpx;
-  overflow: hidden;
 }
 .img-wrap{
   position: relative;
-  transition: all .2s ease-in-out;
+  overflow: visible;
 }
 .tips{
   font-size: 24rpx;
@@ -146,9 +159,12 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
+    overflow: visible;
+    transition: all .3s ease-in-out;
+    margin-bottom: 60rpx;
     .cover-image {
-      width: 340rpx;
-      height: 560rpx;
+      width: 420rpx;
+      height: 580rpx;
       border-radius: 16rpx;
       transition: all .2s ease-in-out;
     }

From 3a2de38cfe23968e72e74fc96bacdac52c7e8fbe Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 24 Nov 2025 11:02:56 +0800
Subject: [PATCH 37/78] =?UTF-8?q?Fix=EF=BC=9A4649=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=82=B9=E5=87=BB=E7=94=84=E9=80=89=E5=A5=BD?=
 =?UTF-8?q?=E7=A4=BC=E7=9A=84=E8=BD=AE=E6=92=AD=E5=95=86=E5=93=81=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=EF=BC=8C=E8=B7=B3=E8=BD=AC=E7=9A=84=E6=98=AF=E7=94=84?=
 =?UTF-8?q?=E9=80=89=E5=A5=BD=E7=A4=BC=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=94=E8=B7=B3=E8=BD=AC=E5=AF=B9=E5=BA=94=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 5aea15f..7cc318a 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1585,7 +1585,6 @@ export default {
   width: 192rpx;
   background: #fff;
   border-radius: 16rpx;
-  height: 346rpx;
   transition: all 0.3s ease-in-out;
 }
 .swiper-wrap-zx{

From 8c7df45451d692c1e49a2c325bb2d52580b59003 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 24 Nov 2025 11:13:45 +0800
Subject: [PATCH 38/78] =?UTF-8?q?Fix=EF=BC=9A4649=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=82=B9=E5=87=BB=E7=94=84=E9=80=89=E5=A5=BD?=
 =?UTF-8?q?=E7=A4=BC=E7=9A=84=E8=BD=AE=E6=92=AD=E5=95=86=E5=93=81=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=EF=BC=8C=E8=B7=B3=E8=BD=AC=E7=9A=84=E6=98=AF=E7=94=84?=
 =?UTF-8?q?=E9=80=89=E5=A5=BD=E7=A4=BC=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=94=E8=B7=B3=E8=BD=AC=E5=AF=B9=E5=BA=94=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 7cc318a..c6fd564 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -183,11 +183,11 @@
             </swiper-item>
           </swiper> -->
           <view class="new-zone-wrap">
-            <image class="bg-img" :src="newZone.indexBackgroundImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
-            <view class="swiper-wrap-zx v12-mt-2" @click="toNewZone">
+            <image @click="toNewZone" class="bg-img" :src="newZone.indexBackgroundImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
+            <view class="swiper-wrap-zx v12-mt-2">
                 <swiper autoplay @change="changeIndex"  :current="currentIndex" next-margin="40rpx" previous-margin="80rpx" circular style="width: 100%;height: 400rpx;" interval="3000">
                   <swiper-item style="position: absolute; width: 100%; transform: translate(200%, 0px) translateZ(0px);" v-for="(item, index) in newZone.indexProducts" :key="index" class="s-item" :class="{'n-actived': currentIndex !== index}">
-                    <view class="zx-item">
+                    <view class="zx-item" @click="goGoodsCon({id: item.productId})">
                       <image :src="item.productImage" style="width: 192rpx; height: 192rpx; border-radius:10rpx"></image>
                       <view class="v12-pa-2">
                         <view class="v12-font-28 more-t v12-font-bold" style="text-align: center;">{{ item.productName }}</view>

From 94536701e4870cb6d22a2d00c124bf8e2b4af831 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 24 Nov 2025 11:18:09 +0800
Subject: [PATCH 39/78] =?UTF-8?q?Fix=EF=BC=9A4651=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85=E9=A1=B5=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=8C=89=E9=92=AE=E5=8C=BA=E5=9F=9F=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/newZone.vue                |  2 +-
 pkg_product/views/groupBuyDetails.vue | 12 ++++++------
 pkg_product/views/submitOrder.vue     |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pages/home/newZone.vue b/pages/home/newZone.vue
index 003aa5f..3e05d90 100644
--- a/pages/home/newZone.vue
+++ b/pages/home/newZone.vue
@@ -165,7 +165,7 @@ export default{
   width: fit-content;
   color: #fff;
   background: #C52733;
-  font-size: 28rpx;
+  font-size: 30rpx;
   padding: 4rpx 20rpx;
 }
 .swiper-wrap{
diff --git a/pkg_product/views/groupBuyDetails.vue b/pkg_product/views/groupBuyDetails.vue
index c552eb9..f32d552 100644
--- a/pkg_product/views/groupBuyDetails.vue
+++ b/pkg_product/views/groupBuyDetails.vue
@@ -510,13 +510,13 @@ export default {
 .gallery-img { width: 100%; margin-bottom: 16rpx; border-radius: 12rpx; overflow: hidden; }
 .bottom-space { height: 140rpx; }
 .bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 16rpx 24rpx; }
-.total { font-size: 28rpx; color: #111; font-weight: 700; }
+.total { font-size: 30rpx; color: #111; font-weight: 700; }
 .bar-actions { display: flex; gap: 16rpx; }
 .mini-btn { 
   padding: 10rpx 22rpx; 
   border: 1rpx solid #ccc; 
   border-radius: 132rpx; 
-  font-size: 26rpx; 
+  font-size: 30rpx; 
   color: #333; 
   display: flex;
   align-items: center;
@@ -526,7 +526,7 @@ export default {
   border-radius: 132rpx; 
   background: #C52733; 
   color: #fff; 
-  font-size: 26rpx; 
+  font-size: 30rpx; 
   display: flex;
   align-items: center;
 }
@@ -626,13 +626,13 @@ export default {
 .gallery-img { width: 100%; margin-bottom: 16rpx; border-radius: 12rpx; overflow: hidden; }
 .bottom-space { height: 140rpx; }
 .bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 16rpx 24rpx; }
-.total { font-size: 28rpx; color: #111; font-weight: 700; }
+.total { font-size: 30rpx; color: #111; font-weight: 700; }
 .bar-actions { display: flex; gap: 16rpx; }
 .mini-btn { 
   padding: 10rpx 22rpx; 
   border: 1rpx solid #ccc; 
   border-radius: 132rpx; 
-  font-size: 26rpx; 
+  font-size: 30rpx; 
   color: #333; 
   display: flex;
   align-items: center;
@@ -642,7 +642,7 @@ export default {
   border-radius: 132rpx; 
   background: #C52733; 
   color: #fff; 
-  font-size: 26rpx; 
+  font-size: 30rpx; 
   display: flex;
   align-items: center;
 }
diff --git a/pkg_product/views/submitOrder.vue b/pkg_product/views/submitOrder.vue
index c2dd0ca..a18956f 100644
--- a/pkg_product/views/submitOrder.vue
+++ b/pkg_product/views/submitOrder.vue
@@ -435,14 +435,14 @@ export default {
 
 .bottom-space { height: 140rpx; }
 .bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 16rpx 24rpx; }
-.total { font-size: 28rpx; color: #111; font-weight: 700; }
+.total { font-size: 30rpx; color: #111; font-weight: 700; }
 .total .highlight { color: #C52733; font-weight: 700; }
 .bar-actions { display: flex; gap: 16rpx; }
 .mini-btn { 
   padding: 10rpx 22rpx;
   border: 1rpx solid #ccc;
   border-radius: 32rpx; 
-  font-size: 26rpx;
+  font-size: 30rpx;
   color: #333;
   display: flex;
   align-items: center;
@@ -452,7 +452,7 @@ export default {
   border-radius: 32rpx; 
   background: #C52733; 
   color: #fff; 
-  font-size: 26rpx; 
+  font-size: 30rpx; 
   display: flex;
   align-items: center;
 }

From 4ff62c50a1586fb82368d89be7a70ac8a0bf1b65 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 24 Nov 2025 11:19:30 +0800
Subject: [PATCH 40/78] =?UTF-8?q?Fix=EF=BC=9A4638=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=9A=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E2=80=94=E6=90=9C=E7=B4=A2=E6=A1=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6=EF=BC=9A=E5=9B=A2?=
 =?UTF-8?q?=E8=B4=AD=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index fb259f7..833ae30 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -5,7 +5,7 @@
         v-model="keyword"
         :inputStyle="inputStyle"
         :showAction="false"
-        placeholder="请输入商品名/订单号"
+        placeholder="请输入商品名/订单号/团购名称"
         shape="round"
         bgColor="#FFF"
         @search="changeType"

From 9de1574c86627185f13f05c8e8a69f56a8bb176c Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 24 Nov 2025 11:31:26 +0800
Subject: [PATCH 41/78] =?UTF-8?q?Fix=EF=BC=9A4601=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E2=80=94=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=88=86=E7=B1=BB=E4=B8=BA=E2=80=9C=E5=BA=B7?=
 =?UTF-8?q?=E5=85=BB=E5=88=86=E7=B1=BB=E2=80=9D=EF=BC=8C=E5=9C=A8=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/healthList.vue    | 6 +++---
 pkg_product/views/healthSanctum.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg_product/views/healthList.vue b/pkg_product/views/healthList.vue
index 532683e..cea6db4 100644
--- a/pkg_product/views/healthList.vue
+++ b/pkg_product/views/healthList.vue
@@ -113,7 +113,7 @@
             <view
               v-if="tabIndex === 0"
               class="city-item"
-              @click="goStore(item.cityId, item.cityName)"
+              @click="goStore(item.id, item.cityName, item.cityId)"
             >
               <image
                 :src="item.icon"
@@ -364,9 +364,9 @@ export default {
       this.label = label
       this.searchReq()
     },
-    goStore(id, name) {
+    goStore(id, name, cityId) {
       uni.navigateTo({
-        url: '/pkg_product/views/healthSanctum?city=' + id +'&cityName=' + name
+        url: '/pkg_product/views/healthSanctum?city=' + id +'&cityName=' + name + '&goodCityId=' + cityId
       })
     },
     goGoods(id) {
diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue
index adbd70a..86075be 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -98,7 +98,7 @@ export default {
   onLoad(opts) {
     console.log(opts);
     
-    this.cityId = opts.city
+    this.cityId = opts.goodCityId
     this.cityName = decodeURIComponent(decodeURIComponent(opts.cityName))
     getCategory().then(res => {
       this.tabs = res.data
@@ -126,7 +126,7 @@ export default {
     getList() {
       const params = {
         // countyId: this.cityId,
-        cityId: this.cityId,
+        goodCityId: this.cityId,
         wellnessPlaceCateId : this.categoryId,
         shopType: 'wellness',
         page: 1,

From fe596ffff3e7a400ab98e2915d60da8bf573374e Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 24 Nov 2025 11:56:52 +0800
Subject: [PATCH 42/78] =?UTF-8?q?Feat=EF=BC=9A=E7=A4=BC=E5=93=81=E7=BA=A2?=
 =?UTF-8?q?=E5=8C=85=E5=B0=81=E9=9D=A2=E5=B0=BA=E5=AF=B8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/CoverPicker.vue | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 2537468..4db8ab2 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -3,11 +3,9 @@
     :show="show" 
     mode="bottom" 
     round="40rpx" 
-    @close="close"
     :customStyle="{height: '600rpx'}"
-    closeable>
-    <view class="cover-picker">
-      <view class="cover-title">选择封面</view>
+    >
+    <view class="cover-picker v12-pt-4">
       <swiper
         :current="currentIndex"
         :autoplay="false"
@@ -27,7 +25,7 @@
               }">
                 <image :src="product.image" class="pro-cover-image" mode="widthFix|heightFix" />
               </view>
-              <image :src="item.cover" class="cover-image" mode="widthFix|heightFix" />
+              <image :src="item.cover" class="cover-image" mode="widthFix" />
               <!-- <view class="message-text" :style="{top: currentIndex !== index ? '260rpx' : '220rpx'}">{{ message }}</view> -->
             </view>
             <!-- <view class="cover-name">{{ item.name }} </view> -->
@@ -98,7 +96,7 @@ export default {
 .n-actived{
   .cover-item{
     transform: scale(0.8);
-    margin-bottom: -40rpx !important;
+    margin-bottom: -70rpx !important;
   }
 
 }
@@ -161,10 +159,10 @@ export default {
     align-items: center;
     overflow: visible;
     transition: all .3s ease-in-out;
-    margin-bottom: 60rpx;
+    margin-bottom: 30rpx;
     .cover-image {
       width: 420rpx;
-      height: 580rpx;
+      // height: 580rpx;
       border-radius: 16rpx;
       transition: all .2s ease-in-out;
     }

From 2a32e1f60a370e24395f38474184425df75584da Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 25 Nov 2025 09:45:31 +0800
Subject: [PATCH 43/78] =?UTF-8?q?Fix=EF=BC=9A4601=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E6=97=85=E5=B1=85?=
 =?UTF-8?q?=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86=E2=80=94=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=89=80=E5=B1=9E=E5=88=86=E7=B1=BB=E4=B8=BA=E2=80=9C=E5=BA=B7?=
 =?UTF-8?q?=E5=85=BB=E5=88=86=E7=B1=BB=E2=80=9D=EF=BC=8C=E5=9C=A8=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/healthSanctum.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue
index 86075be..9b1f3a5 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -98,7 +98,7 @@ export default {
   onLoad(opts) {
     console.log(opts);
     
-    this.cityId = opts.goodCityId
+    this.cityId = opts.city
     this.cityName = decodeURIComponent(decodeURIComponent(opts.cityName))
     getCategory().then(res => {
       this.tabs = res.data
@@ -128,7 +128,7 @@ export default {
         // countyId: this.cityId,
         goodCityId: this.cityId,
         wellnessPlaceCateId : this.categoryId,
-        shopType: 'wellness',
+        shopType: 'wellnessCate',
         page: 1,
         limit: 9999
       }
@@ -144,8 +144,8 @@ export default {
     },
     getTop() {
       const params = {
-        cityId: this.cityId,
-        shopType: 'wellness',
+        goodCityId: this.cityId,
+        shopType: 'wellnessTop',
         page: 1,
         limit: 9999
       }

From c6e4c88eb78879013324075fdfbe7cc2df2f80ab Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 25 Nov 2025 09:45:49 +0800
Subject: [PATCH 44/78] =?UTF-8?q?Fix=EF=BC=9A4654=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=96=B0=E4=B8=8A=E4=BC=A0=E7=9A=84=E5=9B=BE=EF=BC=8C=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E6=98=AF740=EF=BC=8C=E6=98=AF370=E7=9A=84=E4=B8=A4?=
 =?UTF-8?q?=E5=80=8D=EF=BC=8C=E9=AB=98=E5=BA=A6=E7=BC=A9=E7=9F=AD=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E7=82=B9=EF=BC=8C=E4=B8=8A=E4=BC=A0=E5=90=8E=E8=BF=98?=
 =?UTF-8?q?=E6=98=AF=E6=8B=89=E4=BC=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/gift.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index ffc34d5..b5df128 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -2,7 +2,7 @@
   <view class="gift-page" v-if="(goodsInfo.productInfo && goodsInfo.productInfo.storeName) || isGroupBuy">
     <view class="top-card" v-if="!isPayOk ">
       <view class="v12-justify-between" @click="handleShowCover">
-        <image class="popCover" :src="popupCover" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
+        <image class="popCover" :src="popupCover" mode="widthFix" lazy-load="false"></image>
       </view>
     </view>
     <view  class="gift-good-card">
@@ -745,7 +745,6 @@ export default {
 }
 .popCover{
   width: 100%;
-  height: 280rpx;
   border-radius: 16rpx;
 }
 </style>
\ No newline at end of file

From b65301baa224114583eed4111c3468d73d13f9f9 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 25 Nov 2025 09:55:27 +0800
Subject: [PATCH 45/78] =?UTF-8?q?Fix=EF=BC=9A4651=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85=E9=A1=B5=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=8C=89=E9=92=AE=E5=8C=BA=E5=9F=9F=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/groupBuyDetails.vue    | 2 +-
 pkg_product/views/sojoumOrderDetails.vue | 2 +-
 pkg_product/views/submitOrder.vue        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg_product/views/groupBuyDetails.vue b/pkg_product/views/groupBuyDetails.vue
index f32d552..649bc1d 100644
--- a/pkg_product/views/groupBuyDetails.vue
+++ b/pkg_product/views/groupBuyDetails.vue
@@ -625,7 +625,7 @@ export default {
 .val { color: #666; text-align: right; }
 .gallery-img { width: 100%; margin-bottom: 16rpx; border-radius: 12rpx; overflow: hidden; }
 .bottom-space { height: 140rpx; }
-.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 16rpx 24rpx; }
+.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 26rpx 24rpx; }
 .total { font-size: 30rpx; color: #111; font-weight: 700; }
 .bar-actions { display: flex; gap: 16rpx; }
 .mini-btn { 
diff --git a/pkg_product/views/sojoumOrderDetails.vue b/pkg_product/views/sojoumOrderDetails.vue
index a2f98d3..f41a564 100644
--- a/pkg_product/views/sojoumOrderDetails.vue
+++ b/pkg_product/views/sojoumOrderDetails.vue
@@ -557,7 +557,7 @@ export default {
     left: 0;
     right: 0;
     background-color: #fff;
-    padding: 20rpx 30rpx;
+    padding: 26rpx 30rpx;
     display: flex;
     justify-content: space-between;
     box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
diff --git a/pkg_product/views/submitOrder.vue b/pkg_product/views/submitOrder.vue
index a18956f..55174b2 100644
--- a/pkg_product/views/submitOrder.vue
+++ b/pkg_product/views/submitOrder.vue
@@ -434,7 +434,7 @@ export default {
 .text-card .plain-text { font-size: 26rpx; color: #666; line-height: 40rpx; letter-spacing: 2px;}
 
 .bottom-space { height: 140rpx; }
-.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 16rpx 24rpx; }
+.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 26rpx 24rpx; }
 .total { font-size: 30rpx; color: #111; font-weight: 700; }
 .total .highlight { color: #C52733; font-weight: 700; }
 .bar-actions { display: flex; gap: 16rpx; }

From 824a9f93de6155d6cb9a71810b134f6fd8929647 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 25 Nov 2025 10:18:43 +0800
Subject: [PATCH 46/78] =?UTF-8?q?Fix=EF=BC=9A4655=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9C=A8=E9=A6=96=E9=A1=B5=E7=86=84=E5=B1=8F=E6=88=96=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=BD=AF=E4=BB=B610=E7=A7=92=E9=92=9F=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8A=EF=BC=8C=E7=94=84=E9=80=89=E5=A5=BD=E7=A4=BC=E8=BD=AE?=
 =?UTF-8?q?=E6=92=AD=E5=95=86=E5=93=81=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E6=8A=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index c6fd564..a2f9875 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -45,6 +45,8 @@
         autoplay
         circular
         style="height: 510rpx;"
+        :duration="500"
+        @animationfinish="bindSwiperInstance($event, 'banner')"
       >
         <block
           v-for="(item, bannerIndex) in banner"
@@ -114,6 +116,8 @@
             circular
             autoplay
             :interval="3000"
+            :duration="500"
+            @animationfinish="bindSwiperInstance($event, 'homestay')"
           >
             <swiper-item
               v-for="(stay, stayIndex) in contentHomestay"
@@ -185,8 +189,8 @@
           <view class="new-zone-wrap">
             <image @click="toNewZone" class="bg-img" :src="newZone.indexBackgroundImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
             <view class="swiper-wrap-zx v12-mt-2">
-                <swiper autoplay @change="changeIndex"  :current="currentIndex" next-margin="40rpx" previous-margin="80rpx" circular style="width: 100%;height: 400rpx;" interval="3000">
-                  <swiper-item style="position: absolute; width: 100%; transform: translate(200%, 0px) translateZ(0px);" v-for="(item, index) in newZone.indexProducts" :key="index" class="s-item" :class="{'n-actived': currentIndex !== index}">
+                <swiper autoplay @change="changeIndex"  :current="currentIndex" next-margin="40rpx" previous-margin="80rpx" circular style="width: 100%;height: 400rpx;" interval="3000" :duration="500" @animationfinish="bindSwiperInstance($event, 'newZone')">
+                  <swiper-item v-for="(item, index) in newZone.indexProducts" :key="index" class="s-item" :class="{'n-actived': currentIndex !== index}">
                     <view class="zx-item" @click="goGoodsCon({id: item.productId})">
                       <image :src="item.productImage" style="width: 192rpx; height: 192rpx; border-radius:10rpx"></image>
                       <view class="v12-pa-2">
@@ -301,6 +305,8 @@
                   circular
                   autoplay
                   :interval="3000"
+                  :duration="500"
+                  @animationfinish="bindSwiperInstance($event, 'productSwiper')"
                 >
                   <swiper-item
                     v-for="(swiperItem, swiperIndex) in item.list"
@@ -451,7 +457,9 @@ export default {
       recommendKeyword: [],
       keywordIndex: 0,
       shareData: {},
-      currentIndex: 0
+      currentIndex: 0,
+      // 轮播组件实例
+      swiperInstances: {}
     }
   },
   onLoad() {
@@ -500,6 +508,24 @@ export default {
     changeIndex(e) {
       this.currentIndex = e.detail.current
     },
+    // 页面显示时恢复轮播
+    pageToShowHandle() {
+      // 恢复所有轮播组件的自动播放
+      Object.values(this.swiperInstances).forEach(swiper => {
+        swiper && swiper.autoplayStart && swiper.autoplayStart()
+      })
+    },
+    // 页面隐藏时暂停轮播
+    pageToHideHandle() {
+      // 暂停所有轮播组件的自动播放
+      Object.values(this.swiperInstances).forEach(swiper => {
+        swiper && swiper.autoplayStop && swiper.autoplayStop()
+      })
+    },
+    // 绑定轮播组件实例
+    bindSwiperInstance(e, key) {
+      this.swiperInstances[key] = e.detail
+    },
     changeRecommendKeyword(e) {
       this.keywordIndex = e
     },

From 642139d0a22e7713a7dcb8e9bb70041f76456847 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 25 Nov 2025 10:23:47 +0800
Subject: [PATCH 47/78] =?UTF-8?q?Fix=EF=BC=9A4658=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?iOS=E7=AB=AF=E7=9A=84=E8=BD=AE=E6=92=AD=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E4=BB=B7=E6=A0=BC=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E9=80=89=E8=B4=AD=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E6=95=B4?=
 =?UTF-8?q?=E4=BD=93=E4=B8=8A=E8=B0=83=E4=B8=80=E7=82=B9=EF=BC=8C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=B8=8B=E6=96=B9=E7=95=99=E7=82=B9=E7=A9=BA=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/newZone.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/home/newZone.vue b/pages/home/newZone.vue
index 3e05d90..0ca0d56 100644
--- a/pages/home/newZone.vue
+++ b/pages/home/newZone.vue
@@ -11,7 +11,7 @@
         </swiper-item>
       </swiper> -->
       <view class="swiper-wrap">
-        <swiper @change="handleChange" style="height: 100%;" autoplay circular next-margin="460rpx" interval="4000">
+        <swiper @change="handleChange" style="height: 100%;" autoplay  circular next-margin="460rpx" interval="4000">
           <swiper-item v-for="(item, index) in details.newProducts" :key="index" @click="toGoods(item)">
             <view class="new-card" :class="{'is-actived': current == index}">
               <image :src="item.productCover" class="new-card-img" mode="heightFix|widthFix"></image>
@@ -154,7 +154,7 @@ export default{
   display: flex;
   align-items: center;
   flex-direction: column;
-  padding: 20rpx 20rpx 0 20rpx;
+  padding: 20rpx;
 }
 .box-emp{
   width: 100%;
@@ -177,7 +177,7 @@ export default{
 }
 .new-card{
   width: 220rpx;
-  height: 240rpx;
+  // height: 240rpx;
   background: #fff;
   border-radius: 20rpx;
   position: absolute;

From b53e2d1eaafff2f80a1ebd6a42183e1ab36a6585 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 25 Nov 2025 11:05:28 +0800
Subject: [PATCH 48/78] =?UTF-8?q?Fix=EF=BC=9A4655=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9C=A8=E9=A6=96=E9=A1=B5=E7=86=84=E5=B1=8F=E6=88=96=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E8=BD=AF=E4=BB=B610=E7=A7=92=E9=92=9F=E4=BB=A5?=
 =?UTF-8?q?=E4=B8=8A=EF=BC=8C=E7=94=84=E9=80=89=E5=A5=BD=E7=A4=BC=E8=BD=AE?=
 =?UTF-8?q?=E6=92=AD=E5=95=86=E5=93=81=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E6=8A=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index a2f9875..1b599d2 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -189,7 +189,7 @@
           <view class="new-zone-wrap">
             <image @click="toNewZone" class="bg-img" :src="newZone.indexBackgroundImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
             <view class="swiper-wrap-zx v12-mt-2">
-                <swiper autoplay @change="changeIndex"  :current="currentIndex" next-margin="40rpx" previous-margin="80rpx" circular style="width: 100%;height: 400rpx;" interval="3000" :duration="500" @animationfinish="bindSwiperInstance($event, 'newZone')">
+                <swiper :autoplay="swiperInstances.newZone" @change="changeIndex"  :current="currentIndex" next-margin="40rpx" previous-margin="80rpx" circular style="width: 100%;height: 400rpx;" interval="3000" :duration="500" @animationfinish="bindSwiperInstance($event, 'newZone')">
                   <swiper-item v-for="(item, index) in newZone.indexProducts" :key="index" class="s-item" :class="{'n-actived': currentIndex !== index}">
                     <view class="zx-item" @click="goGoodsCon({id: item.productId})">
                       <image :src="item.productImage" style="width: 192rpx; height: 192rpx; border-radius:10rpx"></image>
@@ -459,7 +459,13 @@ export default {
       shareData: {},
       currentIndex: 0,
       // 轮播组件实例
-      swiperInstances: {}
+      swiperInstances: {
+        productSwiper: true,
+        homestay: true,
+        banner: true,
+        festival: true,
+        newZone: true,
+      }
     }
   },
   onLoad() {
@@ -487,6 +493,9 @@ export default {
       }
     })
   },
+  onShow() {
+    this.pageToShowHandle()
+  },
   onHide() {
     this.pageToHideHandle()
   },
@@ -511,20 +520,27 @@ export default {
     // 页面显示时恢复轮播
     pageToShowHandle() {
       // 恢复所有轮播组件的自动播放
-      Object.values(this.swiperInstances).forEach(swiper => {
-        swiper && swiper.autoplayStart && swiper.autoplayStart()
-      })
+      this.swiperInstances = {
+        productSwiper: true,
+        homestay: true,
+        banner: true,
+        festival: true,
+        newZone: true,
+      }
     },
     // 页面隐藏时暂停轮播
     pageToHideHandle() {
-      // 暂停所有轮播组件的自动播放
-      Object.values(this.swiperInstances).forEach(swiper => {
-        swiper && swiper.autoplayStop && swiper.autoplayStop()
-      })
+      this.swiperInstances = {
+        productSwiper: false,
+        homestay: false,
+        banner: false,
+        festival: false,
+        newZone: false,
+      }
     },
     // 绑定轮播组件实例
     bindSwiperInstance(e, key) {
-      this.swiperInstances[key] = e.detail
+      // this.swiperInstances[key] = e.detail
     },
     changeRecommendKeyword(e) {
       this.keywordIndex = e

From d7864d3a384ec65cad106cbd305b9cbfa161ee9e Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 25 Nov 2025 17:21:57 +0800
Subject: [PATCH 49/78] =?UTF-8?q?Fix=EF=BC=9A4664=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E9=80=89=E6=8B=A9=E5=85=B6=E4=BB=96=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E6=97=A0=E6=B3=95=E7=94=9F=E6=95=88=EF=BC=8C?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BB=A5=E5=90=8E=E5=8F=88=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=94=B9=E5=9B=9E=E9=BB=98=E8=AE=A4=E7=9A=84=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index b5df128..c8abdee 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -251,7 +251,7 @@ export default {
       this.couponIndex = this.couponList['usable']?.findIndex(item => item.id === +value)
       this.couponTitle = this.couponList['usable']?.[this.couponIndex]?.couponTitle
       if(this.isGroupBuy) {
-        await this.computedTravelGroupPrice(true)
+        await this.computedTravelGroupPrice(false)
       } else {
         await this.computedPrice(this.goodsInfo.cartNum, 1)
       }
@@ -333,7 +333,11 @@ export default {
       }
       this.couponId = item.id
       this.couponTitle = item.couponTitle
-      this.computedPrice(this.goodsInfo.cartNum, 1)
+      if(this.isGroupBuy) {
+        this.computedTravelGroupPrice(false)
+      } else {
+        this.computedPrice(this.goodsInfo.cartNum, 1)
+      }
     },
     makeAgain() {
       const params = {

From 5204db106de6ca44ac0bf8a09408524084c1189e Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 25 Nov 2025 17:22:10 +0800
Subject: [PATCH 50/78] =?UTF-8?q?Fix=EF=BC=9A4665=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E3=80=81=E6=97=85=E5=B1=85=E5=9B=A2=E8=B4=AD?=
 =?UTF-8?q?=E9=80=81=E7=A4=BC=EF=BC=9A=E7=82=B9=E5=87=BB=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E5=A4=96=E7=9A=84=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=EF=BC=8C=E6=97=A0=E6=B3=95=E5=B0=86=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=94=B6=E8=B5=B7=EF=BC=88=E6=94=B9=E4=B8=BA=EF=BC=9A=E2=91=A0?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=94=B6=E8=B5=B7=E5=BC=B9=E7=AA=97=EF=BC=8C?=
 =?UTF-8?q?=E2=91=A1=E7=82=B9=E5=A4=96=E9=9D=A2=E6=94=B6=E8=B5=B7=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=96=B0=E9=80=89=E6=8B=A9=E7=9A=84=E5=B0=81=E9=9D=A2=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/CoverPicker.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 4db8ab2..9917436 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -4,6 +4,7 @@
     mode="bottom" 
     round="40rpx" 
     :customStyle="{height: '600rpx'}"
+    @close="close"
     >
     <view class="cover-picker v12-pt-4">
       <swiper

From 9778bfc1ac7592a9943c7334d40917c0b0581ecf Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 25 Nov 2025 17:29:12 +0800
Subject: [PATCH 51/78] =?UTF-8?q?Fix=EF=BC=9A4651=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85=E9=A1=B5=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92=E6=8C=89=E9=92=AE=E5=8C=BA=E5=9F=9F=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                         |  1 +
 pkg_product/views/groupBuyDetails.vue | 16 ++++++++++++++--
 pkg_product/views/submitOrder.vue     | 15 ++++++++++++++-
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/manifest.json b/manifest.json
index 9b381af..b482ced 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,6 +5,7 @@
     "versionName" : "4.0.0",
     "versionCode" : 4,
     "transformPx" : false,
+    "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,
diff --git a/pkg_product/views/groupBuyDetails.vue b/pkg_product/views/groupBuyDetails.vue
index 649bc1d..be00bc1 100644
--- a/pkg_product/views/groupBuyDetails.vue
+++ b/pkg_product/views/groupBuyDetails.vue
@@ -509,7 +509,20 @@ export default {
 .val { color: #666; text-align: right; }
 .gallery-img { width: 100%; margin-bottom: 16rpx; border-radius: 12rpx; overflow: hidden; }
 .bottom-space { height: 140rpx; }
-.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 16rpx 24rpx; }
+.bottom-bar { 
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: #fff;
+  border-top: 1rpx solid #eee;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 20rpx 20rpx 30rpx;
+  height: 140rpx;
+  box-sizing: border-box;
+}
 .total { font-size: 30rpx; color: #111; font-weight: 700; }
 .bar-actions { display: flex; gap: 16rpx; }
 .mini-btn { 
@@ -625,7 +638,6 @@ export default {
 .val { color: #666; text-align: right; }
 .gallery-img { width: 100%; margin-bottom: 16rpx; border-radius: 12rpx; overflow: hidden; }
 .bottom-space { height: 140rpx; }
-.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 26rpx 24rpx; }
 .total { font-size: 30rpx; color: #111; font-weight: 700; }
 .bar-actions { display: flex; gap: 16rpx; }
 .mini-btn { 
diff --git a/pkg_product/views/submitOrder.vue b/pkg_product/views/submitOrder.vue
index 55174b2..be74950 100644
--- a/pkg_product/views/submitOrder.vue
+++ b/pkg_product/views/submitOrder.vue
@@ -434,7 +434,20 @@ export default {
 .text-card .plain-text { font-size: 26rpx; color: #666; line-height: 40rpx; letter-spacing: 2px;}
 
 .bottom-space { height: 140rpx; }
-.bottom-bar { position: fixed; left: 0; right: 0; bottom: 0; background: #fff; border-top: 1rpx solid #eee; display: flex; align-items: center; justify-content: space-between; padding: 26rpx 24rpx; }
+.bottom-bar { 
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: #fff;
+  border-top: 1rpx solid #eee;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 20rpx 20rpx 30rpx;
+  height: 140rpx;
+  box-sizing: border-box;
+}
 .total { font-size: 30rpx; color: #111; font-weight: 700; }
 .total .highlight { color: #C52733; font-weight: 700; }
 .bar-actions { display: flex; gap: 16rpx; }

From 677bf57d05aaabbee7837569c0111d1675fc41cb Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 26 Nov 2025 10:30:56 +0800
Subject: [PATCH 52/78] =?UTF-8?q?Fix=EF=BC=9A4665=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E3=80=81=E6=97=85=E5=B1=85=E5=9B=A2=E8=B4=AD?=
 =?UTF-8?q?=E9=80=81=E7=A4=BC=EF=BC=9A=E7=82=B9=E5=87=BB=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=BC=B9=E7=AA=97=E5=A4=96=E7=9A=84=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=EF=BC=8C=E6=97=A0=E6=B3=95=E5=B0=86=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=94=B6=E8=B5=B7=EF=BC=88=E6=94=B9=E4=B8=BA=EF=BC=9A=E2=91=A0?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=94=B6=E8=B5=B7=E5=BC=B9=E7=AA=97=EF=BC=8C?=
 =?UTF-8?q?=E2=91=A1=E7=82=B9=E5=A4=96=E9=9D=A2=E6=94=B6=E8=B5=B7=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E6=97=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=96=B0=E9=80=89=E6=8B=A9=E7=9A=84=E5=B0=81=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/CoverPicker.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg_user/views/gift/components/CoverPicker.vue b/pkg_user/views/gift/components/CoverPicker.vue
index 9917436..3c5587c 100644
--- a/pkg_user/views/gift/components/CoverPicker.vue
+++ b/pkg_user/views/gift/components/CoverPicker.vue
@@ -79,6 +79,7 @@ export default {
   },
   methods: {
     close() {
+      this.currentIndex = 0
       this.$emit('update:show', false)
     },
     onChange(e) {

From b82dc02177510b762b7198cfad064d176b36b51f Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 26 Nov 2025 10:45:04 +0800
Subject: [PATCH 53/78] =?UTF-8?q?Fix=EF=BC=9A4663=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=90=9C=E7=B4=A2=E5=88=B0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=97=85=E5=B1=85=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/healthSearch.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg_product/views/healthSearch.vue b/pkg_product/views/healthSearch.vue
index 4dcc2e4..8ce5df0 100644
--- a/pkg_product/views/healthSearch.vue
+++ b/pkg_product/views/healthSearch.vue
@@ -45,6 +45,7 @@
 
 <script>
 import { getCategory,getWellnessPlace } from '@/api/health'
+import { getJiaLouList } from '@/api/qianxian'
 export default {
   data() {
     return {
@@ -67,7 +68,7 @@ export default {
         page: 1,
         limit: 9999
       }
-      getWellnessPlace(params).then(res => {
+      getJiaLouList(params).then(res => {
         this.items = res.data.records
       }).finally(() => {
         this.isSearch = true

From a64da0bc21c345cf05d522e5d243d01b9bf07122 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 26 Nov 2025 10:50:28 +0800
Subject: [PATCH 54/78] =?UTF-8?q?Fix=EF=BC=9A=E9=9C=80=E8=A6=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=BA=B7=E5=85=BB=E5=9C=A3=E5=9C=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=94=E8=B7=B3=E8=BD=AC=E9=9C=80=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/healthSanctum.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue
index 9b1f3a5..6687119 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -155,7 +155,16 @@ export default {
       })
     },
     toStore(item) {
-      uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id }) 
+      if(item.dataType === 'wellnessPlace'){
+        this.$yrouter.push({
+          path: '/pagesInn/inn/innHome',
+          query: {
+            id: item.hotelId
+          }
+        })
+      }else{
+        uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id }) 
+      }
     },
   }
 }

From 41a4b19f133a1fc6d248a43e6397c593a81103e8 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 26 Nov 2025 10:51:42 +0800
Subject: [PATCH 55/78] =?UTF-8?q?Fix=EF=BC=9A4666=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E6=88=B7=E6=B2=A1=E6=9C=89=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E6=97=B6=EF=BC=8C=E5=89=8D=E7=AB=AF=E7=9A=84?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E5=8C=BA=E5=9F=9F=E4=BC=9A=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?null=EF=BC=88=E6=B2=A1=E6=9C=89=E9=85=8D=E7=BD=AE=E5=88=99?=
 =?UTF-8?q?=E6=97=A0=E9=9C=80=E6=98=BE=E7=A4=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue
index 6687119..a99ba08 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -62,7 +62,7 @@
             <text class="v12-font-28">{{ item.areaName }}</text>
           </view>
         </view>
-        <view class="v12-font-bold v12-font-28 v12-mt-1 more-t desc-txt">{{ item.intro }}</view>
+        <view v-if="item.intro" class="v12-font-bold v12-font-28 v12-mt-1 more-t desc-txt">{{ item.intro }}</view>
         <view class="v12-justify-start v12-align-center v12-my-1">
           <view class="atr">
             <image class="atr" :src="item.avatar"></image>

From 2df1a79997fcf78aea7a2d7a596bae040d0809a5 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 28 Nov 2025 09:24:12 +0800
Subject: [PATCH 56/78] =?UTF-8?q?Fix=EF=BC=9A4586=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E4=BA=A7=E7=94=9F=E8=AE=A2=E5=8D=95=E5=90=8E=EF=BC=8C=E5=9B=A2?=
 =?UTF-8?q?=E8=B4=AD=E8=A2=AB=E5=88=A0=E9=99=A4=EF=BC=8C=E5=BE=85=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E3=80=81=E5=BE=85=E5=85=A5=E4=BD=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8B=E4=BF=AE=E6=94=B9=E5=85=A5=E4=BD=8F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=EF=BC=8C=E5=BA=94=E5=BC=B9=E7=AA=97=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/sojoumOrderDetails.vue b/pkg_product/views/sojoumOrderDetails.vue
index f41a564..8cbcefa 100644
--- a/pkg_product/views/sojoumOrderDetails.vue
+++ b/pkg_product/views/sojoumOrderDetails.vue
@@ -271,8 +271,8 @@ export default {
           })
           this.getSojoumOrderDetail();
         }
-      }).finally(() => {
         uni.hideLoading();
+      }).finally(() => {
       })
     },
     getMonthDay() {

From 9db2bc3b682012c681201150f9b5692fda35f148 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Sun, 30 Nov 2025 11:44:18 +0800
Subject: [PATCH 57/78] =?UTF-8?q?Fix=EF=BC=9A4663=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=90=9C=E7=B4=A2=E5=88=B0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=97=85=E5=B1=85=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/healthSearch.vue | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkg_product/views/healthSearch.vue b/pkg_product/views/healthSearch.vue
index 8ce5df0..ab92897 100644
--- a/pkg_product/views/healthSearch.vue
+++ b/pkg_product/views/healthSearch.vue
@@ -5,7 +5,7 @@
     </view>
     <view v-if="isSearch" class="search-res-wrap">
       <view class="v12-justify-between sanctup-items v12-mt-3">
-        <view v-for="(item, index) in items" :key="index" class="v12-pa-1" @click="toStore(item.hotelId)">
+        <view v-for="(item, index) in items" :key="index" class="v12-pa-1" @click="toStore(item)">
           <view class="img">
             <image class="img" :src="item.cover" v-if="item.coverType === 1"></image>
             <video 
@@ -25,12 +25,12 @@
               <text class="v12-font-28">{{ item.areaName }}</text>
             </view>
           </view>
-          <view class="v12-font-bold v12-font-28 v12-mt-1 more-t desc-txt">{{ item.content }}</view>
+          <view class="v12-font-bold v12-font-28 v12-mt-1 more-t desc-txt">{{ item.intro }}</view>
           <view class="v12-justify-start v12-align-center v12-my-1">
             <view class="atr">
-              <image class="atr" :src="item.logo"></image>
+              <image class="atr" :src="item.avatar"></image>
             </view>
-            <view class="v12-font-26 v12-ml-2 v12-dark-text one-t">{{ item.hotelName }}</view>
+            <view class="v12-font-26 v12-ml-2 v12-dark-text one-t">{{ item.name }}</view>
           </view>
         </view>
       </view>
@@ -74,13 +74,17 @@ export default {
         this.isSearch = true
       })
     },
-    toStore(id) {
-      this.$yrouter.push({
-        path: '/pagesInn/inn/innHome',
-        query: {
-          id: id
-        }
-      })
+    toStore(item) {
+      if(item.dataType === 'wellnessPlace'){
+        this.$yrouter.push({
+          path: '/pagesInn/inn/innHome',
+          query: {
+            id: item.hotelId
+          }
+        })
+      }else{
+        uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id }) 
+      }
     },
   }
 }

From c877cf245a1d6867b093e36251f582de89fbc6f5 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Sun, 30 Nov 2025 11:52:40 +0800
Subject: [PATCH 58/78] =?UTF-8?q?Fix=EF=BC=9A4666=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E6=88=B7=E6=B2=A1=E6=9C=89=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E6=97=B6=EF=BC=8C=E5=89=8D=E7=AB=AF=E7=9A=84?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E5=8C=BA=E5=9F=9F=E4=BC=9A=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?null=EF=BC=88=E6=B2=A1=E6=9C=89=E9=85=8D=E7=BD=AE=E5=88=99?=
 =?UTF-8?q?=E6=97=A0=E9=9C=80=E6=98=BE=E7=A4=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 132c6f5..7b95033 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -499,7 +499,7 @@
                       </view>
                       <view class="info">
                         <view class="intro more-t">
-                          {{ jiaLou.intro }}
+                          {{ jiaLou.intro || '' }}
                         </view>
                         <view class="name-wrap">
                           <image

From 8ea730c287c9f301b127eb26ffd8e05a1942219b Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Sun, 30 Nov 2025 11:58:23 +0800
Subject: [PATCH 59/78] =?UTF-8?q?Fix=EF=BC=9A4667=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=B9=E7=AA=97?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=82=B9=E5=87=BB=E6=B5=B7=E6=8A=A5?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=E5=90=8E=E4=BC=9A?=
 =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=BC=B9=E7=AA=97=EF=BC=8C=E5=8F=AF=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=99=90=E5=88=B6=E9=A2=86=E5=8F=96=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index 1b599d2..b4e374f 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -335,6 +335,7 @@
     <!-- v9 老用户弹窗 -->
 
     <u-popup
+      v-if="isOldUserPopupShow"
       mode="center"
       bgColor="transparent"
       :show="isOldUser && oldUserPopup.image && lotteryCanDraw"
@@ -417,6 +418,7 @@ export default {
   mixins: [pageListenMixins, goCartMixin, GuideMixins],
   data() {
     return {
+      isOldUserPopupShow: 0,
       webUrl: this.$VUE_APP_RESOURCES_URL,
       // 状态栏高度
       statusBarHeight: 20,
@@ -1427,6 +1429,7 @@ export default {
           _this.$set(_this, 'contentHomestay', data.contentHomestayV2 || [])
           _this.$set(_this, 'contentFestival', data.contentFestivalV2 || [])
           _this.$set(_this, 'newZone', data.newGoods || [])
+          _this.$set(_this, 'isOldUserPopupShow', data.isOldUserPopupShow || 0)
           _this.indexVideo = data.indexVideo ? data.indexVideo.videoUrl : ''
           _this.bastLeftList = []
           _this.bastRightList = []

From 7f9b228f64479ac3b57b167d9f2db8d74d80de74 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Sun, 30 Nov 2025 12:00:05 +0800
Subject: [PATCH 60/78] =?UTF-8?q?Fix=EF=BC=9A4672=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E9=80=81=E7=A4=BC=EF=BC=9A=E5=B7=B2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=8C=E4=BD=86=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E4=BB=98=E6=AC=BE=E6=97=B6=E5=B9=B6=E6=9C=AA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/gift.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index c8abdee..1b2858b 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -474,6 +474,7 @@ export default {
           message : this.message || '礼笺轻启，礼藏心意',
           canTransfer: this.canTransfer ? 1 : 0,
           passwordPay: this.payPassword || '',
+          couponId: this.couponId,
           payType: this.payType,
         } : {
           orderKey: this.orderKey,

From ef3cd4a6104e294cd526085021c79985122bf257 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Sun, 30 Nov 2025 12:09:39 +0800
Subject: [PATCH 61/78] =?UTF-8?q?Fix=EF=BC=9A4671=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=80=BB=E9=95=BF=E5=BA=A6=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=B6=EF=BC=8C=E5=9C=A8=E4=B8=8D=E5=88=92?=
 =?UTF-8?q?=E5=8A=A8=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E6=9C=80?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=96=87=E6=9C=AC=E4=B9=9F=E4=BC=9A=E8=A2=AB?=
 =?UTF-8?q?=E9=A1=B6=E5=87=BA=E9=A1=B5=E9=9D=A2=EF=BC=88=E6=9C=BA=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=9A=E8=8B=B9=E6=9E=9C12=EF=BC=8C=E5=9C=A8=E4=B8=8D?=
 =?UTF-8?q?=E5=88=92=E5=8A=A8=E5=88=86=E7=B1=BB=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E6=9C=80=E5=B7=A6=E4=BE=A7=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=94=E9=A1=B6=E6=A0=BC=E6=98=BE=E7=A4=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/newZone.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/home/newZone.vue b/pages/home/newZone.vue
index 0ca0d56..2b6b924 100644
--- a/pages/home/newZone.vue
+++ b/pages/home/newZone.vue
@@ -140,7 +140,7 @@ export default{
 }
 .tabs-wrap{
   overflow: auto;
-  justify-content: space-around;
+  justify-content: justify-between;
 }
 .tab-item{
   margin-right: 20rpx;

From d69c41e1935678f8f385239d4d77f8b1a2798675 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Sun, 30 Nov 2025 12:19:54 +0800
Subject: [PATCH 62/78] =?UTF-8?q?Fix=EF=BC=9A4678=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90=E8=AF=A6=E6=83=85=E5=9B=BE=E7=89=87=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=9F=A5=E7=9C=8B=E5=A4=A7=E5=9B=BE=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/groupBuyDetails.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkg_product/views/groupBuyDetails.vue b/pkg_product/views/groupBuyDetails.vue
index be00bc1..306c28a 100644
--- a/pkg_product/views/groupBuyDetails.vue
+++ b/pkg_product/views/groupBuyDetails.vue
@@ -102,6 +102,7 @@
                 duration="10000">
                 <swiper-item v-for="(img, idx) in c.images" :key="idx">
                   <image
+                    @click="previewHero(c.images, img)"
                     :src="img" 
                     class="swiper-img" 
                     mode="aspectFill" />
@@ -151,7 +152,7 @@
       <!-- 图片 -->
       <view class="v12-mt-3 v12-px-3">
         <view v-for="(img, idx) in detail.detailImages" :key="idx" >
-          <image :src="img" class="v12-radius-40" style="width: 100%;" mode="aspectFill" />
+          <image :src="img" class="v12-radius-40" style="width: 100%;" mode="aspectFill" @click="previewHero(detail.detailImages, img)" />
         </view>
       </view>
       <view class="bottom-space"></view>
@@ -238,6 +239,11 @@ export default {
     })
   },
   methods: {
+    previewHero(urls, current) {
+      console.log(urls);
+      
+      uni.previewImage({ urls, current })
+    },
     toGift(){
       uni.navigateTo({
         // + '&couponId=' + coupId
@@ -732,4 +738,4 @@ export default {
     background: #CE4852;
   }
 }
-</style>
\ No newline at end of file
+</style>

From 161e53cc158ed7f62a02e012bc3f9952d4e83526 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 1 Dec 2025 09:21:48 +0800
Subject: [PATCH 63/78] =?UTF-8?q?Fix=EF=BC=9A4663=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=90=9C=E7=B4=A2=E5=88=B0=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E6=97=85=E5=B1=85=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/healthSearch.vue b/pkg_product/views/healthSearch.vue
index ab92897..e330e45 100644
--- a/pkg_product/views/healthSearch.vue
+++ b/pkg_product/views/healthSearch.vue
@@ -64,7 +64,7 @@ export default {
       const params = {
         goodCityId: this.goodCityId,
         categoryId: '',
-        keyword: this.keyword,
+        name: this.keyword.trim(),
         page: 1,
         limit: 9999
       }

From 41b33e3819066acc01f2d0f7a0d2496074145291 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 2 Dec 2025 09:28:46 +0800
Subject: [PATCH 64/78] =?UTF-8?q?Fix=EF=BC=9A4356=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=97=85=E5=B1=85=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=A7=86=E9=A2=91=E5=A4=A7=E5=B0=8F=E8=B6=85=E8=BF=87?=
 =?UTF-8?q?500M=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E9=9C=80?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E2=80=9C=E8=A7=86=E9=A2=91=E5=A4=A7?=
 =?UTF-8?q?=E5=B0=8F=E4=B8=8D=E8=B6=85=E8=BF=87500MB=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/index.js b/utils/index.js
index 86debbe..093911b 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -1214,18 +1214,18 @@ export function uploadVideo(videoPath, callback) {
         name: "file",
         success: res => {
             if (callback) {
+                uni.hideLoading()
                 callback(JSON.parse(res.data).link)
             }
         },
         fail: err => {
             uni.showToast({
-                title: "上传视频失败" + err,
+                title: "视频大小不能超过500MB",
                 icon: "none",
                 duration: 2000
             });
         },
         complete: res => {
-            uni.hideLoading()
         }
     });
 }

From 970bfef484001e0cdaeb9568a904052c3b609ed7 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Thu, 4 Dec 2025 18:26:08 +0800
Subject: [PATCH 65/78] =?UTF-8?q?Fix=EF=BC=9A4706=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E7=AE=A1?=
 =?UTF-8?q?=E5=AE=B6=E6=A0=87=E7=AD=BE=E5=86=85=E5=AE=B9=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=AE=BD=E5=BA=A6=E6=97=B6=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E7=AE=A1=E5=AE=B6=E6=A0=87=E7=AD=BE=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/housekeeperDetail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_product/views/housekeeperDetail.vue b/pkg_product/views/housekeeperDetail.vue
index 4bf7e99..144e2fa 100644
--- a/pkg_product/views/housekeeperDetail.vue
+++ b/pkg_product/views/housekeeperDetail.vue
@@ -42,8 +42,8 @@
             {{ record.intro }}
           </view>
         </view>
-        <view class="v12-mt-3 v12-align-center">
-          <view v-for="tag in record.tags" :key="tag" class="v12-primary-text v12-primary-border v12-radius-100 tag-item v12-mr-2">{{ tag }}</view>
+        <view class="v12-mt-3 v12-align-center" style="flex-wrap: wrap;">
+          <view v-for="tag in record.tags" :key="tag" class="v12-primary-text v12-primary-border v12-radius-100 tag-item v12-mr-2 v12-mb-2">{{ tag }}</view>
         </view>
         <view class="v12-mt-2 v12-font-24" style="color: #666">
           {{ record.desc }}

From 88f3223e41fa5214eadf71ce33e0a464b5ee9c49 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Thu, 4 Dec 2025 18:35:46 +0800
Subject: [PATCH 66/78] =?UTF-8?q?Fix=EF=BC=9A4705=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1=E5=88=97=E8=A1=A8=E4=B8=AD=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E3=80=81=E5=9B=A2=E8=B4=AD=E5=B0=81=E9=9D=A2=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA=E5=B0=BA=E5=AF=B8=E4=B8=8D=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/giftList.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index cc20d98..12aff5b 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -33,7 +33,6 @@
                   <image
                     :src="cart.productInfo.image"
                     class="img"
-                    mode="widthFix"
                   />
                 </view>
                 <view class="gift-good-info">
@@ -56,7 +55,6 @@
                   <image
                     :src="item.giftInfoTravelGroup.travelGroupProductInfo.mainImage"
                     class="img"
-                    mode="widthFix"
                   />
                 </view>
                 <view class="gift-good-info">
@@ -147,7 +145,6 @@
                   <image
                     :src="cart.productInfo.image"
                     class="img"
-                    mode="widthFix"
                   />
                 </view>
                 <view class="gift-good-info">
@@ -178,7 +175,6 @@
                   <image
                     :src="item.travelGroupProductInfo.mainImage"
                     class="img"
-                    mode="widthFix"
                   />
                 </view>
                 <view class="gift-good-info">

From 9720c5d1f0b83de5e0b56ae340486f5eefe47a38 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Thu, 4 Dec 2025 18:38:55 +0800
Subject: [PATCH 67/78] =?UTF-8?q?Fix=EF=BC=9A4703=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=BD=AE=E6=92=AD=E5=95=86=E5=93=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8D=E9=9C=80=E8=A6=81=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E9=93=BE=E6=8E=A5=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=90=8E=E7=9B=B4=E6=8E=A5=E8=BF=9B=E5=85=A5=E7=94=84=E9=80=89?=
 =?UTF-8?q?=E5=A5=BD=E7=A4=BC=E6=9D=BF=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/home/index.vue b/pages/home/index.vue
index b4e374f..6f70caf 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -191,7 +191,7 @@
             <view class="swiper-wrap-zx v12-mt-2">
                 <swiper :autoplay="swiperInstances.newZone" @change="changeIndex"  :current="currentIndex" next-margin="40rpx" previous-margin="80rpx" circular style="width: 100%;height: 400rpx;" interval="3000" :duration="500" @animationfinish="bindSwiperInstance($event, 'newZone')">
                   <swiper-item v-for="(item, index) in newZone.indexProducts" :key="index" class="s-item" :class="{'n-actived': currentIndex !== index}">
-                    <view class="zx-item" @click="goGoodsCon({id: item.productId})">
+                    <view class="zx-item" @click="toNewZone">
                       <image :src="item.productImage" style="width: 192rpx; height: 192rpx; border-radius:10rpx"></image>
                       <view class="v12-pa-2">
                         <view class="v12-font-28 more-t v12-font-bold" style="text-align: center;">{{ item.productName }}</view>

From 702d7c1891ef0aad2e5abcb7b7970599fa6ac490 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Thu, 4 Dec 2025 18:42:06 +0800
Subject: [PATCH 68/78] =?UTF-8?q?Fix=EF=BC=9A4702=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E7=A4=BC=E5=93=81=E5=8D=A1-=E9=80=81?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E7=A4=BC=E5=8C=85=E5=88=97=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E7=A4=BC=E5=8C=85=E7=9A=84=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=AE=9E=E4=BB=98=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 12aff5b..a7de037 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -63,7 +63,7 @@
                   </view>
                   <view class="price-wrap">
                     <view class="price">
-                      <text class="prefix">￥</text>{{ item.giftInfoTravelGroup.travelGroupProductInfo.price }}
+                      <text class="prefix">￥</text>{{ item.payPrice }}
                     </view>
                     <view class="num">已领取{{item.giftInfoTravelGroup.receiveNum}}/{{ item.giftInfoTravelGroup.totalNum }}</view>
                   </view>

From 7afcf039b6d361454777e60e5c68c48333c88b2d Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Thu, 4 Dec 2025 18:52:41 +0800
Subject: [PATCH 69/78] =?UTF-8?q?Fix=EF=BC=9A4696=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E7=A4=BC=E5=8C=85=E9=A2=86=E5=8F=96=E9=A1=B5=E9=9D=A2=EF=BC=9A?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=9B=BE=E5=B0=BA=E5=AF=B8=E5=81=8F=E5=B0=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=8D=E7=BD=AE=E5=81=8F=E4=B8=8B=EF=BC=8C=E4=B8=8E?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/GiftCard.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 3038f77..539b042 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -328,8 +328,8 @@ export default {
   align-content: center;
 }
 .bg-image{
-  width: 340rpx;
-  height: 560rpx;
+  width: 420rpx;
+  /* height: 560rpx; */
   position: absolute;
   border-radius: 16rpx;
   top: 0;
@@ -360,8 +360,8 @@ export default {
   height: 296rpx;
 }
 .image-wrap{
-  width: 218rpx;
-  height: 218rpx;
+  width: 320rpx;
+  height: 320rpx;
   /*border: 10rpx solid #FDF0D3;*/
   border-radius: 16rpx;
   position: absolute;
@@ -371,8 +371,9 @@ export default {
   margin: auto;
 }
 .pro-image{
-  width: 218rpx;
-  height: 218rpx;
+  width: 320rpx;
+  height: 320rpx;
+  border-radius: 16rpx;
   /* border-radius: 30rpx; */
 }
 .auto-text-color {

From 949d33614a5ccb5b40f1abef50ebcf2849531c49 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 5 Dec 2025 11:57:41 +0800
Subject: [PATCH 70/78] =?UTF-8?q?Fix=EF=BC=9A4700=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=8D=83=E5=8E=BF=E6=97=85=E5=B1=85=E7=B1=BB=E7=9B=AE=EF=BC=9A?=
 =?UTF-8?q?=E5=9C=A8=E8=BF=90=E8=90=A5=E7=AE=A1=E7=90=86-=E5=8D=83?=
 =?UTF-8?q?=E5=8E=BF=E5=90=8D=E5=93=81=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E6=97=85=E5=B1=85=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9C=A8=E5=89=8D=E7=AB=AF=E6=9C=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=88=E7=9B=AE=E5=89=8D=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BA=86=E6=97=85=E5=B1=85=E5=95=86=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E6=97=85=E5=B1=85=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/qianxian.js                          |    6 +-
 pages.json                               |    7 +
 pkg_product/views/famousQianxianShop.vue |    6 +-
 pkg_product/views/oldSojumStore.vue      | 1103 ++++++++++++++++++++++
 pkg_product/views/sojoumStore.vue        |    2 +-
 5 files changed, 1119 insertions(+), 5 deletions(-)
 create mode 100644 pkg_product/views/oldSojumStore.vue

diff --git a/api/qianxian.js b/api/qianxian.js
index fd97dc6..e981a3a 100644
--- a/api/qianxian.js
+++ b/api/qianxian.js
@@ -110,9 +110,9 @@ export function getSaleList(params) {
 // }
 
 // 旅居详情
-// export function getJiaLouDetail(id) {
-//     return request.get('/countyFamous/sojourn/' + id, {}, {login: true})  
-// }
+export function getJiaLouDetail1(id) {
+    return request.get('/countyFamous/sojourn/' + id, {}, {login: true})  
+}
 
 // 旅居资讯数据
 export function getJiaLouNews(params) {
diff --git a/pages.json b/pages.json
index b786610..b9c2321 100644
--- a/pages.json
+++ b/pages.json
@@ -633,6 +633,13 @@
             "navigationStyle": "custom"
           }
         },
+        {
+          "path": "views/oldSojumStore",
+          "style": {
+            "navigationBarTitleText": "",
+            "navigationStyle": "custom"
+          }
+        },
         {
           "path": "views/housekeeperDetail",
           "style": {
diff --git a/pkg_product/views/famousQianxianShop.vue b/pkg_product/views/famousQianxianShop.vue
index 7b95033..1c88bd1 100644
--- a/pkg_product/views/famousQianxianShop.vue
+++ b/pkg_product/views/famousQianxianShop.vue
@@ -1446,7 +1446,11 @@ export default {
       uni.navigateTo({ url: `/pkg_product/views/famousQianxianTheme?id=${item.id}` })
     },
     sujoumeClickHandle(item) {
-      uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id }) 
+      if(item.dataType === 'countyFamousSojourn') {
+        uni.navigateTo({ url: '/pkg_product/views/oldSojumStore?id=' + item.id })
+        return
+      }
+      uni.navigateTo({ url: '/pkg_product/views/sojoumStore?id=' + item.id })  
     },
     industryTabItemClick(index) {
       if (index === this.industryTabIndex) return
diff --git a/pkg_product/views/oldSojumStore.vue b/pkg_product/views/oldSojumStore.vue
new file mode 100644
index 0000000..2f54720
--- /dev/null
+++ b/pkg_product/views/oldSojumStore.vue
@@ -0,0 +1,1103 @@
+<template>
+  <view class="container">
+    <hx-navbar
+      :fixed="true"
+      :background-color="[0,[0,0,0,0],[0,0,0,0]]"
+      :pageScroll.sync="scrollData"
+      statusBarFontColor="#ffffff"
+      barPlaceholder="hidden"
+      transparent="auto"
+      color='#ffffff'
+    />
+    <view>
+      <view class="cover-box">
+        <image
+          v-if="store.coverType === 1"
+          :src="store.cover"
+          class="full-img"
+          mode="widthFix"
+        />
+        <view
+          v-if="store.coverType === 2"
+          :style="{
+            'width': videoStyle.width,
+            'height': videoStyle.height
+          }"
+          class="video-box"
+        >
+          <video
+            :src="store.cover"
+            :autoplay="true"
+            :controls="true"
+            :loop="false"
+            object-fit="contain"
+            play-btn-position="center"
+            id="coverVideo"
+            class="video"
+            @play="coverPlay"
+          />
+        </view>
+      </view>
+      <view class="innInfoWrap">
+        <view class="bg-color">
+          <view class="box-mask flex jc-between ai-end">
+            <view class="inn-name flex-0 more-t">{{ store.name }}</view>
+            <view
+              v-if="store.cityName != undefined && store.cityName.length > 0"
+              class="city-section flex jc-end ai-center"
+            >
+              <image
+                :src="webUrl + '/20210807215539157727.png'"
+                style="width: 22rpx;height: 22rpx;margin-right: 8rpx;"
+              />
+              <text class="one-t" style="font-size: 24rpx;color: #fff;">{{ store.cityName }}</text>
+            </view>
+          </view>
+        </view>
+        <view class="body-cont  flex ai-end">
+          <view class="inn-logo flex-0">
+            <image :src="store.logo" v-if="store.logo"></image>
+            <image :src="webUrl + '/20230609145651814148.png'" v-else/>
+          </view>
+          <view class="a3 flex jc-between ai-end" style="width: 100%">
+            <view class="">
+              <view class="inn-owner" style="flex-grow: 1;">{{ store.ownerName }}/店主</view>
+              <view class="guarantee flex jc-center ai-center v12-font-24">
+                {{ store.serviceTime }} - {{ store.serviceEndTime }} / 营业时间
+              </view>
+            </view>
+            <view class="flex ai-center zan-favorite-wrap">
+              <view class="zan-box flex flex-0 ai-end" @click="zanStore">
+                <template v-if="store.hasZan">
+                  <image :src="webUrl + '/icon/icon-like.png'" class="img" />
+                  <text class="on">{{ store.zan }}</text>
+                </template>
+                <template v-else>
+                  <image :src="webUrl + '/icon/like.png'" class="img" />
+                  <text>{{ store.zan }}</text>
+                </template>
+              </view>
+              <!-- <view class="flex flex-0 ai-end favorite-box">
+                <image
+                  v-if="store.hasFavorite"
+                  :src="webUrl + '/icon/icon-star-on.png'"
+                  mode="scaleToFill"
+                  class="icon"
+                  @click="doneFavorite(store.hasFavorite)"
+                />
+                <image
+                  v-else
+                  :src="webUrl + '/icon/icon-star-off.png'"
+                  mode="scaleToFill"
+                  class="icon"
+                  @click="doneFavorite(store.hasFavorite)"
+                />
+                <text>{{ store.favoriteCount  }}</text>
+              </view> -->
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="inn-signature-wrap">
+        <view class="triangle"></view>
+        <view class="inn-signature">
+          {{ store.shopIntro }}
+        </view>
+        <view class="share-btn" @click="changeShare">
+          <image :src="webUrl + '/page/hotel/share.png'" class="img" />
+        </view>
+      </view>
+      <view v-if="store.name" class="map-wrapper">
+        <view class="map-cont">
+          <map
+            :longitude="store.longitude"
+            :latitude="store.latitude"
+            style="width: 750rpx;height: 300rpx;"
+          />
+        </view>
+        <view class="bg"></view>
+        <view class="map-info">
+          <view class="map-info-hd">
+            <image :src="webUrl + '/page/qianxian/icon-location.png'" class="icon" />
+          </view>
+          <view class="map-info-bd more-t">
+            {{ store.address }}
+          </view>
+          <view class="map-info-ft flex">
+            <view class="item" @click="showLocation">
+              <image :src="webUrl + '/page/qianxian/icon-addr.png'" class="img" />
+              <view>导航</view>
+            </view>
+            <view class="item" @click="call">
+              <image :src="webUrl + '/page/qianxian/icon-phone.png'" class="img" />
+              <view>客服</view>
+            </view>
+          </view>
+        </view>
+      </view>
+      <view class="top-tab acea-row row-middle row-center">
+        <view
+          v-for="(item, index) in tabList"
+          :key="index"
+          :class="item.isShow ? '' : 'hide'"
+          class="tab"
+          @click="changeTab(item.value)"
+        >
+          <view :class="activeIndex === index ? 'active' : ''" class="tab-item">
+            {{ item.text }}
+          </view>
+          <!-- <view v-show="activeIndex === index" class="btLine"></view> -->
+        </view>
+      </view>
+      <view>
+        <view
+          v-if="activeIndex === 0"
+          class="info-section"
+        >
+          <view v-if="isLoadInfoListSuccess">
+            <view v-if="infoArray.length > 0" class="info-wrapper">
+              <view class="info-list">
+                <view
+                  v-for="(item, index) in infoArray"
+                  :key="index"
+                  class="info-item"
+                >
+                  <view
+                    :class="item.isTop === 1 ? 'info-item-top' : ''"
+                    :style="{
+                      'background-image': item.isTop ? ('url(' + webUrl + '/page/hotel/info-top-bg.png)') : 'none'
+                    }"
+                    class="info-item-header"
+                    @click="infoClick(item)"
+                  >
+                    <view class="name">
+                      {{ item.title }}
+                    </view>
+                    <view class="intro">
+                      {{ item.content }}
+                    </view>
+                  </view>
+                  <view class="info-item-body">
+                    <view v-if="item.type === 2" class="video">
+                      <view @click="infoItemViewClick(item, index)"  v-if="activeVideo !== 'video-item' + index" class="play-icon">
+                        <u-icon name="play-right-fill" color="#fff" size="48"></u-icon>
+                      </view>
+                      <image
+                        v-if="activeVideo !== 'video-item' + index"
+                        :src="item.video + '?vframe/jpg/offset/1'"
+                        :poster="item.video + '?vframe/jpg/offset/1'"
+                        controls
+                        play-btn-position="center"
+                        :show-fullscreen-btn="false"
+                        :id="'video-item' + index"
+                        class="video-item"
+                        @click="infoItemViewClick(item, index)"
+                      />
+                      <video
+                        v-else
+                        :src="item.video"
+                        controls
+                        autoplay
+                        play-btn-position="center"
+                        :show-fullscreen-btn="false"
+                        class="video-item"
+                        :id="'video-item' + index"
+                        @click="infoItemViewClick(item, index)"
+                      >
+
+                      </video>
+                    </view>
+                    <view v-else>
+                      <img-box
+                        :imgList="item.images"
+                        :num="item.images.length"
+                        :img-radius="10"
+                        style="width: 100%;"
+                        @click="infoItemViewClick(item, index)"
+                      />
+                    </view>
+                  </view>
+                  <view class="info-item-bottom">
+                    <view class="time">
+                      {{ item.createTime ? item.createTime.replace(/-/g, '.').substr(0, 10) : '' }}
+                    </view>
+                    <view class="btns">
+                      <view class="flex">
+                        <image
+                          :src="webUrl + '/20230803152147141807.png'"
+                          class="icon"
+                        />
+                        <text class="seeNum-txt">{{ item.pv }}</text>
+                      </view>
+                      <view class="flex">
+                        <image
+                          v-if="!item.hasZan"
+                          :src="webUrl + '/page/hotel/zan-off-2.png'"
+                          class="zan-off-icon"
+                          @click="likeInfoItemHandle(item)"
+                        />
+                        <image
+                          v-else
+                          :src="webUrl + '/page/hotel/zan-on-2.png'"
+                          class="zan-on-icon"
+                          @click="likeInfoItemHandle(item)"
+                        />
+                        <text
+                          v-show="item.zan > 0"
+                          :class="item.zanVo ? 'on' : ''"
+                          class="seeNum-txt"
+                        >{{ item.zan }}</text>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+              </view>
+            </view>
+            <view v-else class="tab-no-data">
+              店主还没有上传内容哦~
+            </view>
+          </view>
+          <goo-skeleton v-else />
+        </view>
+        <view
+          v-if="activeIndex === 1"
+          class="pics-section"
+        >
+          <view
+            v-if="store.cultureImages && store.cultureImages.length > 0"
+            class="pics-list acea-row"
+          >
+            <view
+              v-for="(url, index) in store.cultureImages || []"
+              :key="index"
+              :style="{ width: picColumnWidth }"
+              class="pics-item"
+              @click="showPic(index)"
+            >
+              <image
+                :style="{
+                  width: picColumnWidth,
+                  height: picColumnWidth,
+                  borderRadius: '20rpx'
+                }"
+                :src="url"
+              />
+            </view>
+          </view>
+          <view v-else class="tab-no-data">
+            店主还没有上传内容哦~
+          </view>
+        </view>
+        <view
+          v-if="activeIndex === 2"
+          class="qualifications-section"
+        >
+          <view v-if="store.qualifications && store.qualifications.length > 0">
+            <image
+              v-for="(item, index) in store.qualifications || []"
+              :key="index"
+              :src="item"
+              class="store-img"
+              mode="widthFix"
+            />
+          </view>
+          <view v-else class="tab-no-data">
+            店主还没有上传内容哦~
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- 分享 -->
+    <u-popup
+      :show="showShare"
+      mode="center"
+      bgColor="transparent"
+    >
+      <view class="box-share">
+        <view class="box-img">
+          <image
+            :src="webUrl + '/20230608112219219303.png'"
+            class="icon"
+            @click="closeShare"
+          />
+          <image :src="posterUrl" class="main-img" mode="widthFix" />
+        </view>
+        <image
+          :src="webUrl + '/20230608112210135038.png'"
+          mode="widthFix"
+          class="btn"
+          @click="saveImg"
+        />
+      </view>
+    </u-popup>
+  </view>
+</template>
+
+<script>
+import { 
+  getJiaLouDetail1,
+  getJiaLouNews,
+  postJiaLouNewsView,
+  postJiaLouNewsZan,
+  postJiaLouZan,
+  postJiaLouShare
+} from '@/api/qianxian'
+import imgBox from '@/components/imageTypeSet/imagebox.vue'
+export default {
+  components: {
+    imgBox
+  },
+  data() {
+    return {
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      videoStyle: {
+        width: '750rpx',
+        height: '500rpx'
+      },
+      scrollData: {},
+      id: '',
+      store: {},
+      tabList: [
+        { text: '资讯', value: 0, isShow: true },
+        { text: '文化', value: 1, isShow: true },
+        { text: '资质', value: 2, isShow: true }
+      ],
+      activeIndex: 0,
+      isLoadInfoListSuccess: false,
+      picColumnWidth: '345rpx',
+      infoArray: [],
+      videoPlayers: [],
+      activeVideo: 'coverVideo',
+      showShare: false,
+      posterUrl: ''
+    }
+  },
+  onPageScroll(e) {
+    this.scrollData = e
+  },
+  onLoad(opts) {
+    this.id = opts.id
+    this.getFarmerData()
+  },
+  methods: {
+    saveImg() {
+      const _this = this
+      uni.getSetting({
+        success: getRes => {
+          if (getRes.authSetting["scope.writePhotosAlbum"]) {
+            _this.downloadImage()
+          } else {
+            uni.authorize({
+              scope: "scope.writePhotosAlbum",
+              success: () => {
+                _this.downloadImage()
+              },
+              fail: () => {
+                uni.openSetting({
+                  success: openRes => {
+                    console.log(typeof openRes, openRes)
+                  },
+                  fail: () => {
+                    uni.showToast({
+                      title: "请在设置中打开对应权限",
+                      icon: "none"
+                    })
+                  }
+                })
+              }
+            })
+          }
+        },
+        fail: (err) => {
+          console.log(err, 2)
+        }
+      })
+    },
+    downloadImage() {
+      const _this = this
+      const randomID = () => Math.random().toString(36).substring(2)
+      uni.downloadFile({
+        url: this.posterUrl, // 网络图片的地址
+        filePath: wx.env.USER_DATA_PATH + "/share_" + randomID() + ".png",  // 指定的本地文件路径
+        success: downRes => {
+          uni.saveImageToPhotosAlbum({
+            filePath: downRes.filePath, // 临时文件地址
+            success: function () {
+              uni.showToast({
+                title: "保存成功",
+                icon: "success",
+                success() {
+                  _this.showShare = false
+                }
+              })
+            },
+            fail: function (err) {
+              uni.showToast({
+                title: err,
+                icon: "none"
+              })
+            }
+          })
+        },
+        fail: function (err) {
+          uni.showToast({
+            title: err.errMsg,
+            icon: "error"
+          })
+        }
+      })
+    },
+    changeShare() {
+      uni.showLoading()
+      postJiaLouShare(this.id).then(res => {
+        this.posterUrl = res.data
+        this.showShare = !this.showShare
+      }).finally(() => {
+        uni.hideLoading()
+      })
+    },
+    closeShare() {
+      this.showShare = false
+    },
+    goGoodsConByID(item) {
+      this.$yrouter.push({
+        path: '/pages/shop/GoodsCon/index',
+        query: {
+          id: item.productId
+        }
+      })
+    },
+    getNews() {
+      const params = {
+        page: 1,
+        limit: 9999,
+        sojournId: this.id
+      }
+      getJiaLouNews(params).then(res => {
+        this.infoArray = res.data.records || []
+        this.isLoadInfoListSuccess = true
+      })
+    },
+    changeTab(index) {
+      this.activeIndex = index
+      if(index === 0) {
+       this.getNews()
+      } else {
+        this.isLoadInfoListSuccess = false
+      }
+      // this.loading = false
+      // // 刷新数据
+      // switch (this.activeIndex) {
+      //   case 1:
+      //     this.fetchInnInfoList()
+      //     break
+      //   case 0:
+      //     this.fetchGoods()
+      //     break
+      //   default:
+      //     break
+      // }
+    },
+    showLocation() {
+      if (!this.store.latitude || !this.store.longitude) {
+        this.$dialog.error('暂无位置信息')
+      } else {
+        uni.openLocation({
+          latitude: this.store.latitude,
+          longitude: this.store.longitude
+        })
+      }
+    },
+    likeInfoItemHandle(item) {
+      const params = {
+        countyFamousNewsId: item.id
+      }
+      postJiaLouNewsZan(params).then(res => {
+        const {success} = res
+        if(success) {
+          this.getNews()
+        }
+      })
+    },
+    coverPlay(){
+      this.activeVideo = 'coverVideo'
+      this.videoPlayers.forEach(player => {
+        const playerCtx = uni.createVideoContext(player, this)
+        playerCtx.pause()
+      })
+    },
+    infoItemViewClick(item, index) {
+      const playerId = 'video-item' + index
+      console.log(playerId);
+      if(item.type === 2) {
+        const coverCtx = uni.createVideoContext('coverVideo', this)
+        coverCtx.pause()
+        this.activeVideo = 'video-item' + index
+        if(this.videoPlayers.includes(playerId)) {
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        } {
+          this.videoPlayers.push(playerId)
+          this.videoPlayers.forEach(player => {
+            if(player === playerId) return
+            const playerCtx = uni.createVideoContext(player, this)
+            playerCtx.pause()
+          })
+        }
+      } else {
+        this.videoPlayers.push(playerId)
+      }
+      if(this.videoPlayers.filter(id => id === playerId).length > 1) return
+      const params = {
+        countyFamousNewsId: item.id
+      }
+      postJiaLouNewsView(params).then(res => {
+        const {success} = res
+        if(success) {
+          this.getNews()
+        }
+      })
+    },
+    call() {
+      if (this.store.tel != undefined && this.store.tel.length > 0) {
+        uni.makePhoneCall({
+          // 手机号
+          phoneNumber: this.store.tel,
+          // 成功回调
+          success: (res) => {
+            console.log('调用成功!')
+          },
+          // 失败回调
+          fail: (res) => {
+            console.log('调用失败!')
+          }
+        })
+      } else {
+        this.$dialog.error('电话为空')
+      }
+    },
+    getFarmerData() {
+      getJiaLouDetail1(this.id).then(res => {
+        this.store = res.data || {}
+        this.getNews()
+      })
+    },
+    zanStore() {
+      const params = {
+        sojournId: this.id
+      }
+      postJiaLouZan(params).then(res => {
+        const {success} = res
+        if(success) {
+          this.getFarmerData()
+        }
+      })
+    },
+    doneFavorite(has) {
+      const api = !has ? setFarmerShopCollection : removeFarmerShopCollection
+      const params = {
+        farmerShopId: this.id
+      }
+      api(params).then(res => {
+        this.getFarmerData()
+      })
+    },
+    showPic (index) {
+      uni.previewImage({
+        current: index,
+        urls: this.store.cultureImages
+      })
+    },
+  }
+}
+</script>
+
+<style lang="less" scoped>
+@import "@/assets/css/store.less";
+.btn {
+  .img {
+    display: block;
+    width: 48rpx;
+    height: 48rpx;
+  }
+}
+.container{
+  background: #fff;
+}
+.store-img {
+  width: 686rpx;
+  margin-bottom: 20rpx;
+  vertical-align: middle;
+}
+.tab-no-data {
+  text-align: center;
+  font-size: 32rpx;
+  color: #999;
+  line-height: 200rpx;
+}
+.btLine {
+  width: 100%;
+  height: 6rpx;
+  margin-top: 18rpx;
+  background: #0DC5C5;
+}
+.pics-box {
+  margin: 36rpx;
+  background: #fff;
+}
+.pics-list {
+  position: relative;
+  padding: 20rpx 0;
+  flex-wrap: wrap;
+}
+.pics-list .pics-item {
+  margin-left: 20rpx;
+  margin-top: 10rpx;
+}
+.info-section,
+.pics-section,
+.qualifications-section {
+  position: relative;
+  background-color: #f6f6f6;
+}
+.info-section,
+.qualifications-section {
+  padding: 32rpx;
+}
+.info-section {
+  word-break: break-all;
+  .info-item + .info-item {
+    margin: 32rpx 0 0 0;
+  }
+  .info-item {
+    border-radius: 10rpx;
+    background-color: #fff;
+    .info-item-header {
+      position: relative;
+      padding: 20rpx 20rpx 0 20rpx;
+      &.info-item-top {
+        padding-top: 60rpx;
+        background-size: 100% 80rpx;
+        background-repeat: no-repeat;
+        background-image: url();
+      }
+      .name {
+        font-size: 16px;
+        color: #333;
+        font-weight: bold;
+      }
+      .intro {
+        margin: 10rpx 0 0 0;
+        color: #666;
+        font-size: 14px;
+      }
+    }
+    .info-item-body {
+      padding: 0 20rpx 20rpx 20rpx;
+      .video {
+        padding: 20rpx 0 0 0;
+        position: relative;
+        .play-icon {
+          position: absolute;
+          top: 0;
+          left: 0;
+          bottom: 0;
+          right: 0;
+          margin: auto;
+          width: 80rpx;
+          height: 80rpx;
+        }
+        .video-item {
+          width: 100%;
+          height: 400rpx;
+          border-radius: 10rpx;
+        }
+      }
+    }
+    .info-item-bottom {
+      display: flex;
+      align-items: center;
+      padding: 20rpx;
+      border-top: 1px solid #f1f1f1;
+      font-size: 16px;
+      .time {
+        flex: 1;
+        color: #333;
+      }
+      .btns {
+        display: flex;
+        color: #999;
+        .flex + .flex {
+          margin: 0 0 0 32rpx;
+        }
+        .flex {
+          align-items: center;
+        }
+        .icon {
+          width: 32rpx;
+          height: 32rpx;
+          margin: 0 8rpx 0 0;
+        }
+        .zan-off-icon {
+          width: 32rpx;
+          height: 32rpx;
+        }
+        .zan-on-icon {
+          width: 32rpx;
+          height: 32rpx;
+        }
+        .seeNum-txt {
+          &.on {
+            color: #D81E06;
+          }
+        }
+        .more-btn {
+          position: relative;
+          .more-wrapper {
+            position: absolute;
+            right: -20rpx;
+            top: -150rpx;
+            z-index: 5;
+            width: 200rpx;
+            border-radius: 12rpx;
+            background-color: #fff;
+            box-shadow: 0px 1px 6px rgba(0,0,0,0.16);
+            .more-item + .more-item {
+              border-top: 1px solid #d5d5d5;
+            }
+            .more-item {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              height: 70rpx;
+              font-size: 14px;
+              color: #333;
+              .more-icon {
+                width: 36rpx;
+                height: 36rpx;
+                margin: 0 10rpx 0 0;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+.goods-section {
+  padding: 40rpx 32rpx 0;
+  background: #f0f0f0;
+
+  .item {
+    position: relative;
+    width: 332rpx;
+    height: 528rpx;
+    box-sizing: border-box;
+    margin-right: 22rpx;
+    margin-bottom: 24rpx;
+    border-radius: 20rpx;
+    background: #fff;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    .name {
+      padding: 8rpx 6rpx;
+      font-size: 26rpx;
+      line-height: 36rpx;
+      color: #333333;
+      height: 70rpx;
+    }
+
+    .price-line {
+      padding: 0 10rpx;
+      font-size: 26rpx;
+      line-height: 38rpx;
+      color: #ED0F0F;
+    }
+
+    .sales-line {
+      position: absolute;
+      bottom: 0;
+      width: 100%;
+      padding: 8rpx 10rpx 18rpx;
+      border-top: 1rpx solid #EFEFEF;
+      font-size: 24rpx;
+      line-height: 34rpx;
+      color: #8D8D8D;
+    }
+  }
+
+  .item:nth-child(2n) {
+    margin-right: 0;
+  }
+
+  .cover {
+    width: 332rpx;
+    height: 332rpx;
+    background: rgba(255, 255, 255, 0.39);
+    border-radius: 8rpx;
+    vertical-align: middle;
+  }
+
+  .label {
+    width: 40rpx;
+    height: 24rpx;
+    margin-right: 4rpx;
+    vertical-align: middle;
+  }
+
+  .icon {
+    width: 24rpx;
+    height: 24rpx;
+    margin-right: 6rpx;
+    vertical-align: middle;
+  }
+  .btn {
+    display: flex;
+    justify-content: center;
+    .btn-cont {
+      padding: 13rpx 30rpx;
+      border: 1px solid #0DC5C5;
+      border-radius: 8rpx;
+      color: #0DC5C5;
+      .iconfont {
+        margin: 0 0 0 20rpx;
+        font-size: 24rpx;
+      }
+    }
+  }
+}
+.btLine {
+  width: 100%;
+  height: 6rpx;
+  margin-top: 18rpx;
+  background: #0DC5C5;
+}
+.tab-item-active {
+  color:#080F1A;
+  font-size:32rpx;
+}
+.tab-item-no-active {
+  color:#A6AAB3;
+  font-size:28rpx;
+}
+.top-tab {
+  padding-bottom: 30rpx;
+  padding-top: 30rpx;
+  background: #fff;
+  .tab {
+    width: 20%;
+    .tab-item {
+      height: 52rpx;
+      padding: 0 30rpx;
+      border-radius: 26rpx 0 0 26rpx;
+      font-size: 32rpx;
+      line-height: 52rpx;
+      font-weight: bold;
+      &.active {
+        color: #fff;
+        background: linear-gradient(90deg, #C52733 0%, rgba(211,92,101,0.91) 54%, rgba(255,255,255,0.62) 100%);
+      }
+    }
+    &.hide {
+      display: none;
+    }
+  }
+}
+.map-wrapper {
+  position: relative;
+  z-index: 2;
+  height: 200rpx;
+  margin: 40rpx 0 0 0;
+  overflow: hidden;
+  .map-cont {
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 2;
+    width: 100%;
+    opacity: 0.3;
+    transform: translateY(-50rpx);
+  }
+  .bg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 3;
+    height: 60rpx;
+    background: linear-gradient(180deg, #FFFFFF 0%, rgba(255,255,255,1) 0%, rgba(255,255,255,0) 100%);
+  }
+  .map-info {
+    position: relative;
+    z-index: 5;
+    display: flex;
+    align-items: center;
+    padding: 40rpx 30rpx 40rpx 32rpx;
+    color: #333;
+    font-size: 14px;
+    background: rgba(255,255,255,0.4);
+    .map-info-hd {
+      .icon {
+        display: block;
+        width: 34rpx;
+        height: 42rpx;
+      }
+    }
+    .map-info-bd {
+      flex: 1;
+      padding: 0 60rpx 0 20rpx;
+      line-height: 60rpx;
+    }
+    .map-info-ft {
+      .item + .item {
+        margin: 0 0 0 6rpx;
+      }
+      .item {
+        text-align: center;
+        font-weight: 500;
+        .img {
+          display: block;
+          width: 64rpx;
+          height: 64rpx;
+          margin: 0 0 16rpx 16rpx;
+        }
+      }
+    }
+  }
+}
+.inn-signature-wrap {
+  position: relative;
+  z-index: 5;
+  padding: 0 32rpx;
+  margin: 20rpx 0 0 0;
+  .triangle {
+    position: absolute;
+    top: -20rpx;
+    left: 72rpx;
+    width: 0;
+    height: 0;
+    border-left: 20rpx solid transparent;
+    border-right: 20rpx solid transparent;
+    border-bottom: 24rpx solid rgba(243,243,246,0.39);
+  }
+  .inn-signature {
+    position: relative;
+    padding: 20rpx;
+    border-radius: 20rpx;
+    font-size: 24rpx;
+    color: #080F1A;
+    background: #fff;
+    box-shadow: 0px 0px 7px 1px rgba(0, 0, 0, 0.08);
+  }
+  .share-btn {
+    position: absolute;
+    right: 0;
+    bottom: -68rpx;
+    .img {
+      width: 212rpx;
+      height: 60rpx;
+    }
+  }
+}
+.zan-favorite-wrap {
+  font-size: 32rpx;
+  color: #333;
+  .on {
+    color: #FF564A;
+  }
+}
+.zan-box {
+  .img {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 8rpx 0 0;
+    vertical-align: middle;
+  }
+}
+.favorite-box {
+  .icon {
+    width: 36rpx;
+    height: 36rpx;
+    margin: 0 8rpx 0 30rpx;
+  }
+}
+.cover-box {
+  position: relative;
+
+  .full-img {
+    width: 750rpx;
+  }
+  .video {
+    display: block;
+    width: 100%;
+    height: 100%;
+  }
+}
+.innInfoWrap {
+  position: relative;
+  margin-top: -76rpx;
+  padding: 20rpx 36rpx;
+  line-height: 1;
+  z-index: 1;
+  .bg-color {
+    position: absolute;
+    top: -5px;
+    left: 0;
+    right: 0;
+    z-index: 1;
+    height: 50%;
+    background: linear-gradient(-180deg, rgba(0,0,0,0) 0%, rgba(0,0,0,1) 100%);
+
+    .box-mask {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+      left: 166rpx;
+      box-sizing: border-box;
+      padding: 0 32rpx 12rpx 0;
+
+      .city-section {
+        width: 256rpx;
+        margin-left: 20rpx;
+      }
+    }
+  }
+  .body-cont {
+    position: relative;
+    z-index: 2;
+  }
+}
+.inn-logo {
+  flex-shrink: 0;
+  width: 56*2rpx;
+  height: 56*2rpx;
+  margin-right: 18rpx;
+}
+
+.inn-logo image {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+}
+
+.inn-name {
+  width: 280rpx;
+  font-size: 32rpx;
+  color: #FFFFFF;
+  line-height: 48rpx;
+}
+
+.inn-owner {
+  font-size: 24rpx;
+  color: #8B8F99;
+}
+.guarantee{
+  color: #8B8F99;
+  margin-top: 4rpx;
+}
+</style>
\ No newline at end of file
diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index dfbf196..c055bec 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -303,7 +303,7 @@
                   <image :src="webUrl + '/home/管家角标.png'" class="star-icon" />
                 </view>
                 <view class="desc more-t v12-font-bold">
-                  {{ item.desc }}
+                  {{ item.desc }} 
                 </view>
                 <view class="tag-list">
                   <view v-for="(tag, i) in item.tags" :key="i" class="tag">{{ tag }}</view>

From 7485208d312682dfcee98a8d35a41a81e4c3f310 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 5 Dec 2025 12:02:15 +0800
Subject: [PATCH 71/78] =?UTF-8?q?Fix=EF=BC=9A4692=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=B0=81=E9=9D=A2=E4=B8=BA=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=97=E9=93=BA=E5=85=A5=E5=8F=A3=E5=9B=BE=E5=9C=A8?=
 =?UTF-8?q?=E5=BA=B7=E5=85=BB=E5=88=97=E8=A1=A8=E4=B8=AD=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=88=E5=AE=89=E5=8D=93=E6=89=8B=E6=9C=BA=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/healthSanctum.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg_product/views/healthSanctum.vue b/pkg_product/views/healthSanctum.vue
index a99ba08..2e2dbf3 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -43,8 +43,7 @@
     <view class="v12-justify-between sanctup-items v12-mt-3">
       <view v-for="(item, index) in items" :key="index" class="v12-pa-1" @click="toStore(item)">
         <view class="img">
-          <image class="img" :src="item.cover"></image>
-          <!-- <video 
+          <video 
             class="img" 
             :src="item.cover" 
             :play-btn-position="center" 
@@ -52,8 +51,10 @@
             :show-center-play-btn="flase" 
             :show-play-btn="false"
             :controls="false"
+            :poster="item.cover + '?vframe/jpg/offset/1'"
             v-if="item.coverType === 2">
-          </video> -->
+          </video>
+          <image v-else class="img" :src="item.cover"></image>
           <view class="v12-white-text address">
             <image
               class="map-icon v12-mr-1"

From 9093167bbdc87ce6a2b2f88d5bbef85bed628b46 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 5 Dec 2025 12:09:11 +0800
Subject: [PATCH 72/78] =?UTF-8?q?Fix=EF=BC=9A4690=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E9=80=81=E7=A4=BC=E6=96=B9=E7=A4=BC=E5=8C=85=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E5=A2=9E=E5=8A=A0=E5=9B=A2=E8=B4=AD?=
 =?UTF-8?q?=E6=80=BB=E4=BB=B7=E3=80=81=E6=BB=A1=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_product/views/sojoumOrderDetails.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg_product/views/sojoumOrderDetails.vue b/pkg_product/views/sojoumOrderDetails.vue
index 8cbcefa..b1dd6b6 100644
--- a/pkg_product/views/sojoumOrderDetails.vue
+++ b/pkg_product/views/sojoumOrderDetails.vue
@@ -45,7 +45,16 @@
         </view>
       </view>
     </view>
-
+    <view class="order-section">
+      <view class="info-item">
+        <text class="label">团购总价</text>
+        <text class="value">￥{{orderInfo.travelGroupOrderInfo.travelGroupProduct.price}}</text>
+      </view>
+      <view class="info-item" style="margin-bottom: 0rpx;">
+        <text class="label">满减优惠</text>
+        <text class="value">￥{{orderInfo.discountPrice}}</text>
+      </view>
+    </view>
     <!-- 核销码 -->
     <view class="verify-section" v-if="orderInfo._status && ['1','2'].includes(orderInfo._status._type)">
       <view class="verify-title v12-font-28 v12-primary-text">核销码：{{orderInfo.verifyCode}}</view>

From 23491dab19f667f3b8c36a8f3649e6382ed591ee Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 5 Dec 2025 18:24:51 +0800
Subject: [PATCH 73/78] =?UTF-8?q?Fix=EF=BC=9A4709=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E7=A4=BC=E5=8C=85=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=EF=BC=9A=E2=80=9C=E6=BB=A1=E5=87=8F=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E2=80=9D=E6=9C=AA=E8=8E=B7=E5=8F=96=E5=88=B0=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E5=88=B8=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/sojoumOrderDetails.vue b/pkg_product/views/sojoumOrderDetails.vue
index b1dd6b6..a65e28a 100644
--- a/pkg_product/views/sojoumOrderDetails.vue
+++ b/pkg_product/views/sojoumOrderDetails.vue
@@ -52,7 +52,7 @@
       </view>
       <view class="info-item" style="margin-bottom: 0rpx;">
         <text class="label">满减优惠</text>
-        <text class="value">￥{{orderInfo.discountPrice}}</text>
+        <text class="value">￥{{orderInfo.couponPrice}}</text>
       </view>
     </view>
     <!-- 核销码 -->

From 52c72c97a711c10e914589840cb80d29663d5b8a Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 5 Dec 2025 18:25:08 +0800
Subject: [PATCH 74/78] =?UTF-8?q?Fix:4712=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=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E7=AE=A1=E5=AE=B6=E5=88=97=E8=A1=A8-=E7=AE=A1=E5=AE=B6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AF=E7=AE=A1?=
 =?UTF-8?q?=E5=AE=B6=E8=AF=A6=E6=83=85=E4=BB=8B=E7=BB=8D=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E7=AE=A1=E5=AE=B6=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index c055bec..1198ff0 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -303,7 +303,7 @@
                   <image :src="webUrl + '/home/管家角标.png'" class="star-icon" />
                 </view>
                 <view class="desc more-t v12-font-bold">
-                  {{ item.desc }} 
+                  {{ item.intro }} 
                 </view>
                 <view class="tag-list">
                   <view v-for="(tag, i) in item.tags" :key="i" class="tag">{{ tag }}</view>

From 1ad946e7be1565c7d9edf9a607ea8e3e7e49a01a Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 5 Dec 2025 18:52:16 +0800
Subject: [PATCH 75/78] =?UTF-8?q?Fix:4696=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=E7=A4=BC?=
 =?UTF-8?q?=E5=8C=85=E9=A2=86=E5=8F=96=E9=A1=B5=E9=9D=A2=EF=BC=9A=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=9B=BE=E5=B0=BA=E5=AF=B8=E5=81=8F=E5=B0=8F=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=81=8F=E4=B8=8B=EF=BC=8C=E4=B8=8E=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/GiftCard.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 539b042..54c74ad 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="dialog-conent" v-show="isLogin">
     <view class="gift-card-modal" >
-      <image class="bg-image" :src="!card.isBlind ? card.cover : card.blindBoxImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
+      <image class="bg-image" :src="!card.isBlind ? card.cover : card.blindBoxImage" mode="widthFix" lazy-load="false"></image>
       <view v-if="card.isBlind !== 1" class="image-wrap" :style="{
         top: card.productImageY*2 + 'rpx',
         left: card.productImageX*2 + 'rpx'
@@ -35,19 +35,19 @@
           <u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
         </button>
       </view>
-      <view v-if="myGift.isCurrentUser === 1 && !card.isBlind" @click="toOrder" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
+      <view v-if="myGift.isCurrentUser === 1 && !card.isBlind" @click="toOrder" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
         <view class="address-btn v12-white-text v12-primary">
           您已领取礼包
         </view>
         <view class="info-btn v12-text-center  v12-font-32  v12-mt-3">查看礼包详情>></view>
       </view>
-      <view v-if="myGift.isCurrentUser === 1 && card.isBlind" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
+      <view v-if="myGift.isCurrentUser === 1 && card.isBlind" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
         <view style="width: fit-content;" class="address-btn v12-white-text v12-primary" @click="toOrder">
           您已领取礼包，去看看>>
         </view>
         <view class="info-btn v12-text-center v12-font-32  v12-mt-3" @click.stop="searchGift">我也要送礼</view>
       </view>
-      <view v-if="isReceive && myGift.isCurrentUser !== 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
+      <view v-if="isReceive && myGift.isCurrentUser !== 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
         <view class="address-btn v12-white-text v12-primary">
           礼包已被领取
         </view>
@@ -64,13 +64,13 @@
           <u-icon :name="webUrl + '/icon/share.png'" ></u-icon>
         </button>
       </view>
-      <view v-if="card.isOverReceive === 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
+      <view v-if="card.isOverReceive === 1" @click="toHome" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
         <view class="address-btn v12-white-text v12-primary">
           礼包已被领取
         </view>
         <view class="info-btn v12-text-center  v12-font-32  v12-mt-3" style="z-index: 10">去商城看看>></view>
       </view>
-      <view v-if="card.isUserReceive === 1 && card.isOverReceive === 0" style="z-index: 10; display: flex;flex-direction: column;align-items: center;">
+      <view v-if="card.isUserReceive === 1 && card.isOverReceive === 0" style="z-index: 10; display: flex;flex-direction: column;align-items: center;margin-top:200rpx;">
         <view style="width: fit-content;" class="address-btn v12-white-text v12-primary" @click="toOrder">
           您已领取礼包，去看看>>
         </view>
@@ -326,6 +326,7 @@ export default {
   display: flex;
   justify-content: center;
   align-content: center;
+  margin-top: 200rpx;
 }
 .bg-image{
   width: 420rpx;

From 11098619348e803a15ed7c09c7a8d91a5bb113c6 Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Mon, 8 Dec 2025 21:58:57 +0800
Subject: [PATCH 76/78] =?UTF-8?q?Fix=EF=BC=9A4375=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E6=97=85=E5=B1=85=E5=95=86=E5=AE=B6=E4=B8=BB=E9=A1=B5=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/qianxian.js                   | 5 ++++-
 pkg_product/views/sojoumStore.vue | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/api/qianxian.js b/api/qianxian.js
index e981a3a..ae02d43 100644
--- a/api/qianxian.js
+++ b/api/qianxian.js
@@ -153,7 +153,10 @@ export function postJiaLouNewsZan(data) {
 export function postJiaLouShare(id) {
     return request.get('/countyFamous/sojourn/poster/' + id, {login: true})
 }
-
+// 分享旅居1
+export function postTravelShare(id) {
+    return request.get('/travel/poster/' + id, {login: true})
+}
 /**
  * 获取旅居列表
  * countyId int 县城ID
diff --git a/pkg_product/views/sojoumStore.vue b/pkg_product/views/sojoumStore.vue
index 1198ff0..4b94765 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -350,7 +350,7 @@ import {
   postJiaLouNewsView,
   postJiaLouNewsZan,
   postJiaLouZan,
-  postJiaLouShare,
+  postTravelShare,
   getJiaLouProductList,
   getJiaLouStewardList,
   getJiaLouNewsList
@@ -540,7 +540,7 @@ export default {
     },
     changeShare() {
       uni.showLoading()
-      postJiaLouShare(this.id).then(res => {
+      postTravelShare(this.id).then(res => {
         this.posterUrl = res.data
         this.showShare = !this.showShare
       }).finally(() => {

From 07aec60ce9f7fc6eb762c34be226f8271b33ca7f Mon Sep 17 00:00:00 2001
From: LinCyJang <linxi957440651@163.com>
Date: Mon, 8 Dec 2025 22:17:45 +0800
Subject: [PATCH 77/78] =?UTF-8?q?Fix=EF=BC=9A4696=20=E3=80=90=E6=97=85?=
 =?UTF-8?q?=E5=B1=85=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91?=
 =?UTF-8?q?=E7=A4=BC=E5=8C=85=E9=A2=86=E5=8F=96=E9=A1=B5=E9=9D=A2=EF=BC=9A?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=9B=BE=E5=B0=BA=E5=AF=B8=E5=81=8F=E5=B0=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=8D=E7=BD=AE=E5=81=8F=E4=B8=8B=EF=BC=8C=E4=B8=8E?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E9=85=8D=E7=BD=AE=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/gift/components/GiftCard.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg_user/views/gift/components/GiftCard.vue b/pkg_user/views/gift/components/GiftCard.vue
index 54c74ad..ade647e 100644
--- a/pkg_user/views/gift/components/GiftCard.vue
+++ b/pkg_user/views/gift/components/GiftCard.vue
@@ -4,7 +4,7 @@
       <image class="bg-image" :src="!card.isBlind ? card.cover : card.blindBoxImage" mode="widthFix" lazy-load="false"></image>
       <view v-if="card.isBlind !== 1" class="image-wrap" :style="{
         top: card.productImageY*2 + 'rpx',
-        left: card.productImageX*2 + 'rpx'
+        left: card.productImageX*2+ 'rpx'
       }">
         <image v-if="!isTravelGroup" class="pro-image" :src="card.giftProducts[0].productImage" mode="aspectFit|aspectFill|widthFix" lazy-load="false">
           
@@ -419,7 +419,7 @@ export default {
 }
 .gift-card-modal {
     height: 560rpx;
-    width: 340rpx;
+    width: 420rpx;
     justify-content: center;
     z-index: 999;
     /* margin-top: 100rpx; */

From 2f4d4510a5c4000b59e0647680234055cf6356f8 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Tue, 9 Dec 2025 14:09:19 +0800
Subject: [PATCH 78/78] =?UTF-8?q?Fix:=E7=94=84=E9=80=89=E5=A5=BD=E7=A4=BC?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/newZone.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/home/newZone.vue b/pages/home/newZone.vue
index 2b6b924..748315e 100644
--- a/pages/home/newZone.vue
+++ b/pages/home/newZone.vue
@@ -29,7 +29,7 @@
         </swiper>
       </view>
     </view>
-    <view class="v12-align-center tabs-wrap v1-py-1 v12-mt-2">
+    <view class="v12-align-center tabs-wrap v1-py-1 v12-my-4">
       <view class="tab-item v12-font-bold" v-for="(tab, index) in tabs" :key="index" @click="handleClick(index, tab)">
         {{ tab.cateName }}
         <view class="tab-line" v-if="activeIndex == index"></view>
@@ -140,7 +140,7 @@ export default{
 }
 .tabs-wrap{
   overflow: auto;
-  justify-content: justify-between;
+  justify-content: space-between;
 }
 .tab-item{
   margin-right: 20rpx;