Commit 63f55650 authored by 袁玲利's avatar 袁玲利

单击日历显示消费异常

parent fac4e606
...@@ -189,30 +189,34 @@ ...@@ -189,30 +189,34 @@
let year = this.shareDate.getFullYear(); let year = this.shareDate.getFullYear();
let curMonth = this.shareDate.getMonth(); let curMonth = this.shareDate.getMonth();
let date = this.shareDate.getDate(); let date = this.shareDate.getDate();
console.log(date,'date',curMonth, 'curMonth')
let obj = { let obj = {
year: year, year: year,
month: curMonth, month: curMonth,
date: date, date: date,
disable: curMonth !== month, disable: curMonth !== month,
value: this.stringify(year, curMonth, date), value: this.stringify(year, curMonth, date),
signdate: false signdate: false,
unrecordedZao: false,
unrecordedWu: false,
unrecordedWan: false
} }
if (curMonth == month) { if (curMonth == currentToday.month) {
let f = this.groupList.filter(y => y.date == date) let f = this.groupList.filter(y => y.date == date)
if (f.length) { if (f.length) {
obj.signdate = true obj.signdate = true
if(f[0].date == 1){ if(f[0].date == 1){
currentToday = Object.assign(currentToday, f[0]) currentToday = Object.assign(currentToday, f[0])
} }
obj = Object.assign(obj, f[0])
} }
} }
list.push(obj); list.push(obj);
begin += oneDayMS; begin += oneDayMS;
} }
console.log(currentToday, 'currentToday')
this.changeToday_(currentToday) this.changeToday_(currentToday)
this.calendarList = list; this.calendarList = list;
console.log(list, 'calendarList')
} }
}, },
watch: { watch: {
......
...@@ -464,7 +464,6 @@ ...@@ -464,7 +464,6 @@
}, },
// 切换日期 // 切换日期
changeToday(today) { changeToday(today) {
console.log(today, '111111111111111111111111111111')
this.today.date = (today.month + 1) + '' + (today.date || '1') + '' this.today.date = (today.month + 1) + '' + (today.date || '1') + ''
if (Reflect.has(today, 'unrecordedZao')) { if (Reflect.has(today, 'unrecordedZao')) {
this.today.zao = today.unrecordedZao || false this.today.zao = today.unrecordedZao || false
...@@ -475,7 +474,6 @@ ...@@ -475,7 +474,6 @@
if (Reflect.has(today, 'unrecordedWan')) { if (Reflect.has(today, 'unrecordedWan')) {
this.today.wan = today.unrecordedWan || false this.today.wan = today.unrecordedWan || false
} }
console.log(this.today,'222222222222')
}, },
dateRangeChange(e) { dateRangeChange(e) {
console.log(e) console.log(e)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment