柒零 vor 1 Jahr
Ursprung
Commit
de3b167a37
2 geänderte Dateien mit 4 neuen und 2 gelöschten Zeilen
  1. 3 1
      subpages/addMattresses/addMattresses.js
  2. 1 1
      subpages/myMattress/myMattress.wxml

+ 3 - 1
subpages/addMattresses/addMattresses.js

@@ -59,6 +59,7 @@ Page({
     result: [],
   },
   onClose() {
+    wx.offBluetoothDeviceFound();
     this.setData({ showBluetoothList: false, showBluetoothConnected: false });
   },
   closeEndDialog() {
@@ -797,7 +798,8 @@ Page({
   onUnload() {
     wx.offWifiConnected({});
     wx.stopWifi({})
-    wx.offBluetoothDeviceFound()
+    wx.closeBluetoothAdapter();
+    wx.offBluetoothDeviceFound();
     wx.removeStorageSync('deviceList')
     this.closeConnect()
   },

+ 1 - 1
subpages/myMattress/myMattress.wxml

@@ -10,7 +10,7 @@
             <image class="item-cover" src="/subpages/images/ic-cd.png"></image>
             <view class="right-content">
                 <text class="item-title">{{item.location}}</text>
-                <text wx:if="{{item.status == 1}}" class="item-online">已连接</text>
+                <text wx:if="{{item.online == 'yes'}}" class="item-online">已连接</text>
                 <text wx:else class="item-offline">未连接</text>
                 <text class="item-sn">SN:{{item.sn}}</text>
                 <text class="item-user">使用人:{{item.person}}</text>