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,51 +66,59 @@ export default {
         name: device.name,
         deviceId: device.deviceId
       })
-      const result = await this.connectBluetoothDevice()
+      try {
-      if(result) {
+        const result = await this.connectBluetoothDevice()
-        this.stopGetBluetoothDevices()
+        if(result) {
-        const { code: getPublicKeyCode } = await this.getPublicKey(this.currentLockInfo.name)
+          this.stopGetBluetoothDevices()
-        console.log('获取公钥返回', getPublicKeyCode, [...this.currentLockInfo.publicKey])
+          const { code: getPublicKeyCode } = await this.getPublicKey(this.currentLockInfo.name)
-        if(getPublicKeyCode !== 0) {
+          console.log('获取公钥返回', getPublicKeyCode, [...this.currentLockInfo.publicKey])
+          if(getPublicKeyCode !== 0) {
+            uni.hideLoading()
+            uni.showToast({
+              title: '连接失败，请靠近设备并保持设备处于唤醒状态',
+              icon: 'none'
+            })
+            return
+          }
+          const { code: getCommKeyCode } = await this.getCommKey(this.currentLockInfo.name, this.keyId,
+              this.userInfo.uid.toString(), this.serverTimestamp)
+          console.log('获取私钥返回', getCommKeyCode)
+          if(getCommKeyCode !== 0) {
+            uni.hideLoading()
+            uni.showToast({
+              title: '连接失败，请靠近设备并保持设备处于唤醒状态',
+              icon: 'none'
+            })
+            return
+          }
+          const date = new Date()
+          const timestamp = parseInt(date.getTime() / 1000) - date.getTimezoneOffset() * 60
+          const { code } = await this.getLockStatus({
+            name: this.currentLockInfo.name,
+            uid: this.userInfo.uid,
+            nowTime: this.serverTimestamp,
+            localTime: timestamp
+          })
+          if (code !== 0) {
+            uni.hideLoading()
+            uni.showToast({
+              title: '连接失败，请靠近设备并保持设备处于唤醒状态',
+              icon: 'none'
+            })
+            return
+          }
+          this.routeJump({
+            type: 'redirectTo',
+            name: 'selectAddress'
+          })
+        } else {
           uni.hideLoading()
           uni.showToast({
             title: '连接失败，请靠近设备并保持设备处于唤醒状态',
             icon: 'none'
           })
-          return
         }
-        const { code: getCommKeyCode } = await this.getCommKey(this.currentLockInfo.name, this.keyId,
+      } catch (res) {
-            this.userInfo.uid.toString(), this.serverTimestamp)
-        console.log('获取私钥返回', getCommKeyCode)
-        if(getCommKeyCode !== 0) {
-          uni.hideLoading()
-          uni.showToast({
-            title: '连接失败，请靠近设备并保持设备处于唤醒状态',
-            icon: 'none'
-          })
-          return
-        }
-        const date = new Date()
-        const timestamp = parseInt(date.getTime() / 1000) - date.getTimezoneOffset() * 60
-        const { code } = await this.getLockStatus({
-          name: this.currentLockInfo.name,
-          uid: this.userInfo.uid,
-          nowTime: this.serverTimestamp,
-          localTime: timestamp
-        })
-        if (code !== 0) {
-          uni.hideLoading()
-          uni.showToast({
-            title: '连接失败，请靠近设备并保持设备处于唤醒状态',
-            icon: 'none'
-          })
-          return
-        }
-        this.routeJump({
-          type: 'redirectTo',
-          name: 'selectAddress'
-        })
-      } else {
         uni.hideLoading()
         uni.showToast({
           title: '连接失败，请靠近设备并保持设备处于唤醒状态',