diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js index 565eba3..4e05612 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js @@ -55,8 +55,8 @@ Page({ confirmTime() { let _this = this; let meetingRoomId = _this.data.meetingRoomId; - let startTime = _this.data.startTime; - let endTime = _this.data.endTime; + let startTime = selfFormatTimeYMDHMS(_this.data.startTime); + let endTime = selfFormatTimeYMDHMS(_this.data.endTime); let paramUrl = "?meetingRoomId=" + meetingRoomId + "&startTime=" + startTime + "&endTime=" + endTime; // 当前会议室是否可以预约 diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js index ae6c60c..589b6c1 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.js @@ -4,6 +4,13 @@ import { meetingRoomDetailRq } from "../../../../api/meeting/meetingRoom.js" +import { + selfFormatTimeYMD, + selfFormatTimeHM, + twoTimeInterval +} from "../../../../utils/util.js" + + Page({ /** @@ -16,11 +23,11 @@ Page({ meetingRoomId: null, startTime: null, endTime: null, - selectDay : null, - selectCountTime : null, + selectDay: null, + selectCountTime: null, bannerList: [], room: {}, - userData : {}, + userData: {}, }, /** @@ -28,9 +35,12 @@ Page({ */ onLoad(options) { console.log('onLoad', options); - // 获取传递参数 + let selectCountTime = selfFormatTimeHM(options.startTime) + "-" + selfFormatTimeHM(options.endTime) + ' 共计' + twoTimeInterval(options.startTime , options.endTime) this.setData({ - ...options + ...options, + userData: wx.getStorageSync('user'), + selectDay: selfFormatTimeYMD(options.startTime), + selectCountTime }) // 详细信息 this.getDetail(); @@ -42,7 +52,7 @@ Page({ meetingRoomDetailRq(this.data.meetingRoomId).then(res => { _this.setData({ room: res.roomContent, - bannerList : [res.roomContent.indoorPicUrl] + bannerList: [res.roomContent.indoorPicUrl] }) }) }, diff --git a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml index c5f0875..c3c16ed 100644 --- a/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml +++ b/miniprogram/pages/meeting/meetingRoom/meetingOrder/meetingOrder.wxml @@ -27,15 +27,15 @@ - 2024-01-01 + {{selectDay}} - 10:00-11:00 共计1小时 + {{selectCountTime}} - admin 10086 + {{userData.username}} {{userData.mobile}} diff --git a/miniprogram/utils/util.js b/miniprogram/utils/util.js index 02df8d9..f2eee38 100644 --- a/miniprogram/utils/util.js +++ b/miniprogram/utils/util.js @@ -98,6 +98,62 @@ function selfFormatTimeYMDHMS(time) { return [year, month, day].map(formatNumber).join('-') + ' ' + [hour, minute, second].map(formatNumber).join(':') } +//返回 例 2017-12-12 +function selfFormatTimeYMD(time) { + let date = new Date(time) + let year = date.getFullYear() + let month = date.getMonth() + 1 + let day = date.getDate() + let hour = date.getHours() + let minute = date.getMinutes() + let second = date.getSeconds() + return [year, month, day].map(formatNumber).join('-') +} + +//返回 12:30 +function selfFormatTimeHM(time) { + let date = new Date(time); + let year = date.getFullYear() + let month = date.getMonth() + 1 + let day = date.getDate() + let hour = date.getHours() + let minute = date.getMinutes() + let second = date.getSeconds() + + return [hour, minute].map(formatNumber).join(':') +} + +/** + * JS 计算两个时间间隔多久(时分秒) + * @param startTime "2019-10-23 15:27:23" + * @param endTime "2019-10-23 15:27:55" + * @return 1天2时3分5秒 + */ +function twoTimeInterval(startTime, endTime) { + // 开始时间 + let date1 = new Date(startTime); + // 结束时间 + let date2 = new Date(endTime); + // 时间相差秒数 + let dateDiff = date2.getTime() - date1.getTime(); + // 计算出相差天数 + let days = Math.floor(dateDiff / (24 * 3600 * 1000)); + // 计算出小时数 + let residue1 = dateDiff % (24 * 3600 * 1000); // 计算天数后剩余的毫秒数 + let hours = Math.floor(residue1 / (3600 * 1000)); + // 计算相差分钟数 + let residue2 = residue1 % (3600 * 1000); // 计算小时数后剩余的毫秒数 + let minutes = Math.floor(residue2 / (60 * 1000)); + // 计算相差秒数 + let residue3 = residue2 % (60 * 1000); // 计算分钟数后剩余的毫秒数 + let seconds = Math.round(residue3 / 1000); + let returnVal = + ((days == 0) ? "" : days + "天") + + ((hours == 0) ? "" : hours + "时") + + ((minutes == 0) ? "" : minutes + "分") + // + ((seconds == 0) ? "" : seconds + "秒"); + return returnVal; +} const formatNumber = n => { n = n.toString() @@ -112,5 +168,8 @@ module.exports = { formatHour: formatHour, formatTime2: formatTime2, selfFormatTimeReturnSecond59, - selfFormatTimeYMDHMS + selfFormatTimeYMDHMS, + selfFormatTimeYMD, + selfFormatTimeHM, + twoTimeInterval } \ No newline at end of file