feature: 处理君正和乐鑫方案wifi和4G连接跳转方式

pages/pageA/index/index.js

@@ -1035,8 +1035,6 @@ Page({
   ///添加设备
   jumpToAddDevice() {
     var that = this;
-    // routeUtil.jump("../deviceConnect4/deviceConnect4");
-    // return;
     var isLogin = that.getIsLogin();
     if (!isLogin) {
       routeUtil.jump(routePath.login);

pages/pageB/deviceConnect2/deviceConnect2.js

@@ -3,6 +3,8 @@ let xBlufi = require("../../../utils/blufi/xBlufi.js");
 import strings from '../../../utils/strings.js';
 import lexin_devices from '../../../utils/lexin/devices';
 import junzheng_util from '../../../utils/junzheng/util';
+import routeUtil from '../../../utils/routeUtil.js';
+import routePath from '../../../utils/routePath.js';
 
 Page({
 
@@ -147,10 +149,8 @@ Page({
               devicesList: [],
               isOnBluetooth: false,
             });
-            var param = JSON.stringify(that.data.connectDevice);
-            wx.redirectTo({
-              url: '../deviceConnect3/deviceConnect3?deviceId=' + options.data.deviceId + '&name=' + options.data.name + "&param=" + param,
-            });
+            var param = 'deviceId=' + options.data.deviceId + '&name=' + options.data.name + "&param=" + param;
+            routeUtil.redirectParam(routePath.deviceConnect3, param);
           }, 200);
         } else {
           that.data.isSubmit = false;
@@ -209,10 +209,8 @@ Page({
     var isJungzheng2 = junzheng_util.isJungzheng2(name);
 
     if (isJungzheng1 || isJungzheng2) {
-      var param = JSON.stringify(that.data.connectDevice);
-      wx.redirectTo({
-        url: '../deviceConnect4/deviceConnect4?deviceId=' + deviceId + '&name=' + name + "&param=" + param,
-      });
+      var param = 'deviceId=' + deviceId + '&name=' + name + "&param=" + JSON.stringify(that.data.connectDevice)
+      routeUtil.redirectParam(routePath.deviceConnect4, param);
       return;
     }
 

pages/pageB/deviceConnect3/deviceConnect3.js

@@ -1,4 +1,3 @@
-// pages/deviceConnect3/deviceConnect3.ts
 const app = getApp();
 let xBlufi = require("../../../utils/blufi/xBlufi.js");
 import strings from '../../../utils/strings.js';

utils/routeUtil.js

@@ -6,7 +6,7 @@ module.exports = {
   jumpParam: jumpParam,
   goBack: goBack,
   redirectTo: redirectTo,
-  redirectToParam: redirectToParam,
+  redirectParam: redirectParam,
 }
 
 ///获取最后一个界面的路由名称
@@ -42,7 +42,7 @@ async function redirectTo(url) {
 };
 
 //跳转,并且摧毁当前界面
-async function redirectToParam(url, param) {
+async function redirectParam(url, param) {
   if (param) {
     await wx.redirectTo({
       url: url + param,