From ba13f9c97fcced8d3c957bf67ec6c5ffe4c57596 Mon Sep 17 00:00:00 2001 From: "471615499@qq.com" Date: Wed, 25 Sep 2024 22:10:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=90=8E=E5=8F=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复选择日期时时间戳为当前时间的BUG，改为选择日期的00：00：00 完成首页认证、预约会议室页面、会议室详情页面、预约功能的调试 --- miniprogram/pages/meeting/index/index.js | 8 +- .../meetingReservation/meetingReservation.js | 21 +- .../meetingReservation.wxml | 16 +- .../meetingBooked/meetingBooked.js | 3 +- .../meetingRoom/meetingOrder/meetingOrder.js | 49 +-- .../meetingOrder/meetingOrder.wxml | 3 +- .../pages/meeting/meetingRoom/meetingRoom.js | 25 +- .../meeting/meetingRoom/meetingRoom.wxml | 4 +- .../meetingService/meetingService.js | 351 +++++++++--------- .../meeting/pay/waitComplete/waitComplete.js | 1 - .../reservationRecord/approve/approve.js | 8 +- .../meetingDetail/meetingDetail.js | 8 +- .../meetingRecord/meetingRecord.js | 8 +- 13 files changed, 284 insertions(+), 221 deletions(-) diff --git a/miniprogram/pages/meeting/index/index.js b/miniprogram/pages/meeting/index/index.js index 7ba37cc..929b71e 100644 --- a/miniprogram/pages/meeting/index/index.js +++ b/miniprogram/pages/meeting/index/index.js @@ -98,8 +98,14 @@ Page({ }, // 跳转会议预约页面 goRes(e) { + let date = new Date(e.detail); + let year = date.getFullYear() + let month = date.getMonth() + 1 + let day = date.getDate() + let chooseTime = year + '-' + month + '-' + day + ' 00:00:00' + let chooseTimeStr = new Date(chooseTime).getTime() wx.navigateTo({ - url: '/pages/meeting/meetingReservation/meetingReservation?time=' + e.detail + '&dep=' + this.data.depName + '&depId=' + this.data.depId, + url: '/pages/meeting/meetingReservation/meetingReservation?time=' + chooseTimeStr + '&dep=' + this.data.depName + '&depId=' + this.data.depId, }) }, // 跳转菜单 diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js index 7daf320..119fe64 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.js +++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.js @@ -307,16 +307,23 @@ Page({ meetingRoomList() { let _this = this; let queryParam = _this.data.queryParam; - let roomItemList = queryParam.itemDict.list.filter(item => item.select).map(item => { - return { - "id": item.value, - "name": item.text + let devicesArr = [] + for (let key in queryParam.itemDict.list) { + let eachObj = queryParam.itemDict.list[key] + if (eachObj.select) { + devicesArr.push(eachObj.value) } - }) + } + // let roomItemList = queryParam.itemDict.list.filter(item => item.select).map(item => { + // return { + // "id": item.value, + // "name": item.text + // } + // }) let param = { floor: queryParam.meetingTypeDict.value, // 楼层 capacityNum: queryParam.personDict.value, // 人数 - device: '', // 设备 + devices: devicesArr, // 设备 typeName: queryParam.shapeDict.value, // 形状 timeFormat: queryParam.timeRangeDict.value, // 预约时间格式：0 任意时间（管理员），1上午，2下午，3晚上 4 全天。值为0时，读取startTime和endTime为预约会议时间范围；其他值读取mrdate，再拼接时间为预约会议时间范围。 mrdate: _this.data.dateStr @@ -350,7 +357,7 @@ Page({ timeRange = timeRange ? timeRange : 0 // 跳转预约详情 wx.navigateTo({ - url: "/pages/meeting/meetingRoom/meetingRoom?id=" + e.currentTarget.dataset.id + '&time=' + this.data.date + '&timeRange=' + timeRange + '&rId=' + this.data.rId + '&dep=' + this.data.dep + '&depId=' + this.data.depId + url: "/pages/meeting/meetingRoom/meetingRoom?status="+ e.currentTarget.dataset.status +"&id=" + e.currentTarget.dataset.id + '&time=' + this.data.date + '&timeRange=' + timeRange + '&rId=' + this.data.rId + '&dep=' + this.data.dep + '&depId=' + this.data.depId }) }, diff --git a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml index e4f0f5a..020e070 100644 --- a/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml +++ b/miniprogram/pages/meeting/meetingReservation/meetingReservation.wxml @@ -25,11 +25,21 @@ {{item.name}} - - + + {{room.roomNum}} - {{room.capacityNum}}人 {{room.typeName}} + + {{room.capacityNum}}人 {{room.typeName}} + + + + + {{room.roomNum}} + + + 不可预约 + - 会议预约 + 会议预约 \ No newline at end of file diff --git a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js index a96ae9d..236527b 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingService/meetingService.js @@ -3,191 +3,192 @@ const app = getApp() import Notify from '@vant/weapp/notify/notify'; import { - getMeetingRoomServiceAndEquipmentRq, - queryServiceMsgRq + getMeetingRoomServiceAndEquipmentRq, + queryServiceMsgRq } from "../../../../api/meeting/meetingRoom.js" Page({ - /** - * 页面的初始数据 - */ - data: { - IMG_NAME: app.IMG_NAME, - meetingRoomId: null, - detail: {}, - msg: '', - serviceList: [], - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - let _this = this; - let serviceList = JSON.parse(options.serviceList) - // console.log(ser) - _this.setData({ - ...options, - serviceList - }) - // 获取数据 - _this.getData(); - }, + /** + * 页面的初始数据 + */ + data: { + IMG_NAME: app.IMG_NAME, + meetingRoomId: null, + detail: {}, + msg: '', + serviceList: [], + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let _this = this; + let serviceList = JSON.parse(options.serviceList) + // console.log(ser) + _this.setData({ + ...options, + serviceList + }) // 获取数据 - getData() { - let _this = this; - if (!(_this.data.serviceList && _this.data.serviceList.length > 0)) { - // 查询服务列表 - getMeetingRoomServiceAndEquipmentRq(_this.data.meetingRoomId).then(res => { - 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 - }) - }) - } + // _this.getData(); + }, - // 查询服务信息 - // queryServiceMsgRq({ - // "dictType": "server_info" - // }).then(res => { - // console.log('queryServiceMsgRq', res); - // for (let i = 0; i < res.data.length; i++) { - // if (res.data[i].dictValue == app.tenantId) { - // _this.setData({ - // msg: res.data[i].dictLabel - // }) - // break; - // } - // } - // }) - }, - - // 服务选择 - checkBoxClick(e) { - let _this = this; - console.log('checkBoxClick', e); - // get param - let id = e.target.dataset.id - let serviceList = _this.data.serviceList.map(item => { - if (item.serveId == id) { - item.isSelect = !item.isSelect - } - return item + // 获取数据，不需要 + getData() { + return + let _this = this; + if (!(_this.data.serviceList && _this.data.serviceList.length > 0)) { + // 查询服务列表 + getMeetingRoomServiceAndEquipmentRq(_this.data.meetingRoomId).then(res => { + 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 + serviceList }) - }, - - // 服务输入数量 - inputChange(e) { - let _this = this; - console.log('inputChange', e); - // get param - let id = e.currentTarget.dataset.id - let num = e.detail; - let serviceList = _this.data.serviceList.map(item => { - if (item.serveId == id) { - item.num = num - } - return item - }) - _this.setData({ - serviceList - }) - }, - - // 确定 - submit() { - let _this = this; - let serviceList = _this.data.serviceList - // for (let i = 0; i < serviceList.length; i++) { - // if (serviceList[i].isSelect && serviceList[i].num == '') { - // // 错误提示 - // Notify({ - // type: 'danger', - // message: `"${serviceList[i].serveName}"请输入人数!` - // }); - // return; - // } - // } - // - let pages = getCurrentPages(); //获取page - let prevPage = pages[pages.length - 2]; //上一个页面（父页面） - prevPage.setData({ - serviceList: _this.data.serviceList - }) - console.log(_this.data.serviceList) - wx.navigateBack(); - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - + }) } + + // 查询服务信息 + // queryServiceMsgRq({ + // "dictType": "server_info" + // }).then(res => { + // console.log('queryServiceMsgRq', res); + // for (let i = 0; i < res.data.length; i++) { + // if (res.data[i].dictValue == app.tenantId) { + // _this.setData({ + // msg: res.data[i].dictLabel + // }) + // break; + // } + // } + // }) + }, + + // 服务选择 + checkBoxClick(e) { + let _this = this; + console.log('checkBoxClick', e); + // get param + let id = e.target.dataset.id + let serviceList = _this.data.serviceList.map(item => { + if (item.serveId == id) { + item.isSelect = !item.isSelect + } + return item + }) + _this.setData({ + serviceList + }) + }, + + // 服务输入数量 + inputChange(e) { + let _this = this; + console.log('inputChange', e); + // get param + let id = e.currentTarget.dataset.id + let num = e.detail; + let serviceList = _this.data.serviceList.map(item => { + if (item.serveId == id) { + item.num = num + } + return item + }) + _this.setData({ + serviceList + }) + }, + + // 确定 + submit() { + let _this = this; + let serviceList = _this.data.serviceList + // for (let i = 0; i < serviceList.length; i++) { + // if (serviceList[i].isSelect && serviceList[i].num == '') { + // // 错误提示 + // Notify({ + // type: 'danger', + // message: `"${serviceList[i].serveName}"请输入人数!` + // }); + // return; + // } + // } + // + let pages = getCurrentPages(); //获取page + let prevPage = pages[pages.length - 2]; //上一个页面（父页面） + prevPage.setData({ + serviceList: _this.data.serviceList + }) + console.log(_this.data.serviceList) + wx.navigateBack(); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } }) \ No newline at end of file diff --git a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.js b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.js index b370455..62e2afe 100644 --- a/miniprogram/pages/meeting/pay/waitComplete/waitComplete.js +++ b/miniprogram/pages/meeting/pay/waitComplete/waitComplete.js @@ -19,7 +19,6 @@ Page({ // 跳转-会议预约记录 jumpMeetingRecord() { - let _id = this.data.id wx.reLaunch({ url: "/pages/meeting/reservationRecord/meetingRecord/meetingRecord", }) diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.js b/miniprogram/pages/meeting/reservationRecord/approve/approve.js index fbfdc20..1ed2699 100644 --- a/miniprogram/pages/meeting/reservationRecord/approve/approve.js +++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.js @@ -448,9 +448,15 @@ Page({ // 跳转会议预约页面 goRes(e) { let _this = this + let date = new Date(e.detail); + let year = date.getFullYear() + let month = date.getMonth() + 1 + let day = date.getDate() + let chooseTime = year + '-' + month + '-' + day + ' 00:00:00' + let chooseTimeStr = new Date(chooseTime).getTime() // 加入rId参数，为预约id，用于重新修改 wx.navigateTo({ - url: '/pages/meeting/meetingReservation/meetingReservation?rId=' + _this.data.editId + '&time=' + e.detail, + url: '/pages/meeting/meetingReservation/meetingReservation?rId=' + _this.data.editId + '&time=' + chooseTimeStr, }) }, pass() { diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js index cdbedd1..a06c7db 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js @@ -382,9 +382,15 @@ Page({ // 跳转会议预约页面 goRes(e) { let _this = this + let date = new Date(e.detail); + let year = date.getFullYear() + let month = date.getMonth() + 1 + let day = date.getDate() + let chooseTime = year + '-' + month + '-' + day + ' 00:00:00' + let chooseTimeStr = new Date(chooseTime).getTime() // 加入rId参数，为预约id，用于重新修改 wx.navigateTo({ - url: '/pages/meeting/meetingReservation/meetingReservation?rId=' + _this.data.detail.id + '&time=' + e.detail, + url: '/pages/meeting/meetingReservation/meetingReservation?rId=' + _this.data.detail.id + '&time=' + chooseTimeStr, }) }, diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js index 9cdebdf..3fc19c3 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js @@ -497,9 +497,15 @@ Page({ // 跳转会议预约页面 goRes(e) { let _this = this + let date = new Date(e.detail); + let year = date.getFullYear() + let month = date.getMonth() + 1 + let day = date.getDate() + let chooseTime = year + '-' + month + '-' + day + ' 00:00:00' + let chooseTimeStr = new Date(chooseTime).getTime() // 加入rId参数，为预约id，用于重新修改 wx.navigateTo({ - url: '/pages/meeting/meetingReservation/meetingReservation?rId=' + _this.data.editId + '&time=' + e.detail, + url: '/pages/meeting/meetingReservation/meetingReservation?rId=' + _this.data.editId + '&time=' + chooseTimeStr, }) }, /**