feature: 统一带参跳转处理

pages/deviceDetail/deviceDetail.js

@@ -25,19 +25,16 @@ Page({
 
 
   goToWallpaper: function () {
-    let newParam = JSON.stringify(this.data.device);
-    routeUtil.jumpParam('/pages/piano/wallpaper/wallpaper', newParam)
+    var param = "?param=" + JSON.stringify(this.data.device);
+    routeUtil.jumpParam('/pages/piano/wallpaper/wallpaper', param);
   },
 
   goToOta: function () {
-    let param = {
+    var p = {
       "device": this.data.device,
     }
-    let newParam = JSON.stringify(param);
-    // wx.navigateTo({
-    //   url: '/pages/ota/ota' + "?param=" + param
-    // });
-    routeUtil.jumpParam('/pages/ota/ota', newParam)
+    var param = "?param=" +  JSON.stringify(p);
+    routeUtil.jumpParam('/pages/ota/ota', param);
   },
   powerTap(e) {
     console.log(e)

pages/deviceMode/deviceMode.js

@@ -52,18 +52,12 @@ Page({
     console.log("选择模式", type)
     ///蓝牙模式
     if (type == 1) {
-      // let device = e.currentTarget.dataset.data
-      let json = JSON.stringify(this.data.connectDevice)
-      routeUtil.jumpParam(routePath.connectBle, json)
-      // wx.navigateTo({
-      //   url: './../deviceDetail/detail',
-      // });
+      var param = "?param=" + JSON.stringify(this.data.connectDevice);
+      routeUtil.jumpParam(routePath.connectBle, param);
     }
     ///Wifi模式
     else if (type == 2) {
-      wx.navigateTo({
-        url: './../deviceConnect0/deviceConnect0',
-      });
+      routeUtil.jump(routePath.deviceConnect0);
     } else if (type == 3) {
       // btHelper.stopSearch()
     }

pages/pageA/deviceList/deviceList.js

@@ -73,11 +73,11 @@ Page({
 
     var clientTypes = lexin_devices.clientTypes;
     if (clientTypes.includes(device.clientType)) {
-      var param = JSON.stringify(device);
+      var param = "?param=" + JSON.stringify(device);
       routeUtil.jumpParam(routePath.deviceConnect0, param);
     } else if (device.clientType === "MW-S2" || device.clientType === "猫王妙播黑胶音箱(BLE)") {
-      let json = JSON.stringify(device)
-      routeUtil.jumpParam(routePath.connectBle, json)
+      var param = "?param=" + JSON.stringify(device);
+      routeUtil.jumpParam(routePath.connectBle, param);
     } else {
       wx.showToast({
         title: '暂不支持该设备',

pages/pageA/index/index.js

@@ -621,7 +621,8 @@ Page({
     var deviceList = that.getDeviceList();
     let curDevice = deviceList[index]
     if (index === deviceListSelect && device.state === "online") {
-      routeUtil.jumpParam('/pages/deviceDetail/detail', JSON.stringify(curDevice))
+    var param = "?param=" + JSON.stringify(curDevice);
+    routeUtil.jumpParam('/pages/deviceDetail/detail', param);
     } else if (device.state === "offline") {
 
       var deviceListSelect = that.getDeviceListSelect();
@@ -1016,7 +1017,8 @@ Page({
       }
       // 外链
       else if (item.forwardType == 1) {
-        routeUtil.jumpParam(routePath.webview, item.forwardUrl);
+        var param = "?param=" + item.forwardUrl;
+        routeUtil.jumpParam(routePath.webview, param);
       } else {
 
       }

pages/pageB/deviceConnect0/deviceConnect0.js

@@ -108,7 +108,7 @@ Page({
     wx.openBluetoothAdapter({
       success(res) {
         if (that.data.scopeBluetooth && that.data.userFuzzyLocation) {
-          var param = JSON.stringify(that.data.connectDevice);
+          var param = "?param=" + JSON.stringify(that.data.connectDevice);
           routeUtil.jumpParam(routePath.deviceConnect1, param);
         }
       },

pages/pageB/deviceConnect1/deviceConnect1.js

@@ -136,8 +136,9 @@ Page({
 
     app.globalData.ssid = that.data.ssid;
     app.globalData.pwdData = that.data.pwdData;
-    routeUtil.jumpParam(routePath.deviceConnect2, that.data.connectDevice);
 
+    var param = "?param=" + that.data.connectDevice);
+    routeUtil.jumpParam(routePath.deviceConnect2, param);
   },
 
   notRoter() {

pages/pageB/deviceConnect2/deviceConnect2.js

@@ -183,10 +183,6 @@ Page({
     var that = this;
     const devicesList = that.data.devicesList;
     if (devicesList.length < 1) {
-      // var url = "../deviceConnect4/deviceConnect4";
-      // var p = JSON.stringify(that.data.connectDevice);
-      // var param = "?deviceId=" + deviceId + "&param=" + p;
-      // routeUtil.jumpParams(url, param);
       wx.showToast({
         title: '请短按设备配对键',
         icon: 'none',

pages/piano/wallpaper/wallpaper.js

@@ -33,11 +33,12 @@ Page({
 
   },
   footerTap() {
-    let parma = {
+    var p = {
       "deviceId": this.data._device.deviceId,
       "topImg": this.data.topImg
     }
-    routeUtil.jumpParam("../cropper/cropper", JSON.stringify(parma))
+    var param = "?param=" +  JSON.stringify(p);
+    routeUtil.jumpParam("../cropper/cropper", param);
   },
   imageTopTap() {
     this.setData({

utils/routeUtil.js

@@ -28,7 +28,7 @@ async function jump(url) {
 async function jumpParam(url, param) {
   if (param) {
     await wx.navigateTo({
-      url: url + "?param=" + param,
+      url: url + param,
     });
   } else {
     await jump(url);