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

2. 修正人脸认证的判断时间

manifest.json

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

pages/lockDetail/lockDetail.vue

@@ -83,8 +83,7 @@ export default {
       onlineToken: '0',
       pending: false,
       show: false,
-      type: '',
+      type: ''
-      serverTime: 0
     }
   },
   computed: {
@@ -134,13 +133,12 @@ export default {
     async getServeTime() {
       const { code, data } = await this.updateServerTimestamp()
       if(code === 0) {
-        this.serverTime = data.date
         this.time = parseInt((data.date - new Date().getTime()) / 1000)
       }
     },
     async openDoorOperate(type) {
       if(this.currentLockInfo.faceAuthentication === 1 &&
-          this.currentLockInfo.nextFaceValidateTime <= this.serverTime) {
+          this.currentLockInfo.nextFaceValidateTime <= new Date().getTime() + this.time * 1000) {
         uni.showModal({
           title: '提示',
           content: '开门前需进行实名认证，小程序暂不支持，请使用APP认证开门',

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'
+        })
+      }
     }
   }
 }