Merge branch 'develop' into test

src/pages/pay/pay.tsx

@@ -214,9 +214,18 @@ class Pay extends Component {
   }
   checkBluetoothAndWs() {
     if (this.checkIsShower()) {
+      this.closeBluetooth()
+        .then(() => {
           console.log('打开蓝牙和WebSocket');
           this.openBluetooth();
           this.connectDeviceSocket();
+        })
+        .catch(err => {
+          console.log(err);
+          console.log(err, '打开蓝牙和WebSocket');
+          this.openBluetooth();
+          this.connectDeviceSocket();
+        });
     }
   }
 
@@ -271,7 +280,7 @@ class Pay extends Component {
   }
 
   closeBluetooth() {
-    Taro.closeBluetoothAdapter();
+    return Taro.closeBluetoothAdapter();
   }
 
   warnBluetoothOpen() {