Merge branch 'develop' into test

src/pages/pay/pay.tsx

@@ -689,6 +689,18 @@ class Pay extends Component {
     });
   }
 
+  showerPayHandle() {
+    this.closeBluetooth();
+    return Taro.showModal({
+      title: '提示',
+      content: '设备蓝牙连接失败...请稍后再试',
+      showCancel: false,
+    }).then(res => {
+      console.log(res);
+      this.openBluetooth();
+    });
+  }
+
   payHandle() {
     const {
       device,
@@ -699,10 +711,7 @@ class Pay extends Component {
       if (this.checkIsShower()) {
         console.log(deviceDone, sockedDone);
         if (!deviceDone || !sockedDone) {
-          return Taro.showModal({
-            title: '提示',
-            content: '设备连接中...请稍后再试',
-          });
+          return this.showerPayHandle();
         }
       }
       getPayOrder({