diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js
index 7c98159..922c286 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.js
@@ -12,7 +12,6 @@ Page({
*/
data: {
IMG_NAME: app.IMG_NAME,
- contentSwichFLag: true,
meetingRoomId: null,
detail: {},
bannerList: [],
@@ -69,15 +68,6 @@ Page({
})
},
- // 切换内容展示
- contentSwich() {
- console.log('contentSwich', 1);
- let _this = this;
- _this.setData({
- "contentSwichFLag": !_this.data.contentSwichFLag
- })
- },
-
// 跳转空间设施
jumpMeetingFacilities() {
let meetingRoomId = this.data.meetingRoomId;
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
index 0de6264..a101aeb 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml
@@ -29,15 +29,7 @@
-
- 一般的会议室功能区包括主席台、听众区和发言区。部分会议室则不作明确区分,如圆桌会议室和会见式会议室。会场的布置类型可以是标准化的,也可以是个性化的一般的会议室功能区包括主席台、听众区和发言区。部分会议室则不作
- 一般的会议室功能区包括主席台、听众区和发言区。部分会议室则不作明确区分,如圆桌会议室和会见式会议室。会场的布置类型可以是标准化的,也可以是个性化的一般的会议室功能区包括主席台、听众区和发言区。
-
-
- {{contentSwichFLag ? '展开' : '收起'}}
-
-
-
+ {{detail.content ? detail.content : ''}}
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss
index 34774ef..10bb637 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss
+++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxss
@@ -73,13 +73,6 @@
.roomView .content {
margin: 40rpx 20rpx 0;
font-size: 26rpx;
- transition: all 1s;
-}
-
-.roomView .content.hidden {
- height: 200rpx;
- overflow: hidden;
- transition: all 1s;
}
.roomView .contentSwichBtn {