Merge branch 'develop' into test

c4fc31ff · 姜雷 · 961dcafc · fb059952 · c4fc31ff
Commit c4fc31ff authored Jul 10, 2019 by 姜雷
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 20 deletions

pay.tsx src/pages/pay/pay.tsx +17 -20

No files found.
--- a/src/pages/pay/pay.tsx
+++ b/src/pages/pay/pay.tsx
@@ -766,26 +766,23 @@ class Pay extends Component {
  }
  gobackHandle() {
-    // if (this.checkIsShower()) {
+    if (this.checkIsShower()) {
-    //   // this.sendStartShower();
+      setTimeout(() => {
-    //   Taro.showModal({
+        Taro.navigateTo({
-    //     title: '提示',
+          url: '/pages/index/index?', // 需要问号不然回到首页可以取到业务参数
-    //     content: '开启洗浴设备',
+        });
-    //     success: res => {
+      }, 2000);
-    //       if (res.confirm) {
+      setTimeout(() => {
-    //         console.log('用户点击确定');
+        this.closeBluetooth();
-    //       } else if (res.cancel) {
+        this.closeDeviceSocket();
-    //         console.log('用户点击取消');
+      }, 10000);
-    //       }
+    } else {
-    //     },
+      setTimeout(() => {
-    //   });
+        Taro.navigateTo({
-    // } else {
+          url: '/pages/index/index?', // 需要问号不然回到首页可以取到业务参数
-    setTimeout(() => {
+        });
-      Taro.navigateTo({
+      }, 2000);
-        url: '/pages/index/index?', // 需要问号不然回到首页可以取到业务参数
+    }
-      });
-    }, 2000);
-    // }
  }
  render() {