diff --git a/Web/src/utils/formatTime.ts b/Web/src/utils/formatTime.ts index d5cf3638..7e90d71d 100644 --- a/Web/src/utils/formatTime.ts +++ b/Web/src/utils/formatTime.ts @@ -123,14 +123,34 @@ export function formatPast(param: string | Date, format: string = 'YYYY-mm-dd'): * @description param 调用 `formatAxis(new Date())` 输出 `上午好` * @returns 返回拼接后的时间字符串 */ -export function formatAxis(param: Date): string { +export function formatAxis(param: Date, t?: Function): string { let hour: number = new Date(param).getHours(); - if (hour < 6) return '凌晨好'; - else if (hour < 9) return '早上好'; - else if (hour < 12) return '上午好'; - else if (hour < 14) return '中午好'; - else if (hour < 17) return '下午好'; - else if (hour < 19) return '傍晚好'; - else if (hour < 22) return '晚上好'; - else return '夜里好'; + + // 如果没有传入翻译函数,使用默认中文 + const defaultMessages = { + dawnGreeting: '凌晨好', + mornGreeting: '早上好', + amGreeting: '上午好', + noonGreeting: '中午好', + pmGreeting: '下午好', + duskGreeting: '傍晚好', + eveningGreeting: '晚上好', + nightGreeting: '夜里好' + }; + + const getMessage = (key: string) => { + if (t) { + return t(`message.list.${key}`); + } + return defaultMessages[key as keyof typeof defaultMessages]; + }; + + if (hour < 6) return getMessage('dawnGreeting'); + else if (hour < 9) return getMessage('mornGreeting'); + else if (hour < 12) return getMessage('amGreeting'); + else if (hour < 14) return getMessage('noonGreeting'); + else if (hour < 17) return getMessage('pmGreeting'); + else if (hour < 19) return getMessage('duskGreeting'); + else if (hour < 22) return getMessage('eveningGreeting'); + else return getMessage('nightGreeting'); } diff --git a/Web/src/views/login/component/account.vue b/Web/src/views/login/component/account.vue index ef2053b1..ddc4b33b 100644 --- a/Web/src/views/login/component/account.vue +++ b/Web/src/views/login/component/account.vue @@ -201,7 +201,7 @@ const getCaptcha = async () => { // 获取时间 const currentTime = computed(() => { - return formatAxis(new Date()); + return formatAxis(new Date(), t); }); // 登录 diff --git a/Web/src/views/login/component/mobile.vue b/Web/src/views/login/component/mobile.vue index c83045e6..4ff99362 100644 --- a/Web/src/views/login/component/mobile.vue +++ b/Web/src/views/login/component/mobile.vue @@ -166,7 +166,7 @@ const signInSuccess = (isNoPower: boolean | undefined) => { // 获取时间 const currentTime = computed(() => { - return formatAxis(new Date()); + return formatAxis(new Date(),t); });