Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -354,9 +354,9 @@ export default {
|
||||
let yy = new Date().getFullYear();
|
||||
let mm = new Date().getMonth() + 1;
|
||||
let dd = new Date().getDate();
|
||||
if (mm < 10) {
|
||||
mm = this.padding0(mm, 2)
|
||||
}
|
||||
// if (mm < 10) {
|
||||
// mm = this.padding0(mm, 2)
|
||||
// }
|
||||
if (dd < 10) {
|
||||
dd = this.padding0(dd, 2)
|
||||
}
|
||||
@@ -443,9 +443,9 @@ export default {
|
||||
let yy = new Date().getFullYear();
|
||||
let mm = new Date().getMonth() + 1;
|
||||
let dd = new Date().getDate();
|
||||
if (mm < 10) {
|
||||
mm = this.padding0(mm, 2)
|
||||
}
|
||||
// if (mm < 10) {
|
||||
// mm = this.padding0(mm, 2)
|
||||
// }
|
||||
this.formData.month = mm + '月'
|
||||
if (dd < 10) {
|
||||
dd = this.padding0(dd, 2)
|
||||
@@ -800,12 +800,12 @@ export default {
|
||||
let yy = new Date().getFullYear();
|
||||
let mm = new Date().getMonth() + 1;
|
||||
let dd = new Date().getDate();
|
||||
if (mm < 10) {
|
||||
mm = this.padding0(mm, 2)
|
||||
}
|
||||
if (dd < 10) {
|
||||
dd = this.padding0(dd, 2)
|
||||
}
|
||||
// if (mm < 10) {
|
||||
// mm = this.padding0(mm, 2)
|
||||
// }
|
||||
// if (dd < 10) {
|
||||
// dd = this.padding0(dd, 2)
|
||||
// }
|
||||
this.nowDate = yy + '-' + mm + '-' + dd
|
||||
this.formData.year = yy + '年'
|
||||
this.formData.month = mm + '月'
|
||||
|
||||
Reference in New Issue
Block a user