From 6ac6b290bca8ebb2ef49f81a6badad55c0be25d1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 9 Sep 2022 09:21:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityParty/calendar/cpts/calendar.vue     | 15 +++++++++++----
 .../modules/communityParty/calendar/index.vue     |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index dfcba51b2..59c7ef23d 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -120,6 +120,7 @@ export default {
   watch: {
     visibleCalendar() {
       this.init();
+      // this.iniDate();
     },
   },
   mounted() {
@@ -134,13 +135,19 @@ export default {
 
     init() {
       if (!this.currentDate) {
-        this.handleClickDate(
-          this.visibleCalendar.find((item) => item.isToday) ||
-            this.visibleCalendar.filter((item) => item.thisMonth)[0]
-        );
+        this.iniDate();
       }
     },
 
+    iniDate() {
+      this.handleClickDate(
+        this.visibleCalendar
+          .filter((item) => item.thisMonth)
+          .find((item) => item.isToday) ||
+          this.visibleCalendar.filter((item) => item.thisMonth)[0]
+      );
+    },
+
     handleClickDate(item) {
       console.log("点击日历日期", item);
       this.currentDate = item.format;
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index 56bc7f71a..ec6458769 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -450,6 +450,7 @@ export default {
     },
     currentYear: function (val) {
       console.log("watch--currentYear", val);
+      this.currentMonth = 0;
       this.getMonthData();
     },
   },