Преглед на файлове

feature:增加扫描进入设备配网页的功能

zeng.chen преди 15 часа
родител
ревизия
0b1de24ecc

Файловите разлики са ограничени, защото са твърде много
+ 2 - 0
pages/pageA/deviceList/deviceList.js


+ 3 - 1
pages/pageB/connectBle/connectBle.js

@@ -20,7 +20,9 @@ Page({
 
   onLoad(options) {
     var that = this;
-    var json = JSON.parse(options.param)
+    // 解码URL编码的参数
+    let paramStr = decodeURIComponent(options.param);
+    var json = JSON.parse(paramStr)
 
     BtHelper.getInstance().initBluetoothAdapter();
     BtHelper.getInstance().getBluetoothDevices();

Файловите разлики са ограничени, защото са твърде много
+ 105 - 10
pages/pageB/deviceConnect0/deviceConnect0.js


+ 1 - 1
pages/pageB/deviceConnect0/deviceConnect0.wxml

@@ -1,5 +1,5 @@
 <view class="deviceRoter deviceRoter0">
-  <nav-bar bind:goBack="_goBack" nav-bgc-class="ex-nav-bgc-class" nav-title-class="ex-nav-title-class" ex-back-pre="ex-back-pre" navbar-data='{{nvabarData}}'>
+  <nav-bar bind:goBack="_goBack" nav-bgc-class="ex-nav-bgc-class" nav-title-class="ex-nav-title-class" ex-back-pre="ex-back-pre" bind:tap="callback" navbar-data='{{nvabarData}}'>
   </nav-bar>
   <view class="roterps">
     <view class="devicePic">