feature: 解决名称不对称问题

pages/connectBle/connectBle.js

@@ -2,8 +2,8 @@ const {
   BtHelper
 } = require('../../devices/bt_helper');
 
-import routePath from '../../utils/route_path.js'
-import route_util from '../../utils/route_util.js';
+import routeRoot from '../../utils/routeRoot.js'
+import routUtil from '../../utils/routUtil.js';
 Page({
   data: {
     connectDevice: {},
@@ -44,18 +44,18 @@ Page({
     console.log("要连接设备：", connectDevice)
     BtHelper.getInstance().startScan(connectDevice,
       async function (b) {
-        if (!b) {
-          that.setStatus(1);
+          if (!b) {
+            that.setStatus(1);
+          }
+        },
+        async function (res) {
+          await BtHelper.getInstance().stopSearch();
+          console.log("搜索到设备11：", res);
+          that.setStatus(2);
+          that.data.connectDevice.deviceId = res.deviceId;
+          that.data.connectDevice.connectable = res.connectable;
+          that.data.connectDevice.mac = res.mac;
         }
-      },
-      async function (res) {
-        await BtHelper.getInstance().stopSearch();
-        console.log("搜索到设备11：", res);
-        that.setStatus(2);
-        that.data.connectDevice.deviceId = res.deviceId;
-        that.data.connectDevice.connectable = res.connectable;
-        that.data.connectDevice.mac = res.mac;
-      }
     );
   },
 
@@ -65,7 +65,7 @@ Page({
     var connectDevice = that.data.connectDevice;
     var isTheSame = getCurrentPages()[0].isTheSameBlue(connectDevice);
     if (isTheSame) {
-      route_util.goBackRoute(routePath.indexRoot);
+      routUtil.goBackRoute(routeRoot.indexRoot);
       return;
     }
 
@@ -82,7 +82,7 @@ Page({
         device.state = 'online';
         device.imageUrl = device.img;
         getCurrentPages()[0].addBlueDevice(device);
-        route_util.goBackRoute(routePath.indexRoot);
+        routUtil.goBackRoute(routeRoot.indexRoot);
       }
     }, true);
   },

pages/deviceConMode/index.js

@@ -1,5 +1,5 @@
-import routeUtil from '../../utils/route_util'
-import routePath from '../../utils/route_path.js'
+import routeUtil from '../../utils/routUtil'
+import routePath from '../../utils/routePath.js'
 Page({
 
   data: {

pages/deviceConnect0/deviceConnect0.js

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

pages/deviceConnect1/deviceConnect1.js

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

pages/deviceConnect3/deviceConnect3.js

@@ -2,8 +2,8 @@
 const app = getApp();
 let xBlufi = require("../../utils/blufi/xBlufi.js");
 import strings from '../../utils/strings.js';
-import route_util from '../../utils/route_util.js';
-import routePath from '../../utils/route_path.js'
+import routUtil from '../../utils/routUtil.js';
+import routePath from '../../utils/routePath.js'
 let percentIn = null;
 let errTi = null;
 
@@ -206,7 +206,7 @@ Page({
   },
 
   goIndex() {
-    route_util.goBackRoute(routePath.indexRoot);
+    routUtil.goBackRoute(routePath.indexRoot);
   },
 
   onUnload: function () {

pages/deviceConnect4/deviceConnect4.js

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

pages/deviceList/deviceList.js

@@ -1,7 +1,7 @@
 const app = getApp()
 import dRequest from '../../request/deviceListRequest'
-import routeUtil from '../../utils/route_util'
-import routePath from '../../utils/route_path.js'
+import routeUtil from '../../utils/routUtil'
+import routePath from '../../utils/routePath.js'
 import strings from '../../utils/strings.js';
 import store from '../../utils/store.js';
 import lexin_devices from '../../utils/lexin/devices';

pages/login/login.js

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

utils/routeUtil.js

@@ -76,8 +76,8 @@ async function goBack(pages) {
 
 ///返回到首页，不关闭当前界面
 async function goBackHomePage() {
-  const routePath = require('./routePath.js');
-  await goBackRoute(routePath.indexRoot);
+  const routeRoot = require('./routeRoot.js');
+  await goBackRoute(routeRoot.indexRoot);
 };
 
 ///返回到某个界面，不替换当前界面