diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.js b/miniprogram/pages/meeting/reservationRecord/approve/approve.js index 70767a0..c346bf1 100644 --- a/miniprogram/pages/meeting/reservationRecord/approve/approve.js +++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.js @@ -339,6 +339,8 @@ Page({ isNowDay = true } item.isNowDay = isNowDay + // 添加星期几属性用于颜色判断 + item.weekDay = getWeekday(item.start) item.timeSlot = selfFormatTimeYMD(item.start) + ' '+ getWeekday(item.start) +' ' + selfFormatTimeHM(item.start) + '~' + selfFormatTimeHM(item.end); // 状态字体颜色 let statusColor = "#FFB119"; diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml b/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml index 98fa6b2..6419ac7 100644 --- a/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml +++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml @@ -15,8 +15,8 @@ - {{item.timeSlot}} - {{item.timeSlot}} + {{item.timeSlot}} + {{item.timeSlot}} {{item.statusName}} diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js index 1cbbc9b..212c0d3 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.js @@ -5,7 +5,9 @@ import Notify from '@vant/weapp/notify/notify'; import { selfFormatTimeYMD, - selfFormatTimeHM + selfFormatTimeHM, + getWeekday, + getNowDate } from "../../../../utils/util.js" import { @@ -367,6 +369,16 @@ Page({ formartData(queryDataList) { // 格式化数据 return queryDataList.map(item => { + // 判断是否是当天 + let isNowDay = false + let nowDate = selfFormatTimeYMD(getNowDate()) + if (nowDate == selfFormatTimeYMD(item.start)) { + isNowDay = true + } + item.isNowDay = isNowDay + + // 添加星期几属性用于颜色判断 + item.weekDay = getWeekday(item.start) item.timeSlot = selfFormatTimeYMD(item.start) + ' ' + selfFormatTimeHM(item.start) + '~' + selfFormatTimeHM(item.end); // 状态字体颜色 let statusColor = "#FFB119"; diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml index 9a918e4..ce9e40e 100644 --- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml +++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml @@ -66,7 +66,9 @@ - {{item.timeSlot}} + + {{item.timeSlot}} + {{item.timeSlot}} {{item.statusName}}