From b480b3bfcee80249b25e7f0a55e0c80c12c178f6 Mon Sep 17 00:00:00 2001 From: SelfRidicule Date: Thu, 28 Mar 2024 10:48:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E5=8F=82=E5=8A=A0=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=98=BE=E7=A4=BA=E5=8F=82=E4=B8=8E=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/api/meeting/meetingRoom.js | 8 +++++ miniprogram/pages/meeting/invite/invite.js | 20 +++++++++-- miniprogram/pages/meeting/invite/invite.wxml | 15 +++++++++ miniprogram/pages/meeting/invite/invite.wxss | 35 ++++++++++++++++++++ project.private.config.json | 7 ++++ 5 files changed, 83 insertions(+), 2 deletions(-) diff --git a/miniprogram/api/meeting/meetingRoom.js b/miniprogram/api/meeting/meetingRoom.js index 2d76004..ac62719 100644 --- a/miniprogram/api/meeting/meetingRoom.js +++ b/miniprogram/api/meeting/meetingRoom.js @@ -151,4 +151,12 @@ export function meetingRoomPayOrderRq(data) { method: "post", data }); +} + +// 查询参与会议预约人员列表 +export function inviteRecordPersonListRq(id) { + return request({ + url: '/api/roomContent/inviteRecord?reservationId=' + id, + method: "get", + }); } \ No newline at end of file diff --git a/miniprogram/pages/meeting/invite/invite.js b/miniprogram/pages/meeting/invite/invite.js index 5558649..d77d9aa 100644 --- a/miniprogram/pages/meeting/invite/invite.js +++ b/miniprogram/pages/meeting/invite/invite.js @@ -12,7 +12,8 @@ import { selectReservationByIdRq, selectCoordinateRq, roomContentIsVisitorRq, - roomContentAddVisitorRq + roomContentAddVisitorRq, + inviteRecordPersonListRq } from "../../../api/meeting/meetingRoom.js" import { @@ -44,6 +45,7 @@ Page({ }, id: null, detail: null, + joinPersonList: [], address: {}, openid: null, authorizationShow: true, @@ -99,8 +101,20 @@ Page({ detail }) }) + // 查询参与会议预约人员列表 + _this.getInviteRecordPersonList() + }, + // 查询参与会议预约人员列表 + getInviteRecordPersonList() { + let _this = this; + let id = _this.data.id; + inviteRecordPersonListRq(id).then(res => { + console.log('inviteRecordPersonListRq', res); + _this.setData({ + joinPersonList: res.data + }) + }) }, - // 打开地图 openMap(e) { console.log('openMap', e); @@ -202,6 +216,8 @@ Page({ participateShow: false, openDoorShow: true }) + // 查询参与会议预约人员列表 + _this.getInviteRecordPersonList() } else { //参与失败 Notify({ type: 'danger', diff --git a/miniprogram/pages/meeting/invite/invite.wxml b/miniprogram/pages/meeting/invite/invite.wxml index a2e353e..f7a2752 100644 --- a/miniprogram/pages/meeting/invite/invite.wxml +++ b/miniprogram/pages/meeting/invite/invite.wxml @@ -34,6 +34,21 @@ 会面时间 {{detail.timeSlot}} + + + + 参与人员 + + + + + {{item.userName}} + + + + + + 授权登录 diff --git a/miniprogram/pages/meeting/invite/invite.wxss b/miniprogram/pages/meeting/invite/invite.wxss index 83cc483..70fa16f 100644 --- a/miniprogram/pages/meeting/invite/invite.wxss +++ b/miniprogram/pages/meeting/invite/invite.wxss @@ -71,6 +71,41 @@ font-size: 26rpx; } +.joinView { + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + align-items: center; +} + +.joinView .joinPersonView { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin-right: 20rpx; + margin-bottom: 20rpx; +} + +.joinView .joinPersonView .img { + width: 80rpx; + height: 80rpx; + border-radius: 100rpx; +} + +.joinView .joinPersonView .name { + width: 100rpx; + margin-top: 10rpx; + font-size: 24rpx; + color: #5e5e5e; + + text-align: center; + text-overflow: ellipsis; + overflow: hidden; + word-break: break-all; + white-space: nowrap; +} + .submitBtn { box-sizing: border-box; position: absolute; diff --git a/project.private.config.json b/project.private.config.json index 750e5eb..5456c58 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -6,6 +6,13 @@ "condition": { "miniprogram": { "list": [ + { + "name": "pages/meeting/invite/invite", + "pathName": "pages/meeting/invite/invite", + "query": "id=82", + "launchMode": "default", + "scene": null + }, { "name": "pages/meeting/invite/invite", "pathName": "pages/meeting/invite/invite",