diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js index 7df8d43..658b59d 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js @@ -45,9 +45,9 @@ Page({ dataList: [], rangeOp: [], filterTime(type, options) { - // if (type === 'minute') { - // return options.filter((option) => option == '00'); - // } + if (type === 'minute') { + return options.filter((option) => option % 15 === 0); + } return options; }, }, @@ -331,7 +331,6 @@ Page({ endMaxMinute: _endMaxMinute }) }, - /** * 生命周期函数--监听页面加载 */ diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml index 895c837..d8a3760 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml @@ -30,6 +30,10 @@ + + + + 请正确填写会议开始时间 确认时间 填写信息 diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js index ebb5f70..c995a23 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js @@ -50,9 +50,14 @@ Page({ */ onLoad(options) { console.log('onLoad', options); + let userData = wx.getStorageSync('user') + if (userData.username == userData.mobile) { + userData.username = '' + } this.setData({ ...options, - userData: wx.getStorageSync('user'), + userData: userData, + // selectDay: selfFormatTimeYMD(options.startTime), // selectCountTime, }) diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml index c301815..6156e88 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml @@ -12,7 +12,7 @@ - {{room.floor}} | {{room.roomNum}} | {{room.capacityNum}}人 | {{room.typeName}} + {{room.floor}} | {{room.roomNum}}会议室 | {{room.capacityNum}}人 | {{room.typeName}} {{room.device}} diff --git a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml index 918959c..b53e963 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingRoom.wxml @@ -10,7 +10,7 @@ - {{detail.floor}} | {{detail.roomNum}} | {{detail.capacityNum}}人 | {{detail.typeName}} + {{detail.floor}} | {{detail.roomNum}}会议室 | {{detail.capacityNum}}人 | {{detail.typeName}} {{detail.device}}