Ver código fonte

feature: ota升级,唤醒路由路径处理

332777428@qq.com 6 meses atrás
pai
commit
bbe71ee69a

+ 2 - 1
pages/pageC/deviceDetail/deviceDetail.js

@@ -9,6 +9,7 @@ import {
   CmdEvent
 } from '../../../devices/cmd_key_event';
 import EventManager from '../../../utils/event_bus'
+import route_constant from '../../../utils/route_constant';
 import route_util from '../../../utils/route_util';
 
 Page({
@@ -118,7 +119,7 @@ Page({
       "otaData": this.data.updateData,
     }
     var param = '?param=' + JSON.stringify(p);
-    route_util.jumpParam('/pages/ota/ota', param);
+    route_util.jumpParam(route_constant.ota, param);
   },
   powerTap(e) {
     console.log(e)

+ 4 - 3
pages/pageC/deviceWake/deviceWake.js

@@ -7,6 +7,8 @@ const {
 } = require('../../../utils/api.js');
 
 import lexin_util from '../../../utils/lexin/util.js';
+import route_constant from '../../../utils/route_constant.js';
+import route_util from '../../../utils/route_util.js';
 
 Page({
   data: {
@@ -443,9 +445,8 @@ Page({
     var clientType = that.data.clientType;
     ///唤醒的设置特殊,智能这样用
     var deviceMac = that.data.deviceMac;
-    wx.navigateTo({
-      url: './../wakeList/wakeList?clientType=' + clientType + "&deviceMac=" + deviceMac,
-    })
+    var param = '?clientType=' + clientType + "&deviceMac=" + deviceMac;
+    route_util.jumpParam(route_constant.wakeList, param);
   },
 
   gorepeat(e) {

+ 1 - 1
pages/pageC/wakeList/wakeList.wxss

@@ -1,4 +1,4 @@
-/* pages/wakeList/wakeList.wxss */
+
 .wakeList{
   position: relative;
   height: 100%;

+ 1 - 1
pages/pageD/download/download.js

@@ -1,4 +1,4 @@
-// pages/download/download.ts
+
 Page({
 
   /**

+ 1 - 1
pages/pageD/download/download.wxml

@@ -1,4 +1,4 @@
-<!--pages/download/download.wxml-->
+
 <view class="download">
   <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>

+ 1 - 1
pages/pageD/download/download.wxss

@@ -1,4 +1,4 @@
-/* pages/download/download.wxss */
+
 .download .li {
   padding: 50rpx 66rpx 0;
 }

+ 1 - 1
pages/pageD/ota/ota.js

@@ -5,7 +5,7 @@ import route_util from '../../../utils/route_util';
 import route_constant from '../../../utils/route_constant.js';
 import { BtCmd } from '../../../devices/bluetooth/bt_cmd.js';
 
-// pages/OTA/ota.js
+
 Page({
 
   /**

+ 0 - 3
pages/pageD/ota/ota.wxss

@@ -1,6 +1,3 @@
-/* pages/OTA/ota.wxss */
-
-
 
 
 .item {