diff --git a/miniprogram/api/meeting/meetingRoom.js b/miniprogram/api/meeting/meetingRoom.js index ccc5348..2b60351 100644 --- a/miniprogram/api/meeting/meetingRoom.js +++ b/miniprogram/api/meeting/meetingRoom.js @@ -73,4 +73,13 @@ export function saveMeetingRecordRq(data) { method: "post", data }); +} + +// 根据用户id查询已预约的列表 +export function selectReservationListByUserIdRq(data) { + return request({ + url: '/api/roomContent/selectReservationListByUserId?pageNum='+ data.pageNum +'&pageSize=' + data.pageSize , + method: "post", + data + }); } \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js index 48aeffb..42aa71e 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js @@ -1,5 +1,14 @@ const app = getApp() +import { + selfFormatTimeYMD, + selfFormatTimeHM +} from "../../../../utils/util.js" + +import { + selectReservationListByUserIdRq +} from "../../../../api/meeting/meetingRoom.js" + Page({ /** @@ -7,13 +16,69 @@ Page({ */ data: { IMG_NAME: app.IMG_NAME, + userData: null, + pageNum: 1, + pageSize: 10, + dataList: [], + isDataAll: false, }, /** * 生命周期函数--监听页面加载 */ onLoad(options) { + let _this = this; + _this.setData({ + userData: wx.getStorageSync('user'), + }) + // 获取数据 + _this.getDataList() + }, + // 获取数据 + getDataList() { + // 获取参数 + let _this = this; + let isDataAll = _this.data.isDataAll + let pageNum = _this.data.pageNum + let pageSize = _this.data.pageSize + let userId = _this.data.userData.id + // 判断数据是否已全部加载 + if (isDataAll) { + return; + } + // 显示-导航条加载动画 + wx.showNavigationBarLoading() + // 查询数据 + selectReservationListByUserIdRq({ + pageNum, + pageSize, + userId + }).then(res => { + console.log('selectReservationListByUserIdRq', res); + // 隐藏-导航条加载动画 + wx.hideNavigationBarLoading() + // 判断数据是否全部查询 + let queryDataList = res.rows; + if (queryDataList && queryDataList.length > 0) { + // 格式化数据 + queryDataList = queryDataList.map(item => { + item.timeSlot = selfFormatTimeYMD(item.startTime) + ' ' + selfFormatTimeHM(item.startTime) + '~' + selfFormatTimeHM(item.endDate); + return item; + }) + // 更新参数 + let dataList = _this.data.dataList.concat(queryDataList); + let pageNum = _this.data.pageNum + 1; + _this.setData({ + pageNum, + dataList, + }) + } else { + _this.setData({ + isDataAll: true + }) + } + }) }, // 跳转-支付 @@ -62,6 +127,7 @@ Page({ * 页面相关事件处理函数--监听用户下拉动作 */ onPullDownRefresh() { + console.log('onPullDownRefresh', '页面相关事件处理函数--监听用户下拉动作'); }, @@ -69,7 +135,10 @@ Page({ * 页面上拉触底事件的处理函数 */ onReachBottom() { - + console.log('onReachBottom', '页面上拉触底事件的处理函数'); + let _this = this; + // 获取数据 + _this.getDataList() }, /** @@ -81,7 +150,7 @@ Page({ path: "/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail", imageUrl: app.IMG_NAME + '/profile/static/index/banner/1.jpg', } - console.log('onShareAppMessage' , param); + console.log('onShareAppMessage', param); return param; } }) \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.json b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.json index 8180411..05f7ff7 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.json +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.json @@ -1,4 +1,5 @@ { "usingComponents": {}, - "navigationBarTitleText": "会议预约记录" + "navigationBarTitleText": "会议预约记录", + "onReachBottomDistance": 100 } \ No newline at end of file diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml index 2030f04..14b488d 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml @@ -1,20 +1,20 @@ - + - YGDH20240120122 - 待使用 + {{item.reservationNumber}} + {{item.statusName}} - + - 10人间 | B2A | 3F - space spacespace spacespace spacespace space - 2023-01-01 10:10~12:12 + {{item.roomContent.capacityNum}}人间 | {{item.roomContent.roomName}} | {{item.roomContent.buildingName}} + {{item.title}} + {{item.timeSlot}} 总价: - ¥200.00 + ¥{{item.orderMoney}} 去支付 @@ -22,7 +22,7 @@ 取消订单 - 查看会议 + 查看详情 diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss index 0cbccd0..0aa413a 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss @@ -1,5 +1,6 @@ .containerView.public { background: none; + height: auto; } .itemView {