Merge branch 'develop' into fanpeng

# Conflicts:
#	manifest.json

App.vue

@@ -26,7 +26,7 @@
           return 'XHJ'
         }
         if (this.envVersion === 'trial') {
-          return 'PRE'
+          return 'XHJ'
         }
         return 'XHJ'
       }

manifest.json

@@ -3,7 +3,7 @@
   "appid": "__UNI__933D519",
   "description": "",
   "versionName": "1.2.0",
-  "versionCode": "34",
+  "versionCode": "35",
   "transformPx": false,
   "mp-weixin": {
     "appid": "wx9829a39e65550757",

pages/settingForBluetooth/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>

pages/settingForBluetooth/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>

pages/settingForBluetooth/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,