feat: 路由切换修复

pages/index/index.js

@@ -426,7 +426,7 @@ Page({
     var channelData = that.getChannelData();
     if (channelData.length > actionIndex) {
       constant.store.setStore("channelDeta", channelData[actionIndex]);
-      constant.routeUtil.jump(constant.routePath.channelDetail);
+      constant.routeUtil.jump(constant.routePath.channelDetailIndex);
     }
   },
 
@@ -480,7 +480,7 @@ Page({
       that.logOut();
       return;
     }
-    constant.routeUtil.jump(constant.routePath.login);
+    constant.routeUtil.jump(constant.routePath.loginIndex);
   },
 
   ///退出登录
@@ -535,7 +535,7 @@ Page({
     var that = this;
     var isLogin = that.getIsLogin();
     if (!isLogin) {
-      constant.routeUtil.jump(constant.routePath.login);
+      constant.routeUtil.jump(constant.routePath.loginIndex);
       return;
     }
 
@@ -561,7 +561,7 @@ Page({
     let curDevice = deviceList[index]
     if (index === deviceListSelect && device.state === "online") {
       var param = "?param=" + JSON.stringify(curDevice);
-      constant.routeUtil.jumpParam(constant.routePath.deviceDetail, param);
+      constant.routeUtil.jumpParam(constant.routePath.deviceDetailIndex, param);
     } else if (device.state === "offline") {
 
       var deviceListSelect = that.getDeviceListSelect();
@@ -641,7 +641,7 @@ Page({
     };
     var device = deviceList[deviceListSelect];
     var param = '?deviceId=' + device.deviceId + "&clientType=" + device.ProdModel;
-    constant.routeUtil.jumpParam(constant.routePath.deviceWake, param);
+    constant.routeUtil.jumpParam(constant.routePath.deviceWakeIndex, param);
   },
 
   ///删除当前设备
@@ -960,7 +960,7 @@ Page({
       if (item.forwardType == 0) {
         var param = "?param=" + item.forwardUrl;
         constant.app.webSkipUrl = item.forwardUrl;
-        constant.routeUtil.jumpParam(constant.routePath.webview, param);
+        constant.routeUtil.jumpParam(constant.routePath.webviewIndex, param);
       }
       // 外链
       else if (item.forwardType == 1) {
@@ -984,10 +984,10 @@ Page({
     var isLogin = that.getIsLogin();
     if (!isLogin) {
       var param = "?toDeviceList=" + true;
-      constant.routeUtil.jumpParam(constant.routePath.login, param);
+      constant.routeUtil.jumpParam(constant.routePath.loginIndex, param);
       return;
     }
-    constant.routeUtil.jump(constant.routePath.deviceList);
+    constant.routeUtil.jump(constant.routePath.deviceListIndex);
   },
 
   // 关于我们

utils/lexin/jump.js

@@ -10,7 +10,7 @@ function toChannelIndex(index, callback) {
   const routePath = require('../routePath');
   var isLogin = pages[0].getIsLogin();
   if (!isLogin) {
-    routeUtil.jump(routePath.login);
+    routeUtil.jump(routePath.loginIndex);
     return;
   }
 
@@ -76,5 +76,5 @@ function toChannelIndex(index, callback) {
 function toAboutUs() {
   const routeUtil = require('../routeUtil');
   const routePath = require('../routePath');
-  routeUtil.jump(routePath.about);
+  routeUtil.jump(routePath.aboutIndex);
 };

utils/routePath.js

@@ -3,7 +3,9 @@
 /// A
 const index = "../../index/index";
 const login = "../../pageA/login/login";
+const loginIndex = "../pageA/login/login";
 const deviceList = "../../pageA/deviceList/deviceList";
+const deviceListIndex = "../pageA/deviceList/deviceList";
 
 /// B
 const repeat = "../../pageB/repeat/repeat";
@@ -11,6 +13,7 @@ const wakeList = "../../pageB/wakeList/wakeList";
 const connectBle = "../../pageB/connectBle/connectBle";
 const deviceMode = "../../pageB/deviceMode/deviceMode";
 const deviceWake = "../../pageB/deviceWake/deviceWake";
+const deviceWakeIndex = "../pageB/deviceWake/deviceWake";
 const deviceConnect0 = "../../pageB/deviceConnect0/deviceConnect0";
 const deviceConnect1 = "../../pageB/deviceConnect1/deviceConnect1";
 const deviceConnect2 = "../../pageB/deviceConnect2/deviceConnect2";
@@ -19,34 +22,41 @@ const deviceConnect4 = "../../pageB/deviceConnect4/deviceConnect4";
 
 /// C
 const about = "../../pageC/about/about";
+const aboutIndex = "../pageC/about/about";
 const vipDetail = "../../pageC/vipDetail/vipDetail";
 const vipRecord = "../../pageC/vipRecord/vipRecord";
 const vipPurchase = "../../pageC/vipPurchase/vipPurchase";
 const aboutInfo = "../../pageC/aboutInfo/aboutInfo";
 const channelDetail = "../../pageC/channelDetail/channelDetail";
+const channelDetailIndex = "../pageC/channelDetail/channelDetail";
 
 /// pageD
 const ota = "../../pageD/ota/ota";
 const setWifi = "../../pageD/setWifi/setWifi";
 const webview = "../../pageD/webview/webview";
+const webviewIndex = "../pageD/webview/webview";
 const download = "../../pageC/download/download";
 
 /// piano
 const cropper = "../../piano/cropper/cropper";
 const wallpaper = "../../piano/wallpaper/wallpaper";
 const deviceDetail = "../../piano/deviceDetail/deviceDetail";
+const deviceDetailIndex = "../piano/deviceDetail/deviceDetail";
 
 module.exports = {
   /// A
   index: index,
   login: login,
+  loginIndex: loginIndex,
   deviceList: deviceList,
+  deviceListIndex: deviceListIndex,
   /// B
   repeat: repeat,
   wakeList: wakeList,
   connectBle: connectBle,
   deviceMode: deviceMode,
   deviceWake: deviceWake,
+  deviceWakeIndex: deviceWakeIndex,
   deviceConnect0: deviceConnect0,
   deviceConnect1: deviceConnect1,
   deviceConnect2: deviceConnect2,
@@ -54,19 +64,23 @@ module.exports = {
   deviceConnect4: deviceConnect4,
   /// C
   about: about,
+  aboutIndex: aboutIndex,
   vipDetail: vipDetail,
   vipRecord: vipRecord,
   vipPurchase: vipPurchase,
   aboutInfo: aboutInfo,
   channelDetail: channelDetail,
+  channelDetailIndex: channelDetailIndex,
   /// D
   ota: ota,
   setWifi: setWifi,
   webview: webview,
+  webviewIndex: webviewIndex,
   download: download,
 
   /// piano
   cropper: cropper,
   wallpaper: wallpaper,
   deviceDetail: deviceDetail,
+  deviceDetailIndex: deviceDetailIndex,
 }