From 990bbc0cc8a6bbf1c44d14efef8e492d2e0f41ed Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Wed, 6 Mar 2024 21:06:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/api/meeting/meetingRoom.js        |  13 +-
 .../meetingFacilities/meetingFacilities.js    | 117 +++++++++++-------
 .../meetingFacilities/meetingFacilities.wxml  |  20 +--
 .../meetingFacilities/meetingFacilities.wxss  |  21 +---
 4 files changed, 97 insertions(+), 74 deletions(-)

diff --git a/miniprogram/api/meeting/meetingRoom.js b/miniprogram/api/meeting/meetingRoom.js
index a32081d..363329e 100644
--- a/miniprogram/api/meeting/meetingRoom.js
+++ b/miniprogram/api/meeting/meetingRoom.js
@@ -78,7 +78,7 @@ export function saveMeetingRecordRq(data) {
 // 根据用户id查询已预约的列表
 export function selectReservationListByUserIdRq(data) {
     return request({
-        url: '/api/roomContent/selectReservationListByUserId?pageNum='+ data.pageNum +'&pageSize=' + data.pageSize ,
+        url: '/api/roomContent/selectReservationListByUserId?pageNum=' + data.pageNum + '&pageSize=' + data.pageSize,
         method: "post",
         data
     });
@@ -87,7 +87,7 @@ export function selectReservationListByUserIdRq(data) {
 // 根据id查询预约信息
 export function selectReservationByIdRq(id) {
     return request({
-        url: '/api/roomContent/selectReservationById/' + id ,
+        url: '/api/roomContent/selectReservationById/' + id,
         method: "get",
     });
 }
@@ -98,4 +98,13 @@ export function selectCoordinateRq() {
         url: '/api/roomContent/selectCoordinate',
         method: "get",
     });
+}
+
+
+// 根据会议室id查询所有的会议室服务与设备
+export function getMeetingRoomServiceAndEquipmentRq(id) {
+    return request({
+        url: '/api/roomContent/getMeetingRoomServiceAndEquipment/' + id,
+        method: "get",
+    });
 }
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.js b/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.js
index b35e160..01d633f 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.js
@@ -1,66 +1,89 @@
-// pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.js
+const app = getApp()
+
+import {
+    getMeetingRoomServiceAndEquipmentRq
+} from "../../../../api/meeting/meetingRoom.js"
+
+
 Page({
 
-  /**
-   * 页面的初始数据
-   */
-  data: {
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        IMG_NAME: app.IMG_NAME,
+        meetingRoomId: null,
+        detail: {}
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+        let _this = this;
+        _this.setData({
+            ...options
+        })
+        // 获取数据
+        _this.getData();
+    },
 
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
+    // 获取数据
+    getData() {
+        let _this = this;
+        getMeetingRoomServiceAndEquipmentRq(_this.data.meetingRoomId).then(res => {
+            _this.setData({
+                detail: res.data
+            })
+        })
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
 
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
 
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
+    },
 
-  },
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
 
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
+    },
 
-  },
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
 
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
+    },
 
-  },
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
 
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
+    },
 
-  },
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
 
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
+    }
 })
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxml b/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxml
index 22c4389..744343d 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxml
@@ -1,12 +1,12 @@
-<view class="containerView">
+<view class="containerView public">
 
     <!-- 空间设施 -->
     <view class="facilitiesView">
         <view class="leftLineTitle">空间设施</view>
         <view class="itemView">
-            <view class="singleItem" wx:for="{{10}}">
-                <van-icon name="tv-o" size="40px" />
-                <view class="name">TV</view>
+            <view class="singleItem" wx:for="{{detail.roomItem}}" wx:key="*this">
+                <image class="img" src="{{IMG_NAME + item.picUrl}}" mode="aspectFill"></image>
+                <view class="name">{{item.name}}</view>
             </view>
         </view>
     </view>
@@ -15,9 +15,9 @@
     <view class="facilitiesView">
         <view class="leftLineTitle">免费服务</view>
         <view class="itemView">
-            <view class="singleItem" wx:for="{{10}}">
-                <van-icon name="flower-o" size="40px" />
-                <view class="name">服务</view>
+            <view class="singleItem" wx:for="{{detail.roomFreeServe}}" wx:key="*this">
+                <image class="img" src="{{IMG_NAME + item.pic}}" mode="aspectFill"></image>
+                <view class="name">{{item.serveName}}</view>
             </view>
         </view>
     </view>
@@ -26,9 +26,9 @@
     <view class="serviceView">
         <view class="leftLineTitle">增值服务</view>
         <view class="serviceItemView">
-            <view class="serviceItem" wx:for="{{6}}">
-                <view class="name">专业设备调试、音源专业设备调试、音源专业设备调试、音源专业设备调试、音源</view>
-                <view class="content">500元、800元、1000元/场次</view>
+            <view class="serviceItem" wx:for="{{detail.roomFServe}}" wx:key="*this">
+                <view class="name">{{item.serveName}}</view>
+                <view class="content">{{item.money}}</view>
             </view>
         </view>
     </view>
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxss b/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxss
index 27032c6..7839b40 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxss
+++ b/miniprogram/pages/meeting/meetingRoom/meetingFacilities/meetingFacilities.wxss
@@ -1,17 +1,3 @@
-.containerView {
-    height: 100vh;
-    width: 100vw;
-    overflow: auto;
-    padding-bottom: 100rpx;
-    background: #ffffff;
-}
-
-.leftLineTitle {
-    border-left: 8rpx solid #76aef9;
-    padding-left: 10rpx;
-    font-size: 32rpx;
-}
-
 .facilitiesView {
     margin: 50rpx 20rpx;
 }
@@ -33,8 +19,13 @@
     margin-top: 30rpx;
 }
 
+.facilitiesView .itemView .singleItem .img {
+    width: 70rpx;
+    height: 70rpx;
+}
+
 .facilitiesView .itemView .singleItem .name {
-    margin-top: 4rpx;
+    margin-top: 16rpx;
 }
 
 .serviceView {}