diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue index e9ffbefab..164ac9b18 100644 --- a/resources/assets/js/pages/manage/calendar.vue +++ b/resources/assets/js/pages/manage/calendar.vue @@ -293,7 +293,7 @@ export default { currentCalendarDate(format) { const cal = this.$refs.cal.getInstance(); - let currentDate = $A.dayjs([cal.getDate().getFullYear(), cal.getDate().getMonth() + 1, cal.getDate().getDate()]); + const currentDate = $A.dayjs(cal.getDate().toDate()); return currentDate.format(format); }, diff --git a/resources/assets/js/pages/manage/components/CheckinCalendar.vue b/resources/assets/js/pages/manage/components/CheckinCalendar.vue index aa975c730..c79fdccb2 100644 --- a/resources/assets/js/pages/manage/components/CheckinCalendar.vue +++ b/resources/assets/js/pages/manage/components/CheckinCalendar.vue @@ -122,7 +122,7 @@ export default { }, generateCalendar() { let today = $A.daytz().startOf('day') - let one = $A.dayjs([this.year, this.month, 1]) + let one = $A.dayjs(`${this.year}-${this.month}-1`) let calcTime = one.valueOf() - one.day() * 86400 * 1000 let array = [] for (let i = 0; i < 6; i++) { @@ -190,6 +190,7 @@ export default { .calendar-header-menu { position: relative; flex: 1; + width: 0; } .calendar-header-back { margin-right: 14px; @@ -208,6 +209,10 @@ export default { justify-content: center; } h4 { + padding: 0 50px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; line-height: 40px; background-color: #fff; text-align: center; diff --git a/resources/assets/sass/pages/page-apply.scss b/resources/assets/sass/pages/page-apply.scss index aee0e0fed..1a1d74da8 100644 --- a/resources/assets/sass/pages/page-apply.scss +++ b/resources/assets/sass/pages/page-apply.scss @@ -239,7 +239,6 @@ display: flex; flex-direction: column; max-width: 100vw; - overflow: auto; .ivu-modal-wrap-apply-title { line-height: 40px; @@ -253,6 +252,7 @@ cursor: pointer; color: #2b85e4; font-size: 14px; + padding-left: 8px; } @media (max-width: 500px) {