Browse Source

feature: 对唤醒重复设置进行分包

332777428@qq.com 4 tháng trước cách đây
mục cha
commit
0760d52702

+ 2 - 2
app.json

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

+ 5 - 3
pages/deviceWake/deviceWake.js

@@ -8,6 +8,8 @@ const {
 
 import lexin_devices from '../../utils/lexin/devices.js';
 import lexin_util from '../../utils/lexin/util.js';
+import routePath from '../../utils/routePath.js';
+import routeUtil from '../../utils/routeUtil.js';
 
 Page({
   data: {
@@ -455,9 +457,9 @@ Page({
     var that = this;
     that.data.repeatIndex = e.currentTarget.dataset.index;
     that.data.week_actives = e.currentTarget.dataset.index === "0" ? that.data.alarm_id_0.week_actives : that.data.alarm_id_1.week_actives;
-    wx.navigateTo({
-      url: './../repeat/repeat?week_actives=' + that.data.week_actives
-    })
+
+    var param = '?week_actives=' + that.data.week_actives;
+    routeUtil.jumpParam(routePath.repeat, param);
   },
 
 

+ 32 - 16
pages/repeat/repeat.js

@@ -1,33 +1,49 @@
-// pages/repeat/repeat.js
 Page({
 
-  /**
-   * 页面的初始数据
-   */
   data: {
     nvabarData: {
       showCapsule: 1, //是否显示左上角图标   1表示显示    0表示不显示
       title: '设置重复', //导航栏 中间的标题
 
     },
-    items: [
-      {value: '0', name: '周日'},
-      {value: '1', name: '周一'},
-      {value: '2', name: '周二'},
-      {value: '3', name: '周三'},
-      {value: '4', name: '周四'},
-      {value: '5', name: '周五'},
-      {value: '6', name: '周六'}
+    items: [{
+        value: '0',
+        name: '周日'
+      },
+      {
+        value: '1',
+        name: '周一'
+      },
+      {
+        value: '2',
+        name: '周二'
+      },
+      {
+        value: '3',
+        name: '周三'
+      },
+      {
+        value: '4',
+        name: '周四'
+      },
+      {
+        value: '5',
+        name: '周五'
+      },
+      {
+        value: '6',
+        name: '周六'
+      }
     ],
-    week_actives: [0,0,0,0,0,0,0],
+    week_actives: [0, 0, 0, 0, 0, 0, 0],
   },
   action(e) {
     this.data.week_actives[e.currentTarget.dataset.index] = this.data.week_actives[e.currentTarget.dataset.index] === 0 ? 1 : 0;
     this.setData({
       week_actives: this.data.week_actives
     });
-    getCurrentPages().map((v)=> {
-      if(v.route === "pages/deviceWake/deviceWake") {
+    getCurrentPages().map((v) => {
+      if (v.route === "pages/deviceWake/deviceWake") {
         v.setRepeat(this.data.week_actives);
       };
     })
@@ -37,7 +53,7 @@ Page({
    */
   onLoad(options) {
     const week_actives = [];
-    options.week_actives.split(",").map((v)=>{
+    options.week_actives.split(",").map((v) => {
       week_actives.push(parseInt(v, 10));
     });
     this.setData({

+ 5 - 0
pages/pageC/repeat/repeat.json

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

+ 1 - 2
pages/repeat/repeat.wxml

@@ -1,10 +1,9 @@
-<!-- pages/repeat/repeat.wxml -->
 <view>
   <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="page-section">
     <view data-index="{{index}}" bindtap="action" class="list" wx:for="{{week_actives}}">
       <text>{{items[index].name}}</text>
-      <image wx:if="{{week_actives[index] === 1}}" src="./../../img/gg.png" style="height:28rpx; width:28rpx;" mode="aspectFit"></image>
+      <image wx:if="{{week_actives[index] === 1}}" src="./../../../img/gg.png" style="height:28rpx; width:28rpx;" mode="aspectFit"></image>
     </view>
   </view>
 </view>

+ 10 - 8
pages/repeat/repeat.wxss

@@ -1,21 +1,23 @@
-/* pages/repeat/repeat.wxss */
-.page-section{
+.page-section {
   padding-left: 32rpx;
 }
-.page-section .list{
+
+.page-section .list {
   height: 100rpx;
   display: flex;
   align-items: center;
   border-bottom: 1rpx solid #d8d8d8;
   position: relative;
 }
-.page-section .list text{
+
+.page-section .list text {
   font-size: 30epx;
-font-weight: 400;
-color: #353535;
-line-height: 42epx;
+  font-weight: 400;
+  color: #353535;
+  line-height: 42epx;
 }
-.page-section .list image{
+
+.page-section .list image {
   height: 28rpx;
   position: absolute;
   top: 36rpx;

+ 0 - 5
pages/repeat/repeat.json

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

+ 2 - 0
utils/routePath.js

@@ -15,6 +15,7 @@ const deviceConnect4 = "../../pageB/deviceConnect4/deviceConnect4";
 /// C
 const about = "../../pageC/about/about";
 const aboutInfo = "../../pageC/aboutInfo/aboutInfo";
+const repeat = "../../pageC/repeat/repeat";
 
 /// pageD
 const ota = "../../pageD/ota/ota";
@@ -45,6 +46,7 @@ module.exports = {
   /// C
   about: about,
   aboutInfo: aboutInfo,
+  repeat: repeat,
   /// D
   ota: ota,
   webview: webview,