Merge branch 'fanpeng' into 'master'

1. 连接设备添加兜底，防止loading无法关闭

See merge request StarlockTeam/wx-starlock!8

manifest.json

@@ -3,7 +3,7 @@
     "appid" : "__UNI__933D519",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : "9",
+    "versionCode" : "12",
     "transformPx" : false,
     /* 小程序特有相关 */
     "mp-weixin" : {

pages/lockDetail/lockDetail.vue

@@ -137,6 +137,16 @@ export default {
       }
     },
     async openDoorOperate(type) {
+      if(this.currentLockInfo.faceAuthentication === 1 &&
+          ((this.currentLockInfo.nextFaceValidateTime <= new Date().getTime() + this.time * 1000) &&
+              this.currentLockInfo.nextFaceValidateTime !== 0)) {
+        uni.showModal({
+          title: '提示',
+          content: '开门前需进行实名认证，小程序暂不支持，请使用APP认证开门',
+          showCancel: false
+        })
+        return
+      }
       if(this.pending) {
         return
       }

pages/passwordList/passwordList.vue

@@ -95,7 +95,8 @@ export default {
   },
   methods: {
     ...mapActions(useBasicStore, ['routeJump', 'getDeviceInfo', 'getNetworkType']),
-    ...mapActions(useLockStore, ['getPasswordList', 'updateCurrentPasswordInfo', 'updatePasswordSearch', 'getPasswordStatus']),
+    ...mapActions(useLockStore, ['getPasswordList', 'updateCurrentPasswordInfo', 'updatePasswordSearch',
+      'getPasswordStatus', 'clearList']),
     ...mapActions(useBluetoothStore, ['resetLockPassword', 'setLockPassword', 'closeBluetoothConnection']),
     toPasswordDetail(password) {
       this.updateCurrentPasswordInfo(password)

pages/safeQuestion/safeQuestion.vue

@@ -45,7 +45,11 @@ export default {
         })
       }
     },
-    updateAnswer() {
+    async updateAnswer() {
+      const netWork = await this.getNetworkType()
+      if(!netWork) {
+        return
+      }
       this.routeJump({
         type: 'redirectTo',
         name: 'updateSafeQuestion'

pages/searchDevice/searchDevice.vue

@@ -66,6 +66,7 @@ export default {
         name: device.name,
         deviceId: device.deviceId
       })
+      try {
         const result = await this.connectBluetoothDevice()
         if(result) {
           this.stopGetBluetoothDevices()
@@ -117,6 +118,13 @@ export default {
             icon: 'none'
           })
         }
+      } catch (res) {
+        uni.hideLoading()
+        uni.showToast({
+          title: '连接失败，请靠近设备并保持设备处于唤醒状态',
+          icon: 'none'
+        })
+      }
     }
   }
 }

pages/selectAddress/selectAddress.vue

@@ -3,7 +3,7 @@
     <view class="title">地理位置</view>
     <view v-if="show">
       <map class="map" :longitude="longitude" :latitude="latitude" :scale="16" :markers="markers"
-           :enable-zoom="false" :enable-scroll="false"></map>
+           :enable-zoom="true" :enable-scroll="true"></map>
     </view>
     <view v-else class="map"></view>
     <view class="explain">检查以确保以下地址是正确的</view>

stores/bluetooth.js

@@ -618,6 +618,7 @@ export const useBluetoothStore = defineStore('ble', {
         }
         uni.createBLEConnection({
           deviceId: that.currentLockInfo.deviceId,
+          timeout: 10000,
           success(res) {
             console.log('连接成功', res)
             // 获取设备服务