|
@@ -30,9 +30,9 @@
|
|
todayChoose: isTodayChoose(item.year,item.month,item.date) ,
|
|
todayChoose: isTodayChoose(item.year,item.month,item.date) ,
|
|
nolm:!item.isCurM,
|
|
nolm:!item.isCurM,
|
|
today:isToday(item.year,item.month,item.date),
|
|
today:isToday(item.year,item.month,item.date),
|
|
- notallowed:isFutureDay(item.year,item.month,item.date)
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ notallowed:isFutureDay(item.year,item.month,item.date)
|
|
|
|
+
|
|
|
|
+
|
|
}">
|
|
}">
|
|
<div class="markDay" v-if="isMarkDay(item.year,item.month,item.date)"
|
|
<div class="markDay" v-if="isMarkDay(item.year,item.month,item.date)"
|
|
:class="[choose==`${item.year}-${item.month}-${item.date}` ? 'markDayChoose':'markDayNoChoose']">
|
|
:class="[choose==`${item.year}-${item.month}-${item.date}` ? 'markDayChoose':'markDayNoChoose']">
|
|
@@ -192,17 +192,23 @@ import {
|
|
// 标记日期状态颜色
|
|
// 标记日期状态颜色
|
|
calendarDaycount(y, m, d) {
|
|
calendarDaycount(y, m, d) {
|
|
let day=y + "-" + this.formatNum(m) + "-" + this.formatNum(d)
|
|
let day=y + "-" + this.formatNum(m) + "-" + this.formatNum(d)
|
|
- if(this.eventByCalendarList!=null&&this.eventByCalendarList.length>0){
|
|
|
|
- for (let i = 0; i < this.eventByCalendarList.length; i++) {
|
|
|
|
- if(this.eventByCalendarList[i].day==day&&this.eventByCalendarList[i].daycount>0&&this.eventByCalendarList[i].daycount<=10){
|
|
|
|
- return "date-state-pointer d-state-t10"
|
|
|
|
- }else if(this.eventByCalendarList[i].day==day&&this.eventByCalendarList[i].daycount>10){
|
|
|
|
- return "date-state-pointer d-state-b10"
|
|
|
|
|
|
+ if(new Date(day)<new Date()){
|
|
|
|
+ if(this.eventByCalendarList!=null&&this.eventByCalendarList.length>0){
|
|
|
|
+ for (let i = 0; i < this.eventByCalendarList.length; i++) {
|
|
|
|
+ if(this.eventByCalendarList[i].day==day){
|
|
|
|
+ if(this.eventByCalendarList[i].daycount>0&&this.eventByCalendarList[i].daycount<=10){
|
|
|
|
+ return "date-state-pointer d-state-t10"
|
|
|
|
+ }else if(this.eventByCalendarList[i].daycount>10){
|
|
|
|
+ return "date-state-pointer d-state-b10"
|
|
|
|
+ }else{
|
|
|
|
+ return "date-state-pointer d-state-zc"
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ }else{
|
|
|
|
+ return "date-state-pointer";
|
|
}
|
|
}
|
|
- return "date-state-pointer d-state-zc";
|
|
|
|
-
|
|
|
|
},
|
|
},
|
|
formatNum(num) {
|
|
formatNum(num) {
|
|
let res = Number(num);
|
|
let res = Number(num);
|