diff --git a/src/layout/header/GlobalTime.tsx b/src/layout/header/GlobalTime.tsx index 4d0eb15..d10287f 100644 --- a/src/layout/header/GlobalTime.tsx +++ b/src/layout/header/GlobalTime.tsx @@ -42,14 +42,21 @@ export default defineComponent({
@@ -58,7 +65,7 @@ export default defineComponent({
{settings.state.timeOptions.includes('date') &&
{text.value.dateStr}
} - {!layout.isCompact && settings.state.timeOptions.includes('week') && ( -
星期{info.value.dayWeek}
- )} + {!(layout.isCompact && !layout.state.simple) && + settings.state.timeOptions.includes('week') && ( +
星期{info.value.dayWeek}
+ )}
- {!layout.isCompact && settings.state.timeOptions.includes('lunal') && ( -
{info.value.day}
- )} + {!(layout.isCompact && !layout.state.simple) && + settings.state.timeOptions.includes('lunal') &&
{info.value.day}
}
) : settings.state!.showTime && (
{settings.state.timeOptions.includes('date') &&
{text.value.dateStr}
} diff --git a/src/layout/header/search/index.tsx b/src/layout/header/search/index.tsx index 3898100..07acbb8 100644 --- a/src/layout/header/search/index.tsx +++ b/src/layout/header/search/index.tsx @@ -23,7 +23,7 @@ export default defineComponent( props.isMini ? {} : { - top: layout.isCompact ? '50px' : layout.state.simple ? '230px' : '172px', + top: layout.isCompact && !layout.state.simple ? '50px' : layout.state.simple ? '230px' : '172px', width: settings.state.searchWidth + 'rem' } }