Browse Source

feature: 设置wifi、设备详情唤醒路由路径处理

332777428@qq.com 6 months ago
parent
commit
d83e93145a

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

@@ -103,7 +103,7 @@ Page({
 
   goToWallpaper: function () {
     var param = '?param=' + JSON.stringify(this.data.device);
-    route_util.jumpParam('/pages/piano/wallpaper/wallpaper', param);
+    route_util.jumpParam(route_constant.wallpaper, param);
   },
 
   goToOta: function () {

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

@@ -453,9 +453,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;
+    route_util.jumpParam(route_constant.repeat, param);
   },
 
 

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

@@ -1,4 +1,4 @@
-<!-- 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">

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

@@ -1,4 +1,4 @@
-/* pages/repeat/repeat.wxss */
+
 .page-section{
   padding-left: 32rpx;
 }

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

@@ -1,4 +1,4 @@
-// pages/setWifi/setWifi.js
+
 const { BtHelper } = require("../../../devices/bt_helper");
 import EventManager from '../../../utils/event_bus'
 import { EnumCmdEvent, CmdEvent } from '../../../devices/cmd_key_event';

+ 1 - 2
pages/pageD/setWifi/setWifi.wxss

@@ -1,5 +1,4 @@
-/* pages/setWifi/setWifi.wxss */
-/* pages/setWifi/setWifi.wxss */
+
 .container {
     padding: 20px;
     margin-top: 88rpx;

+ 1 - 1
pages/piano/cropper/cropper.js

@@ -1,4 +1,4 @@
-// pages/piano/cropper/cropper.js
+
 
 const { BtCmd } = require('../../../devices/bluetooth/bt_cmd');
 import EventManager from '../../../utils/event_bus'

+ 1 - 1
pages/piano/cropper/cropper.wxss

@@ -1,4 +1,4 @@
-/* pages/piano/cropper/cropper.wxss */
+
 .container {
 	position: relative;
 	overflow: hidden;

+ 3 - 2
pages/piano/wallpaper/wallpaper.js

@@ -1,7 +1,8 @@
-// pages/piano/wallpaper/wallpaper.js
+
 const {
   deviceWallPaper
 } = require('../../../request/deviceListRequest')
+import route_constant from '../../../utils/route_constant';
 // const sharp = require('sharp');
 // const fs = require('fs');
 
@@ -45,7 +46,7 @@ Page({
   },
   footerTap() {
     var param = '?param=' + JSON.stringify(this.data.topImg ?? {});
-    route_util.jumpParam("../cropper/cropper", param);
+    route_util.jumpParam(route_constant.cropper, param);
   },
   imageTopTap() {
     this.setData({

+ 1 - 1
pages/piano/wallpaper/wallpaper.wxss

@@ -1,4 +1,4 @@
-/* pages/piano/wallpaper/wallpaper.wxss */
+
 
 .img_section {
     margin-top: 32rpx;