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 @@ + + + 免费服务 + + + + {{item.serveName}} + + + + + 增值服务 - + {{item.serveName}} 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 {