Преглед изворни кода

feature: 处理跳转方式问题和改名问题

Damon пре 8 месеци
родитељ
комит
812d1d5d94

+ 1 - 1
app.json

@@ -13,7 +13,7 @@
     "pages/download/download",
     "pages/wakeList/wakeList",
     "pages/aboutInfo/aboutInfo",
-    "pages/deviceList/devices",
+    "pages/deviceList/deviceList",
     "pages/deviceConMode/index",
     "pages/connectBle/connectBle",
     "pages/deviceDetail/detail",

+ 1 - 1
pages/deviceList/devices.js

@@ -1,4 +1,4 @@
-// pages/deviceList/devices.js
+// pages/deviceList/deviceList.js
 import dRequest from '../../request/deviceListRequest'
 import routeUtil from '../../utils/route_util'
 import route_constant from '../../utils/route_constant.js'

pages/deviceList/devices.json → pages/deviceList/deviceList.json


+ 1 - 1
pages/deviceList/devices.wxml

@@ -1,4 +1,4 @@
-<!-- pages/deviceList/devices.wxml -->
+
 <nav-bar bind:goBack="_goBack" nav-bgc-class="ex-nav-bgc-class" nav-title-class="ex-nav-title-class" ex-back-pre="ex-back-pre" navbar-data='{{nvabarData}}'></nav-bar>
 <view class="container grid-container">
     <block wx:for="{{deviceList}}" wx:key="index" wx:for-item="item" wx:for-index="index">

pages/deviceList/devices.wxss → pages/deviceList/deviceList.wxss


+ 1 - 1
pages/index/index.js

@@ -698,7 +698,7 @@ Page({
 
   goDeviceConnect() {
     wx.navigateTo({
-      url: './../deviceList/devices',
+      url: './../deviceList/deviceList',
     });
   },
 

+ 5 - 2
pages/login/login.js

@@ -112,9 +112,12 @@ Page({
               // wx.redirectTo({
               //   url: './../deviceConnect0/deviceConnect0?isLognlink=0'
               // });
-              wx.navigateTo({
-                url: './../deviceList/devices'
+              wx.redirectTo({
+                url: './../deviceList/deviceList'
               });
+              // wx.navigateTo({
+              //   url: './../deviceList/deviceList'
+              // });
             }, 2000);
           }
         });

+ 1 - 1
utils/route_constant.js

@@ -1,6 +1,6 @@
 
 /// 抽奖记录
-const deviceList = "../deviceList/devices";
+const deviceList = "../deviceList/deviceList";
 // 连接模式
 const connectMode = "../deviceConMode/index";
 const connectBle = "../connectBle/connectBle";