From f4b04d8a0e9039c948f5c90249fad259316cef78 Mon Sep 17 00:00:00 2001
From: modendeveloper <modendeveloper@163.com>
Date: Wed, 14 May 2025 17:58:04 +0800
Subject: [PATCH 1/7] =?UTF-8?q?Fix=EF=BC=9A=E6=97=85=E5=B1=85=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E5=9B=BE=E7=89=87=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit ec794b4d7959cc4fdbb924fb5d4b71e69eb8ffc3)
---
 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 b4410d5..49bb744 100644
--- a/pkg_product/views/sojoumStore.vue
+++ b/pkg_product/views/sojoumStore.vue
@@ -368,7 +368,8 @@ export default {
       infoArray: [],
       videoPlayers: [],
       activeVideo: 'coverVideo',
-      showShare: false
+      showShare: false,
+      posterUrl: ''
     }
   },
   onPageScroll(e) {

From a1b0dbe456d619b0b8fe77a4747c3ca5f6e537b0 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 4 Jun 2025 10:01:28 +0800
Subject: [PATCH 2/7] =?UTF-8?q?Fix=EF=BC=9A3845=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=95=86=E8=AF=A6?=
 =?UTF-8?q?=E9=A1=B5=E7=82=B9=E5=87=BB=E3=80=90=E9=80=81=E7=BB=99=E6=9C=8B?=
 =?UTF-8?q?=E5=8F=8B=E3=80=91=E5=8C=BA=E5=9F=9F=E6=B2=A1=E6=9C=89=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E9=80=89=E6=8B=A9=E8=A7=84=E6=A0=BC=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index d9b70bf..cc3a2f4 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -77,7 +77,7 @@
               <image class="gift-img" :src="webUrl + '/orderIcon/gift.png'" mode="widthFix" ></image>
               支持礼包赠送
             </view>
-            <view @click="toGift" class="v12-white v12-dark-text v12-radius-20 v12-font-28 gift-btn" style="opacity: 0;">
+            <view @click="toGift" class="v12-white v12-dark-text v12-radius-20 v12-font-28 gift-btn" v-if="!giftBg">
               送给朋友
             </view>
           </view>

From b7cdcb10d3fb974f63ba238fb05890f856fd32e0 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 4 Jun 2025 09:42:58 +0800
Subject: [PATCH 3/7] =?UTF-8?q?Feat=EF=BC=9A3685=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E5=B0=8F=E9=9C=80=E6=B1=82=EF=BC=8C=E9=9D=9E=E9=81=97=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E6=96=87=E6=9C=AC=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 7be4c52fb04c63b6f206a6c95527152f1ea0a490)
---
 pkg_product/views/heritage/details.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg_product/views/heritage/details.vue b/pkg_product/views/heritage/details.vue
index b25d988..2d4482c 100644
--- a/pkg_product/views/heritage/details.vue
+++ b/pkg_product/views/heritage/details.vue
@@ -3,6 +3,9 @@
     <view class="top-img">
       <video class="top-img" :show-fullscreen-btn="false"  autoplay play-btn-position="center" :src="details.video"></video>
     </view>
+    <view class="v12-mt-2 v12-font-24">
+      {{ details.videoSource }}
+    </view>
     <view class="title-img">
       <view class="img-wrap">
         <view class="v12-align-center">

From d0841f19fc81b58f8e1ab447daacd18861601aa3 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 4 Jun 2025 09:29:56 +0800
Subject: [PATCH 4/7] =?UTF-8?q?Fix=EF=BC=9A3854=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E2=80=9C=E5=85=BB=E7=94=9F=E5=9C=A3=E5=9C=B0?=
 =?UTF-8?q?=E2=80=9D=E6=94=B9=E4=B8=BA=E2=80=9C=E5=85=BB=E7=94=9F=E8=83=9C?=
 =?UTF-8?q?=E5=9C=B0=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit e89b80dee82a6671c5c2485f19a9e257fc514d53)
---
 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 3f3e212..d63bd34 100644
--- a/pkg_product/views/healthSanctum.vue
+++ b/pkg_product/views/healthSanctum.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="sanctum-wrap">
     <view class="v12-justify-center">
-      <view class="v12-mr-3 v12-radius-100 v12-primary v12-white-text v12-px-5 v12-py-2  v12-font-28 v12-font-bold">养生圣地</view>
+      <view class="v12-mr-3 v12-radius-100 v12-primary v12-white-text v12-px-5 v12-py-2  v12-font-28 v12-font-bold">养生胜地</view>
       <view class="v12-radius-100 v12-grey v12-dark-text v12-px-5 v12-py-2  v12-font-28 v12-font-bold" @click="toFoods">养生食材</view>
     </view>
     <view class="v12-justify-between v12-align-center v12-mt-5">

From 2d2b57d3d0bdcaad63b33e683d329aa088b0838c Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 4 Jun 2025 09:16:49 +0800
Subject: [PATCH 5/7] =?UTF-8?q?Fix=EF=BC=9A=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=88=87=E6=8D=A2=E5=9C=B0=E5=9D=80=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d28a2ebd20aa5d9410ab48dab5ce57f188a089c8)
---
 pages/order/OrderSubmission/index.vue | 45 +++++++++++++++------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index c7bb6e2..6fa198c 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -416,28 +416,33 @@ export default {
     _this.$store.dispatch("getUser", true)
     // 监听到选择收货地址
     const chooseAddress = uni.getStorageSync('chooseAddress') || {}
-    const sourceAddress = uni.getStorageSync('sourceAddress') || uni.getStorageSync('chooseAddress') 
+    const sourceAddress = uni.getStorageSync('sourceAddress') || {}
     // 监听到选择收货地址
     if (chooseAddress.id && (chooseAddress.id !== sourceAddress.id)) {
-      uni.showModal({
-        title:'确定修改地址吗?',
-        content: '',
-        showCancel: true,
-        cancelText: '取消',
-        confirmText: '确认',
-        success: (res) => {
-          if(res.confirm) {
-            _this.addressInfo = chooseAddress
-            // 地址切换也要重新计算一下
-            uni.setStorageSync('sourceAddress', _this.addressInfo || '')
-            _this.computedPrice('onLoad chooseAddress')
-          }
-        },
-        complete: () => {
-          uni.hideLoading()
-          uni.setStorageSync('chooseAddress', {})
-        }
-      })
+      _this.addressInfo = chooseAddress
+      // 地址切换也要重新计算一下
+      uni.setStorageSync('sourceAddress', _this.addressInfo || '')
+      _this.computedPrice('onLoad chooseAddress')
+      setTimeout(() => {
+        uni.hideLoading()
+        uni.setStorageSync('chooseAddress', {})
+      }, 1000)
+      // uni.showModal({
+      //   title:'确定修改地址吗?',
+      //   content: '',
+      //   showCancel: true,
+      //   cancelText: '取消',
+      //   confirmText: '确认',
+      //   success: (res) => {
+      //     if(res.confirm) {
+            
+      //     }
+      //   },
+      //   complete: () => {
+      //     uni.hideLoading()
+      //     uni.setStorageSync('chooseAddress', {})
+      //   }
+      // })
     }
     
   },

From df500286e22db10574b2e5277f3e134b4616fcbf Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 4 Jun 2025 09:16:18 +0800
Subject: [PATCH 6/7] =?UTF-8?q?Fix=EF=BC=9A3569=20=E3=80=90=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E3=80=81=E7=A4=BC=E5=93=81=E5=8D=A1=E5=88=97=E8=A1=A8=E4=B8=8B?=
 =?UTF-8?q?=E6=96=B9=E5=87=BA=E7=8E=B0=E9=81=AE=E6=8C=A1=EF=BC=8C=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E5=8F=B7=EF=BC=9A=E7=BA=A2=E7=B1=B3K40?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 29a6be7e382ff2bb2588361b61713fe38837f08e)
---
 components/yzc-paykeyboard/yzc-paykeyboard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/yzc-paykeyboard/yzc-paykeyboard.vue b/components/yzc-paykeyboard/yzc-paykeyboard.vue
index e60f7ae..0ddcbd2 100644
--- a/components/yzc-paykeyboard/yzc-paykeyboard.vue
+++ b/components/yzc-paykeyboard/yzc-paykeyboard.vue
@@ -257,7 +257,7 @@
 	}
 	.keyboard-item {
 		box-sizing: border-box;
-		width: 250rpx;
+		width: 33.333%;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;

From 1dfabc169707c3926e6afc64e203d743ab04deaf Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Thu, 5 Jun 2025 10:53:08 +0800
Subject: [PATCH 7/7] =?UTF-8?q?Style=EF=BC=9A=E5=8D=95=E8=AF=8D=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkg_product/views/heritage/details.vue b/pkg_product/views/heritage/details.vue
index 2d4482c..6ddb659 100644
--- a/pkg_product/views/heritage/details.vue
+++ b/pkg_product/views/heritage/details.vue
@@ -3,8 +3,8 @@
     <view class="top-img">
       <video class="top-img" :show-fullscreen-btn="false"  autoplay play-btn-position="center" :src="details.video"></video>
     </view>
-    <view class="v12-mt-2 v12-font-24">
-      {{ details.videoSource }}
+    <view class="v12-mt-2 v12-font-24 word-break-word">
+      {{ details.videoSource || '' }}
     </view>
     <view class="title-img">
       <view class="img-wrap">
@@ -358,4 +358,7 @@ export default {
   padding: 10rpx 60rpx;
   box-sizing: border-box;
 }
+.word-break-word{
+  word-break: break-word;
+}
 </style>
\ No newline at end of file