feature: 修改页面路径合集名称

devices/ble_manager.js

@@ -340,9 +340,9 @@ class bleManager {
     }
 
     const route_util = require('../utils/route_util');
-    const route_constant = require('../utils/route_constant');
-    const indexRoot = route_constant.indexRoot;
-    const connectBleRoot = route_constant.connectBleRoot;
+    const routePath = require('../utils/route_path');
+    const indexRoot = routePath.indexRoot;
+    const connectBleRoot = routePath.connectBleRoot;
     var lastPageRoute = route_util.getLastPageRoute();
     if (lastPageRoute != indexRoot && lastPageRoute != connectBleRoot) {
       console.log("搜索蓝牙设备失败，请返回首页0");

pages/connectBle/connectBle.js

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

pages/deviceConMode/index.js

@@ -1,5 +1,5 @@
 import routeUtil from '../../utils/route_util'
-import route_constant from '../../utils/route_constant.js'
+import routePath from '../../utils/route_path.js'
 Page({
 
   data: {
@@ -54,7 +54,7 @@ Page({
     if (type == 1) {
       // let device = e.currentTarget.dataset.data
       let json = JSON.stringify(this.data.connectDevice)
-      routeUtil.jumpParam(route_constant.connectBle, json)
+      routeUtil.jumpParam(routePath.connectBle, json)
       // wx.navigateTo({
       //   url: './../deviceDetail/detail',
       // });

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 route_constant from '../../utils/route_constant.js'
+import routePath from '../../utils/route_path.js'
 
 Page({
   data: {
@@ -46,7 +46,7 @@ Page({
           showCapsule: 1,
           title: '连接配网',
           callback: () => {
-            route_util.goBackRoute(route_constant.indexRoot);
+            route_util.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(route_constant.deviceConnect1, param);
+          route_util.jumpParam(routePath.deviceConnect1, param);
         }
       },
       fail(res) {
@@ -144,7 +144,7 @@ Page({
 
   ///返回到首页
   notRoter() {
-    route_util.goBackRoute(route_constant.indexRoot);
+    route_util.goBackRoute(routePath.indexRoot);
   },
 
   onUnload() {

pages/deviceConnect1/deviceConnect1.js

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

pages/deviceConnect3/deviceConnect3.js

@@ -3,7 +3,7 @@ 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 route_constant from '../../utils/route_constant.js'
+import routePath from '../../utils/route_path.js'
 let percentIn = null;
 let errTi = null;
 
@@ -206,7 +206,7 @@ Page({
   },
 
   goIndex() {
-    route_util.goBackRoute(route_constant.indexRoot);
+    route_util.goBackRoute(routePath.indexRoot);
   },
 
   onUnload: function () {

pages/deviceConnect4/deviceConnect4.js

@@ -1,7 +1,7 @@
 const app = getApp();
 import strings from '../../utils/strings.js';
 import route_util from '../../utils/route_util.js';
-import route_constant from '../../utils/route_constant.js'
+import routePath from '../../utils/route_path.js'
 const {
   BleUtil
 } = require('../../utils/blue_ble/util');
@@ -123,6 +123,6 @@ Page({
   },
 
   goIndex() {
-    route_util.goBackRoute(route_constant.indexRoot);
+    route_util.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 route_constant from '../../utils/route_constant.js'
+import routePath from '../../utils/route_path.js'
 import strings from '../../utils/strings.js';
 import store from '../../utils/store.js';
 import lexin_devices from '../../utils/lexin/devices';
@@ -74,10 +74,10 @@ Page({
     var clientTypes = lexin_devices.clientTypes;
     if (clientTypes.includes(device.clientType)) {
       var param = JSON.stringify(device);
-      routeUtil.jumpParam(route_constant.deviceConnect0, param);
+      routeUtil.jumpParam(routePath.deviceConnect0, param);
     } else if (device.clientType === "MW-S2" || device.clientType === "猫王妙播黑胶音箱(BLE)") {
       let json = JSON.stringify(device)
-      routeUtil.jumpParam(route_constant.connectBle, json)
+      routeUtil.jumpParam(routePath.connectBle, json)
     } else {
       wx.showToast({
         title: '暂不支持该设备',

pages/index/index.js

@@ -8,7 +8,7 @@ const {
 import time_util from '../../utils/time_util.js';
 import strings from '../../utils/strings.js';
 import store from '../../utils/store.js';
-import route_constant from '../../utils/route_constant.js';
+import routePath from '../../utils/route_path.js';
 import route_util from '../../utils/route_util.js';
 
 /// 乐鑫相关
@@ -541,7 +541,7 @@ Page({
       that.logOut();
       return;
     }
-    route_util.jump(route_constant.login);
+    route_util.jump(routePath.login);
   },
 
   ///退出登录
@@ -599,7 +599,7 @@ Page({
     var that = this;
     var isLogin = that.getIsLogin();
     if (!isLogin) {
-      route_util.jump(route_constant.login);
+      route_util.jump(routePath.login);
       return;
     }
 
@@ -1012,19 +1012,21 @@ Page({
     var item = e.currentTarget.dataset.item;
     try {
       if (strings.isEmpty(item.forwardUrl)) {
-        return
+        return;
       }
+      // 内链，暂时不支持
       if (item.forwardType == 0) {
-        // 内链，暂时不支持
         route_util.jump(item.forwardUrl, item.forwardUrl);
-      } else if (item.forwardType == 1) {
-        // 外链
-        route_util.jumpParam(route_constant.webview, item.forwardUrl);
+      }
+      // 外链
+      else if (item.forwardType == 1) {
+        route_util.jumpParam(routePath.webview, item.forwardUrl);
+      } else {
+
       }
     } catch (err) {
       console.log("跳转失败", err)
     }
-
   },
 
   ///去充值内容会员
@@ -1039,10 +1041,10 @@ Page({
     // return;
     var isLogin = that.getIsLogin();
     if (!isLogin) {
-      route_util.jump(route_constant.login);
+      route_util.jump(routePath.login);
       return;
     }
-    route_util.jump(route_constant.deviceList);
+    route_util.jump(routePath.deviceList);
   },
 
   // 关于我们

pages/login/login.js

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

pages/ota/ota.js

@@ -2,7 +2,7 @@ const { BtHelper } = require("../../devices/bt_helper");
 import { EnumCmdEvent, CmdEvent } from '../../devices/cmd_key_event';
 import EventManager from '../../utils/event_bus'
 import route_util from '../../utils/route_util';
-import route_constant from '../../utils/route_constant.js';
+import routePath from '../../utils/route_path.js';
 import { BtCmd } from '../../devices/bluetooth/bt_cmd.js';
 import strings from '../../utils/strings.js';
 const {
@@ -145,7 +145,7 @@ Page({
 
   },
   goToWifi() {
-    route_util.jump(route_constant.setWifi)
+    route_util.jump(routePath.setWifi)
   },
   sendUrlData() {
     let url = this.data._otaData.url ?? ""

utils/lexin/jump.js

@@ -7,10 +7,10 @@ module.exports = {
 function toChannelIndex(index, callback) {
   var pages = getCurrentPages();
   const route_util = require('../route_util');
-  const route_constant = require('../route_constant');
+  const routePath = require('../route_path');
   var isLogin = pages[0].getIsLogin();
   if (!isLogin) {
-    route_util.jump(route_constant.login);
+    route_util.jump(routePath.login);
     return;
   }
 
@@ -75,6 +75,6 @@ function toChannelIndex(index, callback) {
 ///关于我们
 function toAboutUs() {
   const route_util = require('../route_util');
-  const route_constant = require('../route_constant');
-  route_util.jump(route_constant.about);
+  const routePath = require('../route_path');
+  route_util.jump(routePath.about);
 };

utils/route_constant.js

@@ -1,42 +0,0 @@
-///路由
-const indexRoot = "pages/index/index";
-const loginRoot = "pages/login/login";
-const connectBleRoot = "pages/connectBle/connectBle";
-
-///跳转路径
-const index = "../index/index";
-const login = "../login/login";
-const about = "../about/about";
-const deviceConnect0 = "../deviceConnect0/deviceConnect0";
-const deviceConnect1 = "../deviceConnect1/deviceConnect1";
-const deviceConnect2 = "../deviceConnect2/deviceConnect2";
-
-const setWifi = "../setWifi/setWifi";
-
-/// 抽奖记录
-const deviceList = "../deviceList/deviceList";
-const connectMode = "../deviceConMode/index";
-const connectBle = "../connectBle/connectBle";
-
-
-const webview = "../components/webview/webview";
-
-module.exports = {
-  ///路由
-  indexRoot: indexRoot,
-  loginRoot: loginRoot,
-  connectBleRoot: connectBleRoot,
-
-  ///跳转路径
-  index: index,
-  login: login,
-  about: about,
-  deviceConnect0: deviceConnect0,
-  deviceConnect1: deviceConnect1,
-  deviceConnect2: deviceConnect2,
-  deviceList: deviceList,
-  connectMode: connectMode,
-  connectBle: connectBle,
-  setWifi: setWifi,
-  webview: webview,
-}

utils/route_util.js

@@ -76,7 +76,7 @@ async function goBack(pages) {
 
 ///返回到首页，不关闭当前界面
 async function goBackHomePage() {
-  const route_constant = require('./route_constant.js');
+  const route_constant = require('./route_path.js');
   await goBackRoute(route_constant.indexRoot);
 };