Commit 45e5e5ea by crushh

Merge branch 'bugfix/火狐时间' into master

parents f6cf2279 f124df42
...@@ -233,11 +233,15 @@ export default { ...@@ -233,11 +233,15 @@ export default {
if (!val) { if (!val) {
minTimeMonth = maxTimeMonth = null; minTimeMonth = maxTimeMonth = null;
} else { } else {
let year = new Date(val[1]).getFullYear(); let y = new Date(val[1]).getFullYear();
let month = new Date(val[1]).getMonth() + 1; let month = new Date(val[1]).getMonth() + 1;
let days = [1, 3, 5, 7, 9].includes(month) ? 31 : 30; let isLeap = (0 === y % 4 && 0 === y % 100) || 0 === y % 400;
let days = [1, 3, 5, 7, 8, 10, 12].includes(month) ? 31 : 30; // 1月、3月、5月、7月、8月、10月、12月
if (month == 2) {
isLeap ? (days = 29) : (days = 28);
}
this.form.birthDate2[0] = new Date(val[0]).getMonth() + 1 == new Date().getMonth() + 1 ? this.currentTime : val[0]; this.form.birthDate2[0] = new Date(val[0]).getMonth() + 1 == new Date().getMonth() + 1 ? this.currentTime : val[0];
this.form.birthDate2[1] = new Date(`${year}/${month}/${days} 23:59:59`).getTime(); this.form.birthDate2[1] = new Date(`${y}/${month}/${days} 23:59:59`).getTime();
console.log(this.form.birthDate2); console.log(this.form.birthDate2);
} }
this.form = Object.assign({}, this.form); this.form = Object.assign({}, this.form);
......
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