diff --git a/miniprogram/api/meeting/meetingRoom.js b/miniprogram/api/meeting/meetingRoom.js
index afd4173..0c9aa96 100644
--- a/miniprogram/api/meeting/meetingRoom.js
+++ b/miniprogram/api/meeting/meetingRoom.js
@@ -3,9 +3,15 @@ import {
 } from '../selfRequest';
 
 // 查询条件筛选
-export function loginRq(param) {
+// 1.会议室类型，2.人数，3.会议室设备，4.形式
+export function meetingRoomDict(param) {
     return request({
         url: '/api/roomContent/searchInfo/' + param,
         method: "get",
     });
 }
+
+
+
+
+
diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
index ab16915..c1de1e5 100644
--- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
+++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js
@@ -1,4 +1,8 @@
 const app = getApp()
+import {
+    meetingRoomDict,
+} from "../../../api/meeting/meetingRoom.js"
+
 Page({
 
     /**
@@ -7,25 +11,23 @@ Page({
     data: {
         IMG_NAME: app.IMG_NAME,
         queryParam: {
-            switchTitle1: '包邮',
-            switchTitle2: '团购',
-            itemTitle: '筛选',
             meetingTypeDict: {
-                list: [{
-                        text: '会议室类型',
-                        value: 0
-                    },
-                    {
-                        text: '会议室',
-                        value: 1
-                    },
-                    {
-                        text: '茶室',
-                        value: 2
-                    },
-                ],
-                value: 0,
-            }
+                list: [],
+                value: null,
+            },
+            personDict: {
+                list: [],
+                value: null,
+            },
+            itemDict: {
+                list: [],
+                value: null,
+                title: '设备'
+            },
+            shapeDict: {
+                list: [],
+                value: null,
+            },
         }
     },
 
@@ -37,18 +39,132 @@ Page({
         wx.setNavigationBarTitle({
             title: options.name
         })
+
+        // 初始化数据
+        this.initData();
     },
 
-    // 查询条件-会议类型
-    meetingTypeQueryChange(e){
-        console.log('meetingTypeQueryChange', e);
+    // 初始化数据
+    initData() {
+        let _this = this;
+        // 1.会议室类型，2.人数，3.会议室设备，4.形式
+        meetingRoomDict("1").then(res => {
+            console.log('meetingRoomDict("1")', res);
+            // 封装参数
+            let list = res.roomContents.map(item => {
+                return {
+                    text: item.typeName,
+                    value: item.typeValue
+                }
+            })
+            list = [{
+                text: "类型",
+                value: null
+            }, ...list]
+            // 赋值参数
+            let queryParam = _this.data.queryParam;
+            queryParam.meetingTypeDict.list = list;
+            _this.setData({
+                queryParam
+            })
+            console.log('meetingRoomDict("1")=>', list);
+        })
+        meetingRoomDict("2").then(res => {
+            console.log('meetingRoomDict("2")', res);
+            // 封装参数
+            let list = res.roomContents.map(item => {
+                return {
+                    text: item.capacityNum + '人',
+                    value: item.capacityNum
+                }
+            })
+            list = [{
+                text: "人数",
+                value: null
+            }, ...list]
+            // 赋值参数
+            let queryParam = _this.data.queryParam;
+            queryParam.personDict.list = list;
+            _this.setData({
+                queryParam
+            })
+            console.log('meetingRoomDict("2")=>', list);
+        })
+        meetingRoomDict("3").then(res => {
+            console.log('meetingRoomDict("3")', res);
+            // 封装参数
+            let list = res.roomItem.map(item => {
+                return {
+                    text: item.name,
+                    value: item.name
+                }
+            })
+            list = [{
+                text: "设备",
+                value: null
+            }, ...list]
+            // 赋值参数
+            let queryParam = _this.data.queryParam;
+            queryParam.itemDict.list = list;
+            _this.setData({
+                queryParam
+            })
+            console.log('meetingRoomDict("3")=>', list);
+        })
+        meetingRoomDict("4").then(res => {
+            console.log('meetingRoomDict("4")', res);
+            // 封装参数
+            let list = res.roomContents.map(item => {
+                return {
+                    text: item.shape,
+                    value: item.shape
+                }
+            })
+            list = [{
+                text: "形式",
+                value: null
+            }, ...list]
+            // 赋值参数
+            let queryParam = _this.data.queryParam;
+            queryParam.shapeDict.list = list;
+            _this.setData({
+                queryParam
+            })
+            console.log('meetingRoomDict("4")=>', list);
+        })
+    },
+
+    // 查询条件变动
+    dictChange(e) {
+        console.log('dictChange', e);
         let queryParam = this.data.queryParam;
-        queryParam.meetingTypeDict.value = e.detail;
+        queryParam[e.currentTarget.dataset.type].value = e.detail;
         this.setData({
             queryParam
         })
     },
 
+    // 设备-多选
+    dictSwitchChange(e) {
+        console.log('dictSwitchChange', e);
+        let select = e.detail;
+        let name = e.currentTarget.dataset.name;
+        let queryParam = this.data.queryParam;
+        queryParam.itemDict.list = queryParam.itemDict.list.map(item => {
+            if (item.text == name) {
+                item.select = select;
+            }
+            return item
+        })
+        this.setData({
+            queryParam
+        })
+    },
+    // 设备多选确定
+    itemDictConfirm() {
+        this.selectComponent('#itemSelect').toggle();
+    },
+
     // 会议室
     jumpMeetingRoom() {
         wx.navigateTo({
diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
index 46ed8c4..24e1bf0 100644
--- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
+++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml
@@ -3,17 +3,31 @@
     <!-- 筛选条件 -->
     <view class="queryView">
         <van-dropdown-menu active-color="#4e96f8">
-            <van-dropdown-item value="{{ queryParam.meetingTypeDict.value }}" options="{{ queryParam.meetingTypeDict.list }}" bind:change="meetingTypeQueryChange"/>
+            <!-- 字典-会议室 -->
+            <van-dropdown-item value="{{ queryParam.meetingTypeDict.value }}" options="{{ queryParam.meetingTypeDict.list }}" bind:change="dictChange" data-type="meetingTypeDict" />
+            <!-- 字典-人数 -->
+            <van-dropdown-item value="{{ queryParam.personDict.value }}" options="{{ queryParam.personDict.list }}" bind:change="dictChange" data-type="personDict" />
+            <!-- 字典-设备 -->
+            <van-dropdown-item id="itemSelect" title="{{ queryParam.itemDict.title }}">
+                <van-cell title="{{ item.text }}" wx:for="{{queryParam.itemDict.list}}"  wx:key="*this">
+                    <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>
+                </view>
+            </van-dropdown-item>
+            <!-- 字典-形式 -->
+            <van-dropdown-item value="{{ queryParam.shapeDict.value }}" options="{{ queryParam.shapeDict.list }}" bind:change="dictChange" data-type="shapeDict" />
         </van-dropdown-menu>
     </view>
 
     <!-- 会议室列表 -->
     <view class="meetingRoomView">
-        <view class="meetingRoomItem" bind:tap="jumpMeetingRoom" wx:for="{{6}}" wx:for-index="idx">
+        <view class="meetingRoomItem" bind:tap="jumpMeetingRoom" wx:for="{{6}}" wx:for-index="idx"  wx:key="*this">
             <view class="content">
                 <view class="title">10人间 | B2A | 12F</view>
                 <view class="articleView">
-                    <view class="article" wx:for="{{3}}">#电视</view>
+                    <view class="article" wx:for="{{3}}"  wx:key="*this">#电视</view>
                 </view>
                 <view class="propOpen"></view>
                 <view class="priceView">