From 54508b3d96ee791ce31e71a2f272f5a9e8062689 Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Sat, 7 Sep 2024 17:04:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=EF=BC=8C=E6=96=B0=E5=A2=9E=E4=BA=86=E5=BC=80?=
 =?UTF-8?q?=E9=97=A8=E6=8E=A7=E5=88=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingService/meetingService.wxml        |  4 +--
 miniprogram/pages/smartDevice/room/room.js    | 26 ++++++++++++++++---
 miniprogram/pages/smartDevice/room/room.wxml  | 12 +++++++--
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml
index 3c29b6d..be43c7c 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml
@@ -1,7 +1,7 @@
 <view class="containerView public">
 
     <!-- 免费服务 -->
-    <view class="serviceView">
+    <!-- <view class="serviceView">
         <view class="leftLineTitle">基础会议服务</view>
         <view class="serviceItemView">
             <view class="serviceItem" wx:if="{{item.type == 'free'}}"  wx:for="{{serviceList}}" wx:key="*this">
@@ -10,7 +10,7 @@
                 <van-field style="width: 10rpx; visibility: hidden;" data-id="{{item.serveId}}" value="{{ item.num }}" type="number" clearable placeholder="请输入人数" border="{{ false }}" bind:change="inputChange" />
             </view>
         </view>
-    </view>
+    </view> -->
 
     <!-- 增值服务 -->
     <view class="serviceView">
diff --git a/miniprogram/pages/smartDevice/room/room.js b/miniprogram/pages/smartDevice/room/room.js
index f8c4294..6135982 100644
--- a/miniprogram/pages/smartDevice/room/room.js
+++ b/miniprogram/pages/smartDevice/room/room.js
@@ -76,8 +76,11 @@ Page({
             console.log('getAllDeviceInfoByRoomIdRq', res);
             let equipmentList = res.data.map(item => _this.formatDevice(item))
             equipmentList = equipmentList.filter(item => item.type != '门锁')
-            let lockDoor = res.data.find(item => item.type == '门锁')
+						let lockDoor = res.data.find(item => item.type == '门锁')
+						let controlDoor = res.data.find(item => item.type == '开门控制器')
+						console.log('开门控制器-------',controlDoor);
             _this.setData({
+								controlDoor,
                 lockDoor,
                 equipmentList
             })
@@ -133,7 +136,7 @@ Page({
         let equipmentList = _this.data.equipmentList
         for (let i = 0; i < equipmentList.length; i++) {
             let equipmentData = equipmentList[i];
-            if (equipmentData.type == '窗帘' || equipmentData.type == '门锁') {
+            if (equipmentData.type == '窗帘' || equipmentData.type == '门锁' || equipmentData.type == '开门控制器') {
                 continue
             }
             // 
@@ -296,7 +299,24 @@ Page({
                 app.vantNotifyErr(Notify, res.msg)
             }
         })
-    },
+		},
+		
+		//调用开门控制器
+		openControlDoor(){
+			console.log(11111);
+			let _this = this
+			let controlDoor = _this.data.controlDoor
+			callApiByDeviceIdRq({
+				"deviceId": controlDoor.id,
+			}).then(res => {
+					console.log('callApiByDeviceIdRq', res);
+					if(res.code == 0){
+							app.vantNotifySuccess(Notify, res.msg)
+					}else{
+							app.vantNotifyErr(Notify, res.msg)
+					}
+			})
+		},
 
     // 调用设备接口
     callApiByDevice(data) {
diff --git a/miniprogram/pages/smartDevice/room/room.wxml b/miniprogram/pages/smartDevice/room/room.wxml
index ab1b78a..92e20aa 100644
--- a/miniprogram/pages/smartDevice/room/room.wxml
+++ b/miniprogram/pages/smartDevice/room/room.wxml
@@ -6,10 +6,18 @@
             <view class="logoImg" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/shanghai_changyang/index/is_logo.png'}});"></view>
             <view class="title">{{roomName}}</view>
         </view>
+				<!-- 开门控制器 -->
+				<view class="leftLineTitle" wx:if="{{controlDoor}}">开门控制器</view>
+        <view class="lockView">
+
+            <view class="lockSwitchView" wx:if="{{controlDoor}}" bind:tap="openControlDoor">
+                <view class="switchImg" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/shanghai_changyang/device/equipment/lock/lockSwitch.png'}});"></view>
+                <view class="label">点击开门</view>
+            </view>
+        </view>
+				<!-- 门锁 -->
         <view class="leftLineTitle" wx:if="{{lockDoor}}">门锁</view>
         <view class="lockView">
-            <!-- <view class="lockImg" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/shanghai_changyang/device/equipment/lock/lock.png'}});"></view> -->
-
             <view class="lockSwitchView" wx:if="{{lockDoor}}" bind:tap="openLockDoor">
                 <view class="switchImg" style="background: no-repeat center/cover url({{IMG_NAME + '/profile/static/shanghai_changyang/device/equipment/lock/lockSwitch.png'}});"></view>
                 <view class="label">点击开门</view>