From c9e652e1fa248588219de7468174c2c28596ae02 Mon Sep 17 00:00:00 2001 From: luoyu Date: Thu, 22 May 2025 22:07:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E8=BF=9B=E5=85=A5=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=BB=98=E8=AE=A4=E4=B8=BA?= =?UTF-8?q?=E5=BE=85=E5=BC=80=E5=A7=8B-20250522?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- miniprogram/pages/meeting/index/index.js | 6 +-- .../reservationRecord/approve/approve.js | 21 +++++++- .../meetingRecord/meetingRecord.js | 54 +++++++++++++++---- .../meetingRecord/meetingRecord.wxml | 4 +- 4 files changed, 68 insertions(+), 17 deletions(-) diff --git a/miniprogram/pages/meeting/index/index.js b/miniprogram/pages/meeting/index/index.js index 6204893..269cd20 100644 --- a/miniprogram/pages/meeting/index/index.js +++ b/miniprogram/pages/meeting/index/index.js @@ -22,7 +22,7 @@ Page({ type: "record", name: "预约记录", img: "/profile/static/meeting/index/record.png", - path: "/pages/meeting/reservationRecord/meetingRecord/meetingRecord", + path: "/pages/meeting/reservationRecord/meetingRecord/meetingRecord?status=7", visible: true }, { type: "approve", @@ -85,7 +85,7 @@ Page({ */ onLoad(options) { Dialog.alert({ - message: '1、此系统分配的账号仅用于会议室申请预约，请各单位专人扎口负责会议预定管理工作。\n2、系统提示“预约提交成功”后请及时关注预约进度和短信通知！若有疑问请随时拨打会议服务热线：83605343。\n3、会议开始前如需调整会议，请及时通过系统操作或电话告知，已预约成功的会议室可能因临时重大会议取消或调剂，请理解配合。\n注：会议预定系统技术支持QQ群：技术支持临时群（929670630）', + message: '1、此系统分配的账号仅用于会议室申请预约，请各单位专人扎口负责会议预定管理工作。\n2、系统提示"预约提交成功"后请及时关注预约进度和短信通知！若有疑问请随时拨打会议服务热线：83605343。\n3、会议开始前如需调整会议，请及时通过系统操作或电话告知，已预约成功的会议室可能因临时重大会议取消或调剂，请理解配合。\n注：会议预定系统技术支持QQ群：技术支持临时群（929670630）', messageAlign: 'left', }).then(() => { // on close @@ -205,7 +205,7 @@ Page({ item.visible = true } if (item.type == 'record') { - item.path = '/pages/meeting/reservationRecord/approve/approve?act=show' + item.path = '/pages/meeting/reservationRecord/approve/approve?act=show&status=7' item.visible = true } return item diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.js b/miniprogram/pages/meeting/reservationRecord/approve/approve.js index df08ae4..feeb0bb 100644 --- a/miniprogram/pages/meeting/reservationRecord/approve/approve.js +++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.js @@ -174,8 +174,8 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - let act = options.act - if (act == 'show') { + // 这里opt接收options以处理查看更多 + if (options.act == 'show') { wx.setNavigationBarTitle({ title: '预约记录', }) @@ -183,6 +183,23 @@ Page({ 'search.status.value': '' }) } + + // 检查是否有URL参数指定状态 + if (options && options.status) { + this.setData({ + 'search.status.value': parseInt(options.status) || 7 + }); + + // 初始化状态文本 + const statusOption = this.data.search.status.option; + const selectedOption = statusOption.find(option => option.value === this.data.search.status.value); + if (selectedOption) { + this.setData({ + 'search.status.text': selectedOption.text + }); + } + } + let _this = this; let userDetail = wx.getStorageSync('user') _this.setData({ diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js index 1cd4c6a..1cbbc9b 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js @@ -35,7 +35,8 @@ Page({ value: '' }, status: { - value: '', + text: '待开始', + value: 7, option: [{ text: '全部预约', value: '' @@ -154,6 +155,23 @@ Page({ reservationIsDataAll: false, ['search.status.value']: e.detail }) + + // 更新状态文本 + const statusOption = this.data.search.status.option; + const selectedOption = statusOption.find(option => option.value === e.detail); + if (selectedOption) { + this.setData({ + ['search.status.text']: selectedOption.text + }); + // 手动更新页面组件 + if (this.selectComponent) { + const dropdown = this.selectComponent('.van-dropdown-menu'); + if (dropdown) { + dropdown.updateItemTitle(1, selectedOption.text); + } + } + } + this.getDataList() }, changeSearchSort(e) { @@ -172,17 +190,27 @@ Page({ onLoad(options) { let _this = this; let userDetail = wx.getStorageSync('user') + + // 检查是否有URL参数指定状态 + if (options && options.status) { + this.setData({ + ['search.status.value']: parseInt(options.status) || 7 + }); + } + + // 初始化状态文本 + const statusOption = _this.data.search.status.option; + const selectedOption = statusOption.find(option => option.value === _this.data.search.status.value); + let statusText = '待开始'; + if (selectedOption) { + statusText = selectedOption.text; + } + _this.setData({ userData: userDetail, + ['search.status.text']: statusText }) - // 获取数据 - let userId = _this.data.userData.id - // 获取预约数据 - _this.getReservationData({ - userId, - pageNum: _this.data.reservationPageNum, - pageSize: _this.data.reservationPageSize, - }) + // 获取两周后时间，默认只能选两周之后，管理员可以选一年后的 const today = new Date() const newDate = new Date(today) @@ -195,6 +223,9 @@ Page({ maxDate: newDate.getTime() }) + // 使用getDataList统一获取数据，确保应用筛选条件 + _this.getDataList(); + // 获取参与数据 // _this.getParticipateData({ // userId, @@ -574,7 +605,10 @@ Page({ * 生命周期函数--监听页面初次渲染完成 */ onReady() { - + // 确保初始状态正确 + this.setData({ + ['search.status.value']: 7 // 确保状态值为待开始 + }); }, /** diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml index 9b446e6..cc8f4ec 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml @@ -50,7 +50,7 @@ --> - + @@ -61,7 +61,7 @@ - +