diff --git a/src/widgets/calendar/Modal.tsx b/src/widgets/calendar/Modal.tsx
index b98b4ee..09aa28d 100644
--- a/src/widgets/calendar/Modal.tsx
+++ b/src/widgets/calendar/Modal.tsx
@@ -33,7 +33,9 @@ export default defineComponent(() => {
{store.state.select.format('D')}
{store.state.select.format('ddd')}
- 本年第{store.state.select.diff(store.state.select.set('date', 1).set('months', 0), 'weeks')}周,第
+ 本年第
+ {store.state.select.diff(store.state.select.set('date', 1).set('months', 0), 'weeks')}
+ 周,第
{store.state.select.diff(store.state.select.set('date', 1).set('month', 0), 'day')}天
@@ -56,10 +58,8 @@ export default defineComponent(() => {
>
宜
-
- {lunar.value.getDayYi().map((item: any) => {
- return
{item},
- })}
+
+ {lunar.value.getDayYi().join(',')}
@@ -70,10 +70,8 @@ export default defineComponent(() => {
>
忌
-
- {lunar.value.getDayJi().map((item: any) => {
- return
{item},
- })}
+
+ {lunar.value.getDayJi().join(',')}
@@ -158,8 +156,10 @@ export default defineComponent(() => {
dayjs(),
'day'
),
- 'border-transparent border-solid': !el.day.isSame(dayjs(), 'day') && !el.day.isSame(store.state.select, 'day'),
- 'border-[#76d7f2] border-solid border-[1px]': !el.day.isSame(dayjs(), 'day') && el.day.isSame(store.state.select, 'day'),
+ 'border-transparent border-solid':
+ !el.day.isSame(dayjs(), 'day') && !el.day.isSame(store.state.select, 'day'),
+ 'border-[#76d7f2] border-solid border-[1px]':
+ !el.day.isSame(dayjs(), 'day') && el.day.isSame(store.state.select, 'day')
}
)}
>
diff --git a/src/widgets/hotspot/Small.tsx b/src/widgets/hotspot/Small.tsx
index 31a6ffa..2f238d1 100644
--- a/src/widgets/hotspot/Small.tsx
+++ b/src/widgets/hotspot/Small.tsx
@@ -10,7 +10,7 @@ export default defineComponent(() => {