diff --git a/miniprogram/api/meeting/visitorIinvitation.js b/miniprogram/api/meeting/visitorIinvitation.js index 24730ab..674a698 100644 --- a/miniprogram/api/meeting/visitorIinvitation.js +++ b/miniprogram/api/meeting/visitorIinvitation.js @@ -70,4 +70,13 @@ export function getChangyangPersonListRq() { url: '/api/roomContent/getChangyangPersonList', method: "get", }); +} + +// 修改参会人员 +export function updatePersonListRq(data) { + return request({ + url: '/api/roomContent/updatePersonList', + method: "post", + data + }); } \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js index 9bf0a06..ff41376 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js @@ -102,7 +102,7 @@ Page({ jumpMeetingPerson() { let ids = JSON.stringify(this.data.reservationPersonList.map(item => item.id)) wx.navigateTo({ - url: `/pages/meeting/meetingRoom/meetingPerson/meetingPerson?ids=${ids}` + url: `/pages/meeting/meetingRoom/meetingPerson/meetingPerson?pageType=add&ids=${ids}` }) }, diff --git a/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.js b/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.js index 81240d2..248445e 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.js @@ -1,5 +1,10 @@ +const app = getApp() + +import Notify from '@vant/weapp/notify/notify'; + import { - getChangyangPersonListRq + getChangyangPersonListRq, + updatePersonListRq } from "../../../../api/meeting/visitorIinvitation.js" Page({ @@ -10,7 +15,11 @@ Page({ /** 数据*/ dataList: [], // + reservationId: null, + roomContentId: null, ids: [], + pageType: '', + userData: null, }, /** @@ -18,9 +27,11 @@ Page({ */ onLoad(options) { let _this = this; - let ids = JSON.parse(options.ids) + options.ids = JSON.parse(options.ids) + // _this.setData({ - ids + ...options, + userData: wx.getStorageSync('user'), }) // // 获取数据 @@ -122,6 +133,7 @@ Page({ // 提交 submit() { let _this = this; + let pageType = _this.data.pageType let personList = [] _this.data.dataList.map(data => { personList = personList.concat(data.list.filter(item => item.isSelect)) @@ -132,10 +144,32 @@ Page({ // 上个页面数据 // let detail = prevPage.data.detail; - // 赋值上个页面的数据 - prevPage.setData({ - reservationPersonList: personList - }) + if (pageType == 'add') { // 添加 + // 赋值上个页面的数据 + prevPage.setData({ + reservationPersonList: personList + }) + } else if (pageType == 'update') { // 修改 + updatePersonListRq({ + userId: _this.data.userData.id, + roomContentId: _this.data.roomContentId, + id: _this.data.reservationId, + reservationPersonList: personList.map(item => { + return { + userId: item.id, + roomContentId: _this.data.roomContentId + } + }) + }).then(res => { + console.log('updatePersonListRq', res); + if (res.code == 0) { + app.vantNotifySuccess(Notify, res.msg) + } else { + app.vantNotifyErr(Notify, res.msg) + } + }) + } + // 后退页面 wx.navigateBack(); }, diff --git a/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.json b/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.json index 28ba2a1..fcc5c88 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.json +++ b/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.json @@ -5,6 +5,7 @@ "van-index-bar": "@vant/weapp/index-bar/index", "van-index-anchor": "@vant/weapp/index-anchor/index", "van-divider": "@vant/weapp/divider/index", - "van-checkbox": "@vant/weapp/checkbox/index" + "van-checkbox": "@vant/weapp/checkbox/index", + "van-notify": "@vant/weapp/notify/index" } } \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.wxml b/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.wxml index ea55c19..312a87d 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingPerson/meetingPerson.wxml @@ -14,4 +14,7 @@ -提交 \ No newline at end of file +提交 + + + \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js index bf3716c..57a2551 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js @@ -31,7 +31,8 @@ Page({ id: null, detail: null, facilities: {}, - joinPersonList: [] + joinPersonList: [], + dataChange: false, }, /** @@ -42,8 +43,6 @@ Page({ _this.setData({ ...options }) - // 获取详情 - _this.getDetail(); }, // 获取详情 @@ -223,6 +222,20 @@ Page({ }) }, + // 跳转-人员列表 + jumpMeetingPerson() { + let _this = this + // 人员列表id + let ids = _this.data.detail.reservationPersonList.map(item => item.userId) + ids = JSON.stringify(ids) + // 预约id + let reservationId = _this.data.detail.id + let roomContentId = _this.data.detail.roomContentId + wx.navigateTo({ + url: `/pages/meeting/meetingRoom/meetingPerson/meetingPerson?reservationId=${reservationId}&roomContentId=${roomContentId}&pageType=update&ids=${ids}` + }) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ @@ -234,7 +247,11 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + let _this = this + setTimeout(() => { + // 获取详情 + _this.getDetail(); + }, 100); }, /** diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml index 0ffd0cf..f867620 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml @@ -73,7 +73,12 @@ - 参会人员（{{joinPersonList.length}}/{{detail.reservationPersonList.length}}） + + + 参会人员（{{joinPersonList.length}}/{{detail.reservationPersonList.length}}） + 管理 + + diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss index 1e0b8f8..6d9d154 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss @@ -63,6 +63,17 @@ .basicView {} +.basicView .titleContainer { + display: flex; + justify-content: space-between; + align-items: center; +} + +.basicView .titleContainer .right { + font-size: 30rpx; + color: #3794FF; +} + .basicView .labelTitle { margin: 40rpx 20rpx; font-size: 32rpx; @@ -219,8 +230,7 @@ } -.facilitiesView { -} +.facilitiesView {} .facilitiesView .itemView { display: flex;