Browse Source

feature:优化设备列表界面的UI

zeng.chen 8 months atrás
parent
commit
fbad15d5c3
3 changed files with 14 additions and 4 deletions
  1. 11 1
      pages/deviceList/devices.js
  2. 1 1
      pages/deviceList/devices.wxml
  3. 2 2
      pages/index/index.js

+ 11 - 1
pages/deviceList/devices.js

@@ -1,5 +1,7 @@
 // pages/deviceList/devices.js
 import dRequest from '../../request/deviceListRequest'
+import routeUtil from '../../utils/route_util'
+import route_constant from '../../utils/route_constant.js'
 Page({
 
   /**
@@ -15,7 +17,15 @@ Page({
     },
   },
 
-
+  deviceTap(e) {
+    console.log(e)
+    let device = e.currentTarget.dataset.device
+    if (!device) {
+      console.log("设备为空")
+      return;
+    }
+    routeUtil.jumpParam(route_constant.connectMode, device)
+  },
   /**
    * 生命周期函数--监听页面加载
    */

+ 1 - 1
pages/deviceList/devices.wxml

@@ -2,7 +2,7 @@
 <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">
-        <view class="cell">
+        <view class="cell" bind:tap="deviceTap" data-device="{{item}}">
             <image class="device_img" src="{{item.img}}" mode="aspectFill" />
             <text class="device_text">{{item.name}}</text>
         </view>

+ 2 - 2
pages/index/index.js

@@ -364,7 +364,7 @@ Page({
     this.setData({
       isShowDevicelist: !_this.data.isShowDevicelist
     })
-    
+
   },
   actionMusic(e) {
     if (e.currentTarget.dataset.index === this.data.actionIndex) {
@@ -435,7 +435,7 @@ Page({
     });
   },
   goDeviceConnect() {
-    routeUtil.jump(route_constant.detailMode)
+    routeUtil.jump(route_constant.deviceList)
 
     return;
     wx.navigateTo({