Selaa lähdekoodia

feature: 解决路由方法名称报错的问题

332777428@qq.com 4 kuukautta sitten
vanhempi
commit
488ddffff9

+ 3 - 3
pages/connectBle/connectBle.js

@@ -3,7 +3,7 @@ const {
 } = require('../../devices/bt_helper');
 
 import routeRoot from '../../utils/routeRoot.js'
-import routUtil from '../../utils/routUtil.js';
+import routeUtil from '../../utils/routeUtil.js';
 Page({
   data: {
     connectDevice: {},
@@ -65,7 +65,7 @@ Page({
     var connectDevice = that.data.connectDevice;
     var isTheSame = getCurrentPages()[0].isTheSameBlue(connectDevice);
     if (isTheSame) {
-      routUtil.goBackRoute(routeRoot.indexRoot);
+      routeUtil.goBackRoute(routeRoot.indexRoot);
       return;
     }
 
@@ -82,7 +82,7 @@ Page({
         device.state = 'online';
         device.imageUrl = device.img;
         getCurrentPages()[0].addBlueDevice(device);
-        routUtil.goBackRoute(routeRoot.indexRoot);
+        routeUtil.goBackRoute(routeRoot.indexRoot);
       }
     }, true);
   },

+ 1 - 1
pages/deviceConMode/index.js

@@ -1,4 +1,4 @@
-import routeUtil from '../../utils/routUtil'
+import routeUtil from '../../utils/routeUtil'
 import routePath from '../../utils/routePath.js'
 Page({
 

+ 4 - 4
pages/deviceConnect0/deviceConnect0.js

@@ -1,6 +1,6 @@
 const app = getApp();
 import strings from '../../utils/strings.js';
-import routUtil from '../../utils/routUtil.js';
+import routeUtil from '../../utils/routeUtil.js';
 import routePath from '../../utils/routePath.js'
 import routeRoot from '../../utils/routeRoot.js'
 
@@ -47,7 +47,7 @@ Page({
           showCapsule: 1,
           title: '连接配网',
           callback: () => {
-            routUtil.goBackRoute(routeRoot.indexRoot);
+            routeUtil.goBackRoute(routeRoot.indexRoot);
           }
         },
       })
@@ -109,7 +109,7 @@ Page({
       success(res) {
         if (that.data.scopeBluetooth && that.data.userFuzzyLocation) {
           var param = JSON.stringify(that.data.connectDevice);
-          routUtil.jumpParam(routePath.deviceConnect1, param);
+          routeUtil.jumpParam(routePath.deviceConnect1, param);
         }
       },
       fail(res) {
@@ -145,7 +145,7 @@ Page({
 
   ///返回到首页
   notRoter() {
-    routUtil.goBackRoute(routeRoot.indexRoot);
+    routeUtil.goBackRoute(routeRoot.indexRoot);
   },
 
   onUnload() {

+ 2 - 2
pages/deviceConnect1/deviceConnect1.js

@@ -1,5 +1,5 @@
 const app = getApp();
-import routUtil from '../../utils/routUtil.js';
+import routeUtil from '../../utils/routeUtil.js';
 import routePath from '../../utils/routePath.js'
 
 Page({
@@ -136,7 +136,7 @@ Page({
 
     app.globalData.ssid = that.data.ssid;
     app.globalData.pwdData = that.data.pwdData;
-    routUtil.jumpParam(routePath.deviceConnect2, that.data.connectDevice);
+    routeUtil.jumpParam(routePath.deviceConnect2, that.data.connectDevice);
 
   },
 

+ 2 - 2
pages/deviceConnect3/deviceConnect3.js

@@ -2,7 +2,7 @@
 const app = getApp();
 let xBlufi = require("../../utils/blufi/xBlufi.js");
 import strings from '../../utils/strings.js';
-import routUtil from '../../utils/routUtil.js';
+import routeUtil from '../../utils/routeUtil.js';
 import routePath from '../../utils/routePath.js'
 import routeRoot from '../../utils/routeRoot.js'
 
@@ -208,7 +208,7 @@ Page({
   },
 
   goIndex() {
-    routUtil.goBackRoute(routeRoot.indexRoot);
+    routeUtil.goBackRoute(routeRoot.indexRoot);
   },
 
   onUnload: function () {

+ 2 - 2
pages/deviceConnect4/deviceConnect4.js

@@ -1,6 +1,6 @@
 const app = getApp();
 import strings from '../../utils/strings.js';
-import routUtil from '../../utils/routUtil.js';
+import routeUtil from '../../utils/routeUtil.js';
 import routePath from '../../utils/routePath.js'
 import routeRoot from '../../utils/routeRoot.js'
 
@@ -125,6 +125,6 @@ Page({
   },
 
   goIndex() {
-    routUtil.goBackRoute(routeRoot.indexRoot);
+    routeUtil.goBackRoute(routeRoot.indexRoot);
   },
 })

+ 1 - 1
pages/deviceList/deviceList.js

@@ -1,6 +1,6 @@
 const app = getApp()
 import dRequest from '../../request/deviceListRequest'
-import routeUtil from '../../utils/routUtil'
+import routeUtil from '../../utils/routeUtil'
 import routePath from '../../utils/routePath.js'
 import strings from '../../utils/strings.js';
 import store from '../../utils/store.js';

+ 2 - 2
pages/login/login.js

@@ -4,7 +4,7 @@ const {
 } = require('./../../utils/api.js')
 
 import routePath from '../../utils/routePath.js';
-import routUtil from '../../utils/routUtil.js';
+import routeUtil from '../../utils/routeUtil.js';
 
 Page({
 
@@ -65,7 +65,7 @@ Page({
                 });
               }, function () {
                 setTimeout(() => {
-                  routUtil.redirectTo(routePath.deviceList);
+                  routeUtil.redirectTo(routePath.deviceList);
                 }, 2000);
               }, function () {
                 wx.hideLoading();