diff --git a/miniprogram/api/meeting/meetingRoom.js b/miniprogram/api/meeting/meetingRoom.js
index 0c9aa96..6bc1801 100644
--- a/miniprogram/api/meeting/meetingRoom.js
+++ b/miniprogram/api/meeting/meetingRoom.js
@@ -11,7 +11,11 @@ export function meetingRoomDict(param) {
     });
 }
 
-
-
-
-
+// 会议室列表
+export function meetingRoomListRq(data) {
+    return request({
+        url: '/api/roomContent/list',
+        method: "post",
+        data
+    });
+}
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
index c1de1e5..879494d 100644
--- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
+++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
@@ -1,6 +1,7 @@
 const app = getApp()
 import {
     meetingRoomDict,
+    meetingRoomListRq,
 } from "../../../api/meeting/meetingRoom.js"
 
 Page({
@@ -10,6 +11,7 @@ Page({
      */
     data: {
         IMG_NAME: app.IMG_NAME,
+        roomDataList: [],
         queryParam: {
             meetingTypeDict: {
                 list: [],
@@ -99,10 +101,6 @@ Page({
                     value: item.name
                 }
             })
-            list = [{
-                text: "设备",
-                value: null
-            }, ...list]
             // 赋值参数
             let queryParam = _this.data.queryParam;
             queryParam.itemDict.list = list;
@@ -132,6 +130,9 @@ Page({
             })
             console.log('meetingRoomDict("4")=>', list);
         })
+
+        // 数据-会议室列表
+        this.meetingRoomList()
     },
 
     // 查询条件变动
@@ -142,6 +143,8 @@ Page({
         this.setData({
             queryParam
         })
+        // 数据-会议室列表
+        this.meetingRoomList()
     },
 
     // 设备-多选
@@ -156,15 +159,46 @@ Page({
             }
             return item
         })
+        // 计算选择数量
+        let selectCount = queryParam.itemDict.list.filter(item => item.select).length;
+        console.log('selectCount', selectCount);
+        if (selectCount > 0) {
+            queryParam.itemDict.title = '设备+' + selectCount;
+        } else {
+            queryParam.itemDict.title = '设备';
+        }
         this.setData({
             queryParam
         })
+        // 数据-会议室列表
+        this.meetingRoomList()
     },
-    // 设备多选确定
+    // 设备多选收起
     itemDictConfirm() {
         this.selectComponent('#itemSelect').toggle();
     },
 
+    // 数据-会议室列表
+    meetingRoomList() {
+        let _this = this;
+        let queryParam = _this.data.queryParam;
+        let roomItemList = queryParam.itemDict.list.filter(item => item.select).map(item => {
+            return {
+                "name": item.value
+            }
+        })
+        let param = {
+            "type": queryParam.meetingTypeDict.value,
+            "capacityNum": queryParam.personDict.value,
+            "roomItemList": roomItemList,
+            "shape": queryParam.shapeDict.value,
+        }
+        // 会议室列表数据
+        meetingRoomListRq(param).then(res => {
+            console.log('meetingRoomListRq', res);
+        })
+    },
+
     // 会议室
     jumpMeetingRoom() {
         wx.navigateTo({
diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
index 24e1bf0..f2a9dcc 100644
--- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
+++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
@@ -13,7 +13,7 @@
                     <van-switch slot="right-icon" size="24px" style="height: 26px" checked="{{ item.select }}" active-color="#3c8bf2" bind:change="dictSwitchChange" data-name="{{item.text}}"/>
                 </van-cell>
                 <view style="padding:30rpx;">
-                    <van-button type="danger" block round bind:click="itemDictConfirm" color="#3c8bf2">确认</van-button>
+                    <van-button type="danger" block round bind:click="itemDictConfirm" color="#3c8bf2">收起</van-button>
                 </view>
             </van-dropdown-item>
             <!-- 字典-形式 -->