描述:修改

miniprogram/api/meeting/meetingRoom.js

@@ -74,3 +74,12 @@ export function saveMeetingRecordRq(data) {
         data
     });
 }
+
+// 根据用户id查询已预约的列表
+export function selectReservationListByUserIdRq(data) {
+    return request({
+        url: '/api/roomContent/selectReservationListByUserId?pageNum='+ data.pageNum +'&pageSize=' + data.pageSize ,
+        method: "post",
+        data
+    });
+}

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()
     },
 
     /**

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.json

@@ -1,4 +1,5 @@
 {
     "usingComponents": {},
-    "navigationBarTitleText": "会议预约记录"
+    "navigationBarTitleText": "会议预约记录",
+    "onReachBottomDistance": 100
 }

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml

@@ -1,20 +1,20 @@
 <view class="containerView public">
-    <view class="itemView" wx:for="{{2}}">
+    <view class="itemView" wx:for="{{dataList}}" wx:for-item="item"  wx:key="*this">
         <view class="headView">
-            <view class="number">YGDH20240120122</view>
+            <view class="number">{{item.reservationNumber}}</view>
-            <view class="status">待使用</view>
+            <view class="status">{{item.statusName}}</view>
         </view>
-        <view class="contentView" bind:tap="jumpMeetingDetail">
+        <view class="contentView" bind:tap="jumpMeetingDetail" data-id="{{item.id}}">
             <image class="img" src="{{IMG_NAME + '/profile/static/index/banner/1.jpg'}}" mode="aspectFill"></image>
             <view class="msgView">
-                <view class="title">10人间 | B2A | 3F</view>
+                <view class="title">{{item.roomContent.capacityNum}}人间 | {{item.roomContent.roomName}} | {{item.roomContent.buildingName}}</view>
-                <view class="name">space spacespace spacespace spacespace space</view>
+                <view class="name">{{item.title}}</view>
-                <view class="time">2023-01-01 10:10~12:12</view>
+                <view class="time">{{item.timeSlot}}</view>
             </view>
         </view>
         <view class="priceView">
             <view class="name">总价:</view>
-            <view class="price">￥200.00</view>
+            <view class="price">￥{{item.orderMoney}}</view>
         </view>
         <view class="btnView">
             <view class="btn" bind:tap="jumpPay">去支付</view>
@@ -22,7 +22,7 @@
                 <button class="shareBtn" open-type="share">转发</button>
             </view>
             <view class="btn">取消订单</view>
-            <view class="btn" bind:tap="jumpMeetingDetail">查看会议</view>
+            <view class="btn" bind:tap="jumpMeetingDetail" data-id="{{item.id}}">查看详情</view>
         </view>
     </view>
 

miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxss

@@ -1,5 +1,6 @@
 .containerView.public {
     background: none;
+    height: auto;
 }
 
 .itemView {