From 55f28e74f4911a8daaface48f3ebbc64fc3f20e5 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Thu, 8 Sep 2022 11:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=8E=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/modules/communityParty/calendar/cpts/calendar.vue b/src/views/modules/communityParty/calendar/cpts/calendar.vue
index 401f2c828..dfcba51b2 100644
--- a/src/views/modules/communityParty/calendar/cpts/calendar.vue
+++ b/src/views/modules/communityParty/calendar/cpts/calendar.vue
@@ -128,7 +128,7 @@ export default {
   },
   methods: {
     computeNongliText(y, m, d) {
-      let item = nongli.solar2lunar(y, m+1, d);
+      let item = nongli.solar2lunar(y, m + 1, d);
       return item.festival || item.lunarFestival || item.Term || item.IDayCn;
     },
 
@@ -164,8 +164,8 @@ export default {
     left: 0;
     right: 0;
     bottom: 0;
-    border-left: 1px solid #eee;
-    border-top: 1px solid #eee;
+    border-left: 1px solid #e5e5e5;
+    border-top: 1px solid #e5e5e5;
     pointer-events: none;
   }
 
@@ -178,7 +178,7 @@ export default {
       padding: 20px 0;
       font-size: 20px;
       font-weight: bold;
-      background-color: #e6a23c;
+      background-color: rgba(#ccc, 0.2);
       text-align: center;
 
       &::after {
@@ -189,9 +189,9 @@ export default {
         left: 0;
         right: 0;
         bottom: 0;
-        border-right: 1px solid #eee;
+        border-right: 1px solid #e5e5e5;
         pointer-events: none;
-        border-bottom: 1px solid #eee;
+        border-bottom: 1px solid #e5e5e5;
       }
 
       &.z-weekend {
@@ -222,8 +222,8 @@ export default {
         left: 0;
         right: 0;
         bottom: 0;
-        border-right: 1px solid #eee;
-        border-bottom: 1px solid #eee;
+        border-right: 1px solid #e5e5e5;
+        border-bottom: 1px solid #e5e5e5;
         pointer-events: none;
       }
 
@@ -235,12 +235,21 @@ export default {
         color: #3e8ef7;
       }
 
-      .nongli{
+      .nongli {
         position: absolute;
         z-index: 0;
         left: 0;
         right: 0;
         text-align: center;
+        color: #bbb;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      &.z-weekend {
+        .date {
+          color: #ff3333;
+        }
       }
 
       &.z-on {
@@ -267,12 +276,6 @@ export default {
           font-weight: 700;
         }
       }
-
-      &.z-weekend {
-        .date {
-          color: #ff3333;
-        }
-      }
     }
   }
 }
diff --git a/src/views/modules/communityParty/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue
index 792ae46b4..4ba40f08d 100644
--- a/src/views/modules/communityParty/calendar/index.vue
+++ b/src/views/modules/communityParty/calendar/index.vue
@@ -789,6 +789,8 @@ $red: #f33;
           font-size: 14px;
           font-weight: bold;
           cursor: pointer;
+          opacity: 0.7;
+          transform: scale(0.94);
         }
       }
     }