Merge branch 'develop' into test

src/api/device.ts

@@ -30,6 +30,9 @@ type DeviceInfoResponse = {
   positionId: string;
   // 位置id
   rates: RateInfoResponse[];
+
+  //是否纯蓝牙设备 1：是，0：否
+  isOnlyBluetooth: number;
 };
 type RateInfoResponse = {
   mark: string;

src/pages/pay/pay.tsx

@@ -243,6 +243,10 @@ class Pay extends Component {
         );
       })
       .catch(err => {
+        Taro.showModal({
+          title: '温馨提示',
+          content: '为保障正常使用,请打开蓝牙设备!',
+        });
         console.error(err);
         Taro.onBluetoothAdapterStateChange(res => {
           console.log('adapterState changed, now is', res);
@@ -717,10 +721,12 @@ class Pay extends Component {
     } = this.props;
     const { payId, deviceDone, sockedDone } = this.state;
     if (payId) {
-      if (this.checkIsShower()) {
-        console.log(deviceDone, sockedDone);
-        if (!deviceDone || !sockedDone) {
-          return this.showerPayHandle();
+      if (device.isOnlyBluetooth && device.isOnlyBluetooth === 1) {
+        if (this.checkIsShower()) {
+          console.log(deviceDone, sockedDone);
+          if (!deviceDone || !sockedDone) {
+            return this.showerPayHandle();
+          }
         }
       }
       getPayOrder({

src/store/rootReducers/device.ts

@@ -17,6 +17,7 @@ export const INITIAL_STATE = {
   rates: [],
   serviceId: 0,
   serviceName: '',
+  isOnlyBluetooth: 0,
 };
 
 export const updateDeviceData = (entity: DeviceState): Action => ({

src/types/Device/Device.ts

@@ -20,4 +20,5 @@ export type Device = {
   rates: Rate[];
   serviceId: number;
   serviceName: string;
+  isOnlyBluetooth: number;
 };