|
|
|
@ -219,7 +219,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
//获取月份的开始星期
|
|
|
|
//获取月份的开始星期
|
|
|
|
let startDay =
|
|
|
|
let startDay =
|
|
|
|
new Date(`${year}-${month}-1`).getDay() != 0 ? new Date(`${year}-${month}-1`).getDay() : 7
|
|
|
|
new Date(`${year}/${month}/1`).getDay() != 0 ? new Date(`${year}/${month}/1`).getDay() : 7
|
|
|
|
|
|
|
|
|
|
|
|
//let arrayLength = Math.ceil((mDays.get(month) + startDay) / 7)
|
|
|
|
//let arrayLength = Math.ceil((mDays.get(month) + startDay) / 7)
|
|
|
|
let arrayLength = 6
|
|
|
|
let arrayLength = 6
|
|
|
|
@ -240,8 +240,8 @@
|
|
|
|
type: 2
|
|
|
|
type: 2
|
|
|
|
})
|
|
|
|
})
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
let nowDate = `${new Date().getFullYear()}-${new Date().getMonth()+1}-${new Date().getDate()}`
|
|
|
|
let nowDate = `${new Date().getFullYear()}/${new Date().getMonth()+1}/${new Date().getDate()}`
|
|
|
|
nowDate == `${this.year}-${this.month}-${date}` ?
|
|
|
|
nowDate == `${this.year}/${this.month}/${date}` ?
|
|
|
|
res[i - 1].push({
|
|
|
|
res[i - 1].push({
|
|
|
|
date,
|
|
|
|
date,
|
|
|
|
type: 0,
|
|
|
|
type: 0,
|
|
|
|
|
