From 1e94ed36c6ac1b1092e683d1a6a9e8c52ce42718 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Wed, 17 Jul 2024 14:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E9=A2=84=E7=BA=A6=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=B7=BB=E5=8A=A0=E5=85=8D=E8=B4=B9=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingRoom/meetingService/meetingService.js   | 13 ++++++++++++-
 .../meetingRoom/meetingService/meetingService.wxml | 14 +++++++++++++-
 .../meetingRoom/meetingService/meetingService.wxss |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js
index 3e8caac..218a8fd 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js
@@ -41,14 +41,25 @@ Page({
         if (!(_this.data.serviceList && _this.data.serviceList.length > 0)) {
             // 查询服务列表
             getMeetingRoomServiceAndEquipmentRq(_this.data.meetingRoomId).then(res => {
-                let serviceList = res.data.roomFServe.map(item => {
+                let incrementServiceList = res.data.roomFServe.map(item => {
                     return {
                         serveId: item.id,
                         serveName: item.serveName,
                         isSelect: false,
                         num: '',
+                        type: 'increment'
                     }
                 })
+                let freeServiceList = res.data.roomFreeServe.map(item => {
+                    return {
+                        serveId: item.id,
+                        serveName: item.serveName,
+                        isSelect: false,
+                        num: '',
+                        type: 'free'
+                    }
+                })
+                let serviceList = incrementServiceList.concat(freeServiceList)
                 _this.setData({
                     serviceList
                 })
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml
index 08861bf..8642542 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxml
@@ -1,10 +1,22 @@
 <view class="containerView public">
 
+    <!-- 免费服务 -->
+    <view class="serviceView">
+        <view class="leftLineTitle">免费服务</view>
+        <view class="serviceItemView">
+            <view class="serviceItem" wx:if="{{item.type == 'free'}}"  wx:for="{{serviceList}}" wx:key="*this">
+                <van-checkbox value="{{ item.isSelect }}" data-id="{{item.serveId}}" shape="square" bind:tap="checkBoxClick"></van-checkbox>
+                <view class="name" data-id="{{item.serveId}}" bind:tap="checkBoxClick">{{item.serveName}}</view>
+                <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 class="serviceView">
         <view class="leftLineTitle">增值服务</view>
         <view class="serviceItemView">
-            <view class="serviceItem" wx:for="{{serviceList}}" wx:key="*this">
+            <view class="serviceItem" wx:if="{{item.type == 'increment'}}" wx:for="{{serviceList}}" wx:key="*this">
                 <van-checkbox value="{{ item.isSelect }}" data-id="{{item.serveId}}" shape="square" bind:tap="checkBoxClick"></van-checkbox>
                 <view class="name" data-id="{{item.serveId}}" bind:tap="checkBoxClick">{{item.serveName}}</view>
                 <van-field style="width: 10rpx; visibility: hidden;" data-id="{{item.serveId}}" value="{{ item.num }}" type="number" clearable placeholder="请输入人数" border="{{ false }}" bind:change="inputChange" />
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxss b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxss
index cf94a1c..dc83b8a 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxss
+++ b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.wxss
@@ -1,6 +1,6 @@
 
 .serviceView {
-    margin-top: 40rpx;
+    margin-top: 80rpx;
 }
 
 .serviceView .leftLineTitle {