From ddd03bca87adfa070f152564ed91202b25c93430 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Wed, 21 Aug 2024 19:36:59 +0800
Subject: [PATCH] 1

---
 miniprogram/pages/smartDevice/room/room.js   | 18 ++++++++++
 miniprogram/pages/smartDevice/room/room.wxml | 37 +++++++++++---------
 miniprogram/pages/smartDevice/room/room.wxss | 24 +++++++++++--
 3 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/miniprogram/pages/smartDevice/room/room.js b/miniprogram/pages/smartDevice/room/room.js
index eaf6ac2..91c0bf2 100644
--- a/miniprogram/pages/smartDevice/room/room.js
+++ b/miniprogram/pages/smartDevice/room/room.js
@@ -13,6 +13,24 @@ Page({
                 selectUrl: 'chaxie0.png',
                 isSelect: false
             },
+            {
+                name: '开门模式',
+                url: 'kaimen1.png',
+                selectUrl: 'kaimen0.png',
+                isSelect: false
+            },
+            {
+                name: '开门模式',
+                url: 'kaimen1.png',
+                selectUrl: 'kaimen0.png',
+                isSelect: false
+            },
+            {
+                name: '开门模式',
+                url: 'kaimen1.png',
+                selectUrl: 'kaimen0.png',
+                isSelect: false
+            },
             {
                 name: '开门模式',
                 url: 'kaimen1.png',
diff --git a/miniprogram/pages/smartDevice/room/room.wxml b/miniprogram/pages/smartDevice/room/room.wxml
index d5b1690..46e0ca1 100644
--- a/miniprogram/pages/smartDevice/room/room.wxml
+++ b/miniprogram/pages/smartDevice/room/room.wxml
@@ -1,21 +1,26 @@
 <view class="containerView public">
-    <!-- 顶部名称 -->
-    <view class="topHead">
-        <view class="logoImg" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/shanghai_changyang/index/is_logo.png'}});"></view>
-        <view class="title">大会议室</view>
-    </view>
 
-    <view class="leftLineTitle">情景模式</view>
-    <view class="sceneView">
-        <view bind:tap="selectScene" data-obj="{{item}}" class="sceneItem {{item.isSelect ? 'activity' : ''}}" wx:for="{{sceneList}}" wx:for-item="item" wx:key="*this">
-            <view class="img" style="background: no-repeat center/cover url({{item.isSelect ? item.selectUrl : item.url }});"></view>
-            <view class="label {{item.isSelect ? 'activity' : ''}}">会议模式</view>
-            <view class="point {{item.isSelect ? 'activity' : ''}}"></view>
+    <view class="publicView">
+        <!-- 顶部名称 -->
+        <view class="topHead">
+            <view class="logoImg" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/shanghai_changyang/index/is_logo.png'}});"></view>
+            <view class="title">大会议室</view>
+        </view>
+
+        <view class="leftLineTitle">情景模式</view>
+        <view class="sceneView">
+            <view bind:tap="selectScene" data-obj="{{item}}" class="sceneItem {{item.isSelect ? 'activity' : ''}}" wx:for="{{sceneList}}" wx:for-item="item" wx:key="*this">
+                <view class="img" style="background: no-repeat center/cover url({{item.isSelect ? item.selectUrl : item.url }});"></view>
+                <view class="label {{item.isSelect ? 'activity' : ''}}">会议模式</view>
+                <view class="point {{item.isSelect ? 'activity' : ''}}"></view>
+            </view>
+        </view>
+
+        <view class="leftLineTitle">设备列表</view>
+    </view>
+    <view class="equipmentList">
+        <view class="equipmentItem" wx:for="{{6}}" wx:for-item="item" wx:key="*this">
+
         </view>
     </view>
-
-
-    <view class="leftLineTitle">设备列表</view>
-
-
 </view>
\ No newline at end of file
diff --git a/miniprogram/pages/smartDevice/room/room.wxss b/miniprogram/pages/smartDevice/room/room.wxss
index e91d5cf..22c2590 100644
--- a/miniprogram/pages/smartDevice/room/room.wxss
+++ b/miniprogram/pages/smartDevice/room/room.wxss
@@ -6,16 +6,19 @@
 }
 
 .containerView.public {
-    padding: 20rpx 32rpx;
     background: #f8f8f8;
     min-height: 100vh;
 }
 
+.publicView {
+    padding: 0 32rpx;
+}
+
 .topHead {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    margin-top: 20rpx;
+    margin-top: 50rpx;
 }
 
 .topHead .logoImg {
@@ -85,4 +88,21 @@
 
 .sceneView .sceneItem .point.activity {
     background: white;
+}
+
+.equipmentList {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+    align-items: center;
+}
+
+.equipmentList .equipmentItem {
+    box-shadow: rgba(214, 214, 214, 0.5) 0px 1px 0px 0px, rgb(238, 238, 238) 0px 1px 2px 0px;
+    border-radius: 10rpx;
+    position: relative;
+    width: 330rpx;
+    height: 260rpx;
+    margin-top: 24rpx;
+    background: white;
 }
\ No newline at end of file