feature: 加入设备模式wifi、蓝牙、4G选择分包

app.js

@@ -20,7 +20,7 @@ App({
     baseUrl: env.prod.baseUrl,
 
     userInfo: null,
-    bannerList: bannerList,
+    bannerList: [],
     classifyProducts: "",
     statusBarHeight: 0,
     safeBottomHeight: 0,

app.json

@@ -6,7 +6,6 @@
     "pages/deviceWake/deviceWake",
     "pages/channelDetail/channelDetail",
     "pages/wakeList/wakeList",
-    "pages/deviceMode/deviceMode",
     "pages/connectBle/connectBle",
     "pages/setWifi/setWifi",
     "pages/vipPurchase/vipPurchase",
@@ -17,6 +16,7 @@
     {
       "root": "pages/pageB/",
       "pages": [
+        "deviceMode/deviceMode",
         "deviceConnect0/deviceConnect0",
         "deviceConnect1/deviceConnect1",
         "deviceConnect2/deviceConnect2",
@@ -29,7 +29,7 @@
       "pages": [
         "about/about",
         "aboutInfo/aboutInfo",
-        "pages/repeat/repeat"
+        "repeat/repeat"
       ]
     },
     {

pages/deviceMode/deviceMode.json

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

pages/deviceMode/deviceMode.js

@@ -1,5 +1,5 @@
-import routeUtil from '../../utils/routeUtil'
-import routePath from '../../utils/routePath.js'
+import routeUtil from '../../../utils/routeUtil'
+import routePath from '../../../utils/routePath.js'
 Page({
 
   data: {
@@ -13,17 +13,17 @@ Page({
     model: "",
     connectDevice: {},
     typeList: [{
-        "icon": "../../images/device/mode_2.png",
+        "icon": "../../../images/device/mode_2.png",
         "text": "WiFi模式",
         "type": 2,
       },
       {
-        "icon": "../../images/device/mode_1.png",
+        "icon": "../../../images/device/mode_1.png",
         "text": "蓝牙模式",
         "type": 1,
       },
       {
-        "icon": "../../images/device/mode_4.png",
+        "icon": "../../../images/device/mode_4.png",
         "text": "4G模式",
         "type": 4,
       },
@@ -119,7 +119,7 @@ Page({
     let _typeList = device.typeList
       .filter(e => (isWifi && e.type == 2) || isS2)
       .map(e => ({
-        icon: "../../images/device/mode_" + e.type + ".png",
+        icon: "../../../images/device/mode_" + e.type + ".png",
         text: _this.getModeName(e),
         type: e.type
       }));

pages/pageB/deviceMode/deviceMode.json

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

pages/deviceMode/deviceMode.wxml

@@ -1,5 +1,3 @@
-<!-- pages/deviceConMode/index.wxml -->
-<!-- pages/deviceRoter0/deviceRoter0.wxml -->
 <view class="main">
   <nav-bar class="nav_bar_c" 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>
   <image class="model_bg" src="../../images/device/mode_bg.png" mode="aspectFill" />

pages/deviceMode/deviceMode.wxss

@@ -1,5 +1,3 @@
-/* pages/deviceConMode/index.wxss */
-
 .main {
   position: relative;
   height: 100vh;

pages/pageC/pages/repeat/repeat.js

@@ -1,66 +0,0 @@
-// pages/pageC/pages/repeat/repeat.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})

pages/pageC/pages/repeat/repeat.json

@@ -1,3 +0,0 @@
-{
-  "usingComponents": {}
-}

pages/pageC/pages/repeat/repeat.wxml

@@ -1,2 +0,0 @@
-<!--pages/pageC/pages/repeat/repeat.wxml-->
-<text>pages/pageC/pages/repeat/repeat.wxml</text>

pages/pageC/pages/repeat/repeat.wxss

@@ -1 +0,0 @@
-/* pages/pageC/pages/repeat/repeat.wxss */

utils/routePath.js

@@ -6,6 +6,7 @@ const login = "../../pageA/login/login";
 const deviceList = "../../pageA/deviceList/deviceList";
 
 /// B
+const deviceMode = "../../pageB/deviceMode/deviceMode";
 const deviceConnect0 = "../../pageB/deviceConnect0/deviceConnect0";
 const deviceConnect1 = "../../pageB/deviceConnect1/deviceConnect1";
 const deviceConnect2 = "../../pageB/deviceConnect2/deviceConnect2";
@@ -38,6 +39,7 @@ module.exports = {
   login: login,
   deviceList: deviceList,
   /// B
+  deviceMode: deviceMode,
   deviceConnect0: deviceConnect0,
   deviceConnect1: deviceConnect1,
   deviceConnect2: deviceConnect2,