|
@@ -6,6 +6,8 @@ import styles from './index.module.less'
|
|
|
import IconArrow from '@/common/images/icon_arrow.png'
|
|
|
import IconClock from '@/common/images/icon_clock.png'
|
|
|
import { ElButton, ElDialog, ElMessage, ElTag } from 'element-plus'
|
|
|
+import isToday from 'dayjs/plugin/isToday'
|
|
|
+dayjs.extend(isToday)
|
|
|
|
|
|
export default defineComponent({
|
|
|
name: 'calendar',
|
|
@@ -112,7 +114,8 @@ export default defineComponent({
|
|
|
const dateStr = dayjs(date.date).format('YYYY-MM-DD')
|
|
|
const dateObj = this.list[dateStr]
|
|
|
// 判断是否有课程 并且 时间在当前时间之后
|
|
|
- if (dateObj && dayjs().isBefore(dayjs(date.date))) {
|
|
|
+ date.type = ''
|
|
|
+ if (dateObj && dayjs().subtract(1, 'day').isBefore(dayjs(date.date))) {
|
|
|
if (
|
|
|
dateObj &&
|
|
|
(dateObj.fullCourse ||
|
|
@@ -126,12 +129,15 @@ export default defineComponent({
|
|
|
} else {
|
|
|
date.type = 'disabled'
|
|
|
}
|
|
|
+ if(this.$route.name == 'userInfoLiveOperation' && dayjs(date.date).isToday()) {
|
|
|
+ date.type = 'disabled'
|
|
|
+ }
|
|
|
if (dateObj && this.isSkipHolidays && dateObj.holiday) {
|
|
|
// date.bottomInfo = '节假日'
|
|
|
date.type = 'disabled'
|
|
|
}
|
|
|
|
|
|
- date.type = date.type === 'selected' ? '' : date.type
|
|
|
+ // date.type = date.type === 'selected' ? '' : date.type
|
|
|
return date
|
|
|
},
|
|
|
onPrevMonth() {
|
|
@@ -198,7 +204,12 @@ export default defineComponent({
|
|
|
},
|
|
|
_dayChange(date: Date) {
|
|
|
const dateStr = dayjs(date).format('YYYY-MM-DD')
|
|
|
- let dataList = (this.list[dateStr] && this.list[dateStr].courseTime) || []
|
|
|
+ let dataList = [] as any
|
|
|
+ if (this.list[dateStr] && Array.isArray(this.list[dateStr].courseTime)) {
|
|
|
+ dataList = [...this.list[dateStr].courseTime].filter(n =>
|
|
|
+ dayjs().isBefore(dayjs(n.startTime))
|
|
|
+ )
|
|
|
+ }
|
|
|
dataList.forEach((item: any) => {
|
|
|
item.start = dayjs(item.startTime).format('HH:mm')
|
|
|
item.end = dayjs(item.endTime).format('HH:mm')
|