From e2e7bc8d72b03ec0dddea4d29b2616c29a052693 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 22 Oct 2024 20:39:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DiOS=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/pages/manage/calendar.vue              | 2 +-
 .../assets/js/pages/manage/components/CheckinCalendar.vue  | 7 ++++++-
 resources/assets/sass/pages/page-apply.scss                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

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) {