feature: 加入设备频道详细数据分包

app.json

@@ -3,7 +3,6 @@
     "pages/pageA/index/index",
     "pages/pageA/login/login",
     "pages/pageA/deviceList/deviceList",
-    "pages/channelDetail/channelDetail",
     "pages/setWifi/setWifi",
     "pages/vipPurchase/vipPurchase",
     "pages/vipRecord/vipRecord",
@@ -29,7 +28,8 @@
       "root": "pages/pageC/",
       "pages": [
         "about/about",
-        "aboutInfo/aboutInfo"
+        "aboutInfo/aboutInfo",
+        "channelDetail/channelDetail"
       ]
     },
     {

pages/channelDetail/channelDetail.json

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

pages/pageA/index/index.js

@@ -486,9 +486,7 @@ Page({
     var channelData = that.getChannelData();
     if (channelData.length > actionIndex) {
       store.setStore("channelDeta", channelData[actionIndex]);
-      wx.navigateTo({
-        url: './../channelDetails/channelDetails'
-      });
+      routeUtil.jump(routePath.channelDetail);
     }
   },
 

pages/channelDetail/channelDetail.js

@@ -1,7 +1,6 @@
-// pages/channelDetails/channelDetails.js
 const {
   pageByDevice
-} = require('../../utils/apiUtil.js');
+} = require('../../../utils/apiUtil.js');
 const app = getApp();
 Page({
 

pages/pageC/channelDetail/channelDetail.json

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

pages/channelDetail/channelDetail.wxml

@@ -1,4 +1,3 @@
-<!--pages/channelDetails/channelDetails.wxml-->
 <view class="channelDetails">
   <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>
@@ -13,9 +12,9 @@
               <text>{{thisChannel.channelName}}</text>
         </view>
       </view>
-      <!-- <image class="bgPic_1" src="./../../img/pd1.png" mode="heightFix"></image> -->
-      <image class="bgPic_3" src="./../../img/pd3.png" mode="widthFix"></image>
-      <image class="bgPic_2" src="./../../img/pd2.png" mode="heightFix"></image>
+      <!-- <image class="bgPic_1" src="./../../../img/pd1.png" mode="heightFix"></image> -->
+      <image class="bgPic_3" src="./../../../img/pd3.png" mode="widthFix"></image>
+      <image class="bgPic_2" src="./../../../img/pd2.png" mode="heightFix"></image>
     </view>
     <view class="list" style="height: calc(100vh - {{navBarHeight}}px - 260rpx);">
       <view class="info" wx:for="{{channelList}}">

pages/channelDetail/channelDetail.wxss

@@ -1,4 +1,3 @@
-/* pages/channelDetails/channelDetails.wxss */
 .headInfo{
   width: 100vw;
   height: 260rpx;

utils/routePath.js

@@ -20,6 +20,7 @@ const deviceConnect4 = "../../pageB/deviceConnect4/deviceConnect4";
 /// C
 const about = "../../pageC/about/about";
 const aboutInfo = "../../pageC/aboutInfo/aboutInfo";
+const channelDetail = "../../pageC/channelDetail/channelDetail";
 
 /// pageD
 const ota = "../../pageD/ota/ota";
@@ -54,6 +55,7 @@ module.exports = {
   /// C
   about: about,
   aboutInfo: aboutInfo,
+  channelDetail: channelDetail,
   /// D
   ota: ota,
   webview: webview,