From a7af767a21b66ecde67ecacbb57e4188950d0cc9 Mon Sep 17 00:00:00 2001
From: Liuyf <lyf571321556@163.com>
Date: Wed, 26 Mar 2025 11:29:19 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E3=80=90=E5=BC=80=E9=94=81?=
 =?UTF-8?q?=E9=A1=B5-=E8=AE=BE=E7=BD=AE-=E9=94=81=E5=A3=B0=E9=9F=B3-?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=96=87=E5=AD=97=E5=B0=91=E4=BA=86=E5=90=AC?=
 =?UTF-8?q?=E5=88=B0=E3=80=82=E9=9F=B3=E9=87=8F=E5=89=8D=E5=BA=94=E5=8A=A0?=
 =?UTF-8?q?=E9=94=81=EF=BC=8C=E8=AF=B7=E8=A7=81=E5=9B=BE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/LockDate/LockDate.vue   | 2 +-
 pages/lockSound/lockSound.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/LockDate/LockDate.vue b/pages/LockDate/LockDate.vue
index 01fcf43..0b35a49 100644
--- a/pages/LockDate/LockDate.vue
+++ b/pages/LockDate/LockDate.vue
@@ -9,7 +9,7 @@
       class="bg-#63b8af mt-4 rounded-3xl w-600 h-80 line-height-80rpx text-center mx-75rpx text-white text-xl font-bold"
       @click="update"
     >
-      校准
+      校准时间
     </view>
   </view>
 </template>
diff --git a/pages/lockSound/lockSound.vue b/pages/lockSound/lockSound.vue
index 630995e..d23c558 100644
--- a/pages/lockSound/lockSound.vue
+++ b/pages/lockSound/lockSound.vue
@@ -11,7 +11,7 @@
       />
     </view>
     <view class="m-4 text-sm">
-      功能开启后，你将可以智能锁的提示音。包括电量过低，密码错误等提示。
+      功能开启后，你将可以听到智能锁的提示音。包括电量过低，密码错误等提示。
     </view>
     <view class="bg-white" v-if="check">
       <view class="py-3 px-4">请选择音量</view>

From 1e7adda734fc786145222c3bb25a22704a88e1ac Mon Sep 17 00:00:00 2001
From: Liuyf <lyf571321556@163.com>
Date: Thu, 27 Mar 2025 13:54:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=93=8D=E4=BD=9C=E6=9B=B4so?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=8F=90=E7=A4=BA=E6=9B=B4=E6=96=B0=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=EF=BC=8C=E6=97=A0=E7=BD=91=E7=BB=9C=E3=80=81=E6=97=A0?=
 =?UTF-8?q?=E8=93=9D=E7=89=99=E5=BA=94=E6=9C=89=E7=9B=B8=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/motorTorsion/motorTorsion.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pages/motorTorsion/motorTorsion.vue b/pages/motorTorsion/motorTorsion.vue
index 0b58f74..f620cf4 100644
--- a/pages/motorTorsion/motorTorsion.vue
+++ b/pages/motorTorsion/motorTorsion.vue
@@ -54,7 +54,9 @@
   import { updateLockSettingRequest } from '@/api/setting'
   import { useBluetoothStore } from '@/stores/bluetooth'
   import { useUserStore } from '@/stores/user'
+  import { useBasicStore } from '../../stores/basic'
 
+  const $basic = useBasicStore()
   const $bluetooth = useBluetoothStore()
   const $user = useUserStore()
 
@@ -67,6 +69,10 @@
   })
 
   const updateValue = async val => {
+    const netWork = await $basic.getNetworkType()
+    if (!netWork) {
+      return
+    }
     if (pending.value || value.value === val) return
     pending.value = true
     uni.showLoading({
@@ -81,6 +87,7 @@
       withParams: true
     })
     $bluetooth.closeBluetoothConnection()
+    console.log('code-', code)
     if (code === 0) {
       const { code, message } = await updateLockSettingRequest({
         lockId: $bluetooth.currentLockInfo.lockId,

From 56466042db254b7884de614523ef6a57f0746b6b Mon Sep 17 00:00:00 2001
From: Liuyf <lyf571321556@163.com>
Date: Fri, 28 Mar 2025 15:02:37 +0800
Subject: [PATCH 3/3] build: 1.2.0+35

---
 App.vue       | 2 +-
 manifest.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/App.vue b/App.vue
index 6e8c445..b2795b5 100644
--- a/App.vue
+++ b/App.vue
@@ -26,7 +26,7 @@
           return 'XHJ'
         }
         if (this.envVersion === 'trial') {
-          return 'PRE'
+          return 'XHJ'
         }
         return 'XHJ'
       }
diff --git a/manifest.json b/manifest.json
index bbf5df0..ed39791 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__933D519",
     "description" : "",
     "versionName" : "1.2.0",
-    "versionCode" : "34",
+    "versionCode" : "35",
     "transformPx" : false,
     /* 小程序特有相关 */
     "mp-weixin" : {