From 2239c23a1e580dd95606a67040677d0b5322e39a Mon Sep 17 00:00:00 2001 From: Frost-ZX Date: Sat, 31 Aug 2024 16:06:54 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=B9=B4=E6=9F=B1=E3=80=81?= =?UTF-8?q?=E6=9C=88=E6=9F=B1=E3=80=81=E6=97=A5=E6=9F=B1=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/IndexView/IndexView.vue | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/views/IndexView/IndexView.vue b/src/views/IndexView/IndexView.vue index 745c98d..6c9c4ce 100644 --- a/src/views/IndexView/IndexView.vue +++ b/src/views/IndexView/IndexView.vue @@ -8,11 +8,16 @@
{{ timeInfo.time }}
- {{ timeInfo.date1 }} - {{ timeInfo.week }} - {{ timeInfo.date2 }} - {{ timeInfo.festival }} - {{ timeInfo.solarTerm }} +
+ {{ timeInfo.date1 }} + {{ timeInfo.week }} + {{ timeInfo.festival }} + {{ timeInfo.solarTerm }} +
+
+ {{ timeInfo.date2 }} + {{ timeInfo.date3 }} +
@@ -38,9 +43,12 @@ const timeInfo = reactive({ /** 公历 */ date1: '', - /** 阴历 */ + /** 农历 */ date2: '', + /** 八字 */ + date3: '', + /** 节日 */ festival: '', @@ -67,8 +75,10 @@ function updateTime() { // 公历 timeInfo.date1 = date.format('YYYY 年 M 月 D 日'); - // 阴历 + // 农历 timeInfo.date2 = date.format('lMlD'); + // 八字 + timeInfo.date3 = date.format('cY年 cM月 cD日'); // 节日 timeInfo.festival = markers.list.map(v => v.name).join(' & '); // 节气