feature: 构建pageB类，加入连接流程

app.json

@@ -3,15 +3,10 @@
     "pages/pageA/index/index",
     "pages/pageA/login/login",
     "pages/pageA/deviceList/deviceList",
-    
     "pages/about/about",
     "pages/repeat/repeat",
     "pages/deviceWake/deviceWake",
     "pages/channelDetails/channelDetails",
-    "pages/deviceConnect3/deviceConnect3",
-    "pages/deviceConnect0/deviceConnect0",
-    "pages/deviceConnect2/deviceConnect2",
-    "pages/deviceConnect1/deviceConnect1",
     "pages/download/download",
     "pages/wakeList/wakeList",
     "pages/aboutInfo/aboutInfo",
@@ -22,12 +17,23 @@
     "pages/ota/ota",
     "pages/piano/cropper/cropper",
     "pages/setWifi/setWifi",
-    "pages/deviceConnect4/deviceConnect4",
     "pages/vipPurchase/vipPurchase",
     "pages/vipRecord/vipRecord",
     "pages/vipDetail/vipDetail",
     "pages/webview/webview"
   ],
+  "subPackages": [
+    {
+      "root": "pages/pageB/",
+      "pages": [
+        "deviceConnect0/deviceConnect0",
+        "deviceConnect1/deviceConnect1",
+        "deviceConnect2/deviceConnect2",
+        "deviceConnect3/deviceConnect3",
+        "deviceConnect4/deviceConnect4"
+      ]
+    }
+  ],
   "window": {
     "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#fff",

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/deviceConnect4/deviceConnect4.json

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

pages/deviceConnect0/deviceConnect0.js

@@ -1,8 +1,8 @@
 const app = getApp();
-import strings from '../../utils/strings.js';
-import routeUtil from '../../utils/routeUtil.js';
-import routePath from '../../utils/routePath.js'
-import routeRoot from '../../utils/routeRoot.js'
+import strings from '../../../utils/strings.js';
+import routeUtil from '../../../utils/routeUtil.js';
+import routePath from '../../../utils/routePath.js'
+import routeRoot from '../../../utils/routeRoot.js'
 
 Page({
   data: {
@@ -14,7 +14,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

@@ -1,4 +1,3 @@
-<!--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>
@@ -10,11 +9,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 +22,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 routeUtil from '../../utils/routeUtil.js';
-import routePath from '../../utils/routePath.js'
+import routeUtil from '../../../utils/routeUtil.js';
+import routePath from '../../../utils/routePath.js'
 
 Page({
   data: {

pages/pageB/deviceConnect1/deviceConnect1.json

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

pages/deviceConnect1/deviceConnect1.wxml

@@ -1,10 +1,8 @@
-<!-- pages/deviceRoter1/deviceRoter1.wxml -->
-<!-- pages/deviceRoter0/deviceRoter0.wxml -->
 <view class="deviceRoter deviceRoter1">
   <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">
     <view class="devicePic">
-      <image mode="widthFix" src="./../../img/e.png"></image>
+      <image mode="widthFix" src="./../../../img/e.png"></image>
     </view>
   </view>
   <view class="wifiInfo">
@@ -15,11 +13,11 @@
       <input wx:if="{{!isShowPwd}}" class="notShow" bindinput="setPwd" bindfocus="onFocus" bindblur="onBlur" 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,9 +1,9 @@
 const app = getApp();
-let xBlufi = require("../../utils/blufi/xBlufi.js");
-import strings from '../../utils/strings.js';
-import lexin_devices from '../../utils/lexin/devices';
-import junzheng_util from '../../utils/junzheng/util';
-import routeUtil from '../../utils/routeUtil.js';
+let xBlufi = require("../../../utils/blufi/xBlufi.js");
+import strings from '../../../utils/strings.js';
+import lexin_devices from '../../../utils/lexin/devices';
+import junzheng_util from '../../../utils/junzheng/util';
+
 Page({
 
   data: {
@@ -24,7 +24,7 @@ Page({
     isSubmit: false,
     islanya: false,
     isOnBluetooth: false,
-    imageUrl: "./../../img/f.png",
+    imageUrl: "./../../../img/f.png",
     connectDevice: {},
   },
 

pages/pageB/deviceConnect2/deviceConnect2.json

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

pages/deviceConnect3/deviceConnect3.js

@@ -1,10 +1,9 @@
 // pages/deviceConnect3/deviceConnect3.ts
 const app = getApp();
-let xBlufi = require("../../utils/blufi/xBlufi.js");
-import strings from '../../utils/strings.js';
-import routeUtil from '../../utils/routeUtil.js';
-import routePath from '../../utils/routePath.js'
-import routeRoot from '../../utils/routeRoot.js'
+let xBlufi = require("../../../utils/blufi/xBlufi.js");
+import strings from '../../../utils/strings.js';
+import routeUtil from '../../../utils/routeUtil.js';
+import routeRoot from '../../../utils/routeRoot.js'
 
 let percentIn = null;
 let errTi = null;
@@ -27,7 +26,7 @@ Page({
     customData: '',
     percent: 0,
     ruterStatus: 0, // 0 连接中 // 1 成功 // 2失败
-    imageUrl: "./../../img/g.png",
+    imageUrl: "./../../../img/g.png",
   },
 
   onLoad: function (options) {
@@ -116,7 +115,6 @@ Page({
               deviceId: deviceId,
               mac: deviceId,
               imageUrl: that.data.imageUrl,
-              // 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

@@ -9,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}}">

pages/deviceConnect4/deviceConnect4.js

@@ -1,12 +1,11 @@
 const app = getApp();
-import strings from '../../utils/strings.js';
-import routeUtil from '../../utils/routeUtil.js';
-import routePath from '../../utils/routePath.js'
-import routeRoot from '../../utils/routeRoot.js'
+import strings from '../../../utils/strings.js';
+import routeUtil from '../../../utils/routeUtil.js';
+import routeRoot from '../../../utils/routeRoot.js'
 
 const {
   BleUtil
-} = require('../../utils/blue_ble/util');
+} = require('../../../utils/blue_ble/util');
 
 let percentIn = null;
 Page({
@@ -27,7 +26,7 @@ Page({
     customData: '',
     percent: 0,
     ruterStatus: 0, // 0 连接中 // 1 成功 // 2失败
-    imageUrl: "./../../img/g.png",
+    imageUrl: "./../../../img/g.png",
   },
 
   onLoad: function (options) {
@@ -93,7 +92,6 @@ Page({
         deviceId: deviceId,
         mac: deviceId,
         imageUrl: that.data.imageUrl,
-        // imageUrl: "./../../img/min.png",
       }
       getCurrentPages()[0].addWifiDevice(device);
       // [{"deviceId":"BLUFI_7cdfa1fcbb24","name":"BLUFI_7cdfa1fcbb24","state":"online"}]

pages/pageB/deviceConnect4/deviceConnect4.json

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

pages/deviceConnect4/deviceConnect4.wxml

@@ -9,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}}">