feature: wifi连接网络几个步骤分包

app.json

@@ -6,10 +6,6 @@
     "pages/repeat/repeat",
     "pages/deviceWake/deviceWake",
     "pages/channelDetails/channelDetails",
-    "pages/deviceConnect0/deviceConnect0",
-    "pages/deviceConnect1/deviceConnect1",
-    "pages/deviceConnect2/deviceConnect2",
-    "pages/deviceConnect3/deviceConnect3",
     "pages/download/download",
     "pages/wakeList/wakeList",
     "pages/aboutInfo/aboutInfo",
@@ -25,7 +21,11 @@
     {
       "root": "pages/pageB/",
       "pages": [
-        "about/about"
+        "about/about",
+        "deviceConnect0/deviceConnect0",
+        "deviceConnect1/deviceConnect1",
+        "deviceConnect2/deviceConnect2",
+        "deviceConnect3/deviceConnect3"
       ]
     }
   ],

pages/deviceConnect0/deviceConnect0.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "nav-bar": "./../components/navbar/navbar"
-  }
-}

pages/deviceConnect1/deviceConnect1.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "nav-bar": "./../components/navbar/navbar"
-  }
-}

pages/deviceConnect2/deviceConnect2.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "nav-bar": "./../components/navbar/navbar"
-  }
-}

pages/deviceConnect3/deviceConnect3.json

@@ -1,5 +0,0 @@
-{
-  "usingComponents": {
-    "nav-bar": "./../components/navbar/navbar"
-  }
-}

pages/pageA/login/login.js

@@ -17,18 +17,12 @@ Page({
     isAgree: false,
   },
 
-  onLoad(options) {
-    const pages = getCurrentPages(); // 获取当前页面栈
-    const pageCount = pages.length; // 页面栈中的页面数量
-    for (var i = pageCount - 1; i > -1; i--) {
-      console.log("gasdfqwerqwerq====" + JSON.stringify(pages[i]));
-    }
-  },
+  onLoad(options) {},
 
   egree() {
     this.setData({
       isAgree: !this.data.isAgree
-    })
+    });
   },
 
   goabout(e) {

pages/deviceConnect0/deviceConnect0.js

@@ -1,7 +1,7 @@
 const app = getApp();
-import strings from '../../utils/strings.js';
-import route_util from '../../utils/route_util.js';
-import route_constant from '../../utils/route_constant.js'
+import strings from '../../../utils/strings.js';
+import route_util from '../../../utils/route_util.js';
+import route_constant from '../../../utils/route_constant.js'
 
 Page({
   data: {
@@ -13,7 +13,7 @@ Page({
     userFuzzyLocation: true,
     isNotruter: false,
     connectDevice: {},
-    imageUrl: "./../../img/c.png",
+    imageUrl: "../../../img/c.png",
   },
 
   ///定位，蓝牙权限，蓝牙适配器

pages/pageB/deviceConnect0/deviceConnect0.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "nav-bar": "./../../components/navbar/navbar"
+  }
+}

pages/deviceConnect0/deviceConnect0.wxml

@@ -10,11 +10,11 @@
       起后，即可进入下一步</text>
     <view wx:if="{{!scopeBluetooth && userFuzzyLocation}}" class="qx">
       <text bindtap="setBluetooth">开启蓝牙权限</text>
-      <image mode="heightFix" src="./../../img/a.png"></image>
+      <image mode="heightFix" src="../../../img/a.png"></image>
     </view>
     <view wx:if="{{!userFuzzyLocation}}" class="qx">
       <text bindtap="setUserFuzzyLocation">开启定位权限</text>
-      <image mode="heightFix" src="./../../img/a.png"></image>
+      <image mode="heightFix" src="../../../img/a.png"></image>
     </view>
   </view>
   <view class="subBtn">
@@ -23,7 +23,7 @@
     </view>
     <view class="notRoter" wx:if="{{isNotruter}}">
       <text bindtap="notRoter">暂不链接</text>
-      <image mode="heightFix" src="./../../img/b.png"></image>
+      <image mode="heightFix" src="../../../img/b.png"></image>
     </view>
   </view>
 </view>

pages/deviceConnect1/deviceConnect1.js

@@ -1,6 +1,6 @@
 const app = getApp();
-import route_util from '../../utils/route_util.js';
-import route_constant from '../../utils/route_constant.js'
+import route_util from '../../../utils/route_util.js';
+import route_constant from '../../../utils/route_constant.js'
 
 Page({
   data: {

pages/pageB/deviceConnect1/deviceConnect1.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "nav-bar": "./../../components/navbar/navbar"
+  }
+}

pages/deviceConnect1/deviceConnect1.wxml

@@ -5,7 +5,7 @@
   </nav-bar>
   <view class="roterps">
     <view class="devicePic">
-      <image mode="widthFix" src="./../../img/e.png"></image>
+      <image mode="widthFix" src="../../../img/e.png"></image>
     </view>
   </view>
   <view class="wifiInfo">
@@ -16,11 +16,11 @@
       <input wx:if="{{!isShowPwd}}" class="notShow" bindinput="setPwd" password="true" placeholder="请输入WiFi密码" value="{{pwdData}}" />
       <input wx:else class="isShow" bindinput="setPwd" placeholder="请输入WiFi密码" value="{{pwdData}}" />
       <view class="yz" bindtap="showPwd">
-        <image mode="widthFix" src="./../../img/yj{{isShowPwd ? '1' : '0'}}.png"></image>
+        <image mode="widthFix" src="../../../img/yj{{isShowPwd ? '1' : '0'}}.png"></image>
       </view>
     </view>
     <view class="ps" wx:if="{{is5GWifi}}">
-      <image mode="widthFix" class="" src="./../../img/d.png"></image>
+      <image mode="widthFix" class="" src="../../../img/d.png"></image>
       <text>该WiFi可能为5GHz WiFi，设备无法连接，请切换其他WiFi</text>
     </view>
   </view>

pages/deviceConnect2/deviceConnect2.js

@@ -1,7 +1,7 @@
 const app = getApp();
-let xBlufi = require("../../utils/blufi/xBlufi.js");
-import strings from '../../utils/strings.js';
-import lexin_devices from '../../utils/lexin/devices';
+let xBlufi = require("../../../utils/blufi/xBlufi.js");
+import strings from '../../../utils/strings.js';
+import lexin_devices from '../../../utils/lexin/devices';
 Page({
 
   data: {

pages/pageB/deviceConnect2/deviceConnect2.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "nav-bar": "./../../components/navbar/navbar"
+  }
+}

pages/deviceConnect2/deviceConnect2.wxml

@@ -1,5 +1,3 @@
-<!--pages/deviceRoter1/deviceRoter1.wxml-->
-<!--pages/deviceRoter0/deviceRoter0.wxml-->
 <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>

pages/deviceConnect3/deviceConnect3.js

@@ -1,9 +1,9 @@
 // pages/deviceConnect3/deviceConnect3.ts
 const app = getApp();
-let xBlufi = require("../../utils/blufi/xBlufi.js");
-import strings from '../../utils/strings.js';
-import route_util from '../../utils/route_util.js';
-import route_constant from '../../utils/route_constant.js'
+let xBlufi = require("../../../utils/blufi/xBlufi.js");
+import strings from '../../../utils/strings.js';
+import route_util from '../../../utils/route_util.js';
+import route_constant from '../../../utils/route_constant.js'
 let percentIn = null;
 let errTi = null;
 
@@ -112,7 +112,7 @@ Page({
               deviceId: deviceId,
               mac: deviceId,
               imageUrl: that.data.imageUrl,
-              // imageUrl: "./../../img/min.png",
+              // imageUrl: "../../../img/min.png",
             }
             getCurrentPages()[0].addWifiDevice(device);
             // [{"deviceId":"BLUFI_7cdfa1fcbb24","name":"BLUFI_7cdfa1fcbb24","state":"online"}]

pages/pageB/deviceConnect3/deviceConnect3.json

@@ -0,0 +1,5 @@
+{
+  "usingComponents": {
+    "nav-bar": "./../../components/navbar/navbar"
+  }
+}

pages/deviceConnect3/deviceConnect3.wxml

@@ -1,5 +1,3 @@
-<!-- pages/deviceRoter1/deviceRoter1.wxml -->
-<!-- pages/deviceRoter0/deviceRoter0.wxml -->
 <view class="deviceRoter deviceRoter3">
   <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>
   <view class="roterps">
@@ -11,11 +9,11 @@
       <progress color="#6547A3" percent="{{percent}}" show-info stroke-width="3" />
     </view>
     <view class="suRuter" wx:elif="{{ruterStatus === 1}}">
-      <image style="height:48rpx; width:48rpx;" mode="aspectFit" src="./../../img/h.png"></image>
+      <image style="height:48rpx; width:48rpx;" mode="aspectFit" src="../../../img/h.png"></image>
       <text>连接成功</text>
     </view>
     <view class="suRuter" wx:elif="{{ruterStatus === 2}}">
-      <image style="height:48rpx; width:48rpx;" mode="aspectFit" src="./../../img/i.png"></image>
+      <image style="height:48rpx; width:48rpx;" mode="aspectFit" src="../../../img/i.png"></image>
       <text>连接失败</text>
     </view>
     <view class="errorPs" wx:if="{{ruterStatus === 2}}">

utils/route_constant.js

@@ -11,10 +11,10 @@ const deviceList = "../deviceList/deviceList";
 
 ///****************** pageB ********************/
 const about = "./../../pageB/about/about";
-
-const deviceConnect0 = "../deviceConnect0/deviceConnect0";
-const deviceConnect1 = "../deviceConnect1/deviceConnect1";
-const deviceConnect2 = "../deviceConnect2/deviceConnect2";
+const deviceConnect0 = "./../../pageB/deviceConnect0/deviceConnect0";
+const deviceConnect1 = "./../../pageB/deviceConnect1/deviceConnect1";
+const deviceConnect2 = "./../../pageB/deviceConnect2/deviceConnect2";
+const deviceConnect3 = "./../../pageB/deviceConnect2/deviceConnect3";
 
 const setWifi = "../setWifi/setWifi";