Browse Source

feature: 处理设备详情和weview分包

332777428@qq.com 4 months ago
parent
commit
33bba1287e

+ 7 - 2
app.json

@@ -16,8 +16,7 @@
     "pages/setWifi/setWifi",
     "pages/vipPurchase/vipPurchase",
     "pages/vipRecord/vipRecord",
-    "pages/vipDetail/vipDetail",
-    "pages/webview/webview"
+    "pages/vipDetail/vipDetail"
   ],
   "subPackages": [
     {
@@ -31,6 +30,12 @@
       ]
     },
     {
+      "root": "pages/pageD/",
+      "pages": [
+        "webview/webview"
+      ]
+    },
+    {
       "root": "pages/piano/",
       "pages": [
         "cropper/cropper",

+ 2 - 2
pages/pageA/index/index.js

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

+ 0 - 1
pages/webview/webview.js

@@ -1,4 +1,3 @@
-// pages/webview/webview.js
 Page({
   data: {
     url: ''

pages/webview/webview.json → pages/pageD/webview/webview.json


+ 1 - 0
pages/pageD/webview/webview.wxml

@@ -0,0 +1 @@
+<web-view class="web-view" src="{{url}}"></web-view>

+ 0 - 1
pages/webview/webview.wxss

@@ -1,4 +1,3 @@
-/* pages/components/webview/webview.wxss */
 web-view {
     width: 100%;
     height: 100%;

+ 0 - 2
pages/webview/webview.wxml

@@ -1,2 +0,0 @@
-<!-- pages/webview/webview.wxml -->
-<web-view class="web-view" src="{{url}}"></web-view>

+ 7 - 2
utils/routePath.js

@@ -12,9 +12,13 @@ const deviceConnect2 = "../../pageB/deviceConnect2/deviceConnect2";
 const deviceConnect3 = "../../pageB/deviceConnect3/deviceConnect3";
 const deviceConnect4 = "../../pageB/deviceConnect4/deviceConnect4";
 
+/// pageD
+const webview = "../../pageD/webview/webview";
+
 /// piano
 const cropper = "../../piano/cropper/cropper";
 const wallpaper = "../../piano/wallpaper/wallpaper";
+const deviceDetail = "../../piano/deviceDetail/deviceDetail";
 
 const about = "../about/about";
 const setWifi = "../setWifi/setWifi";
@@ -22,7 +26,6 @@ const setWifi = "../setWifi/setWifi";
 /// 抽奖记录
 const connectMode = "../deviceConMode/index";
 const connectBle = "../connectBle/connectBle";
-const webview = "../webview/webview";
 
 module.exports = {
   /// A
@@ -35,14 +38,16 @@ module.exports = {
   deviceConnect2: deviceConnect2,
   deviceConnect3: deviceConnect3,
   deviceConnect4: deviceConnect4,
+  /// D
+  webview: webview,
 
   /// piano
   cropper: cropper,
   wallpaper: wallpaper,
+  deviceDetail: deviceDetail,
 
   about: about,
   connectMode: connectMode,
   connectBle: connectBle,
   setWifi: setWifi,
-  webview: webview,
 }