diff --git a/src/lang/en.ts b/src/lang/en.ts index 8fb2e49..8ab8029 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -48,7 +48,8 @@ export default { submit: 'Submit', enterNewPassword: 'Enter a new password for
{email}', passwordsDoNotMatch: 'Passwords do not match', - logOffTip: 'Are you sure to log off?' + logOffTip: 'Are you sure to log off?', + pleaseLogTip: 'Please log in and try again.', }, RegisterSuccess: { title1: 'Welcome to Stylish Parade!', diff --git a/src/lang/zh-cn.ts b/src/lang/zh-cn.ts index 94eeb40..f0f6230 100644 --- a/src/lang/zh-cn.ts +++ b/src/lang/zh-cn.ts @@ -46,7 +46,8 @@ export default { submit: '提交', enterNewPassword: '请输入新密码
{email}', passwordsDoNotMatch: '两次输入密码不一致', - logOffTip: '确定退出登录吗?' + logOffTip: '确定退出登录吗?', + pleaseLogTip: '请重新登录并重试。', }, RegisterSuccess: { title1: '欢迎来到 Stylish Parade!', diff --git a/src/utils/request.ts b/src/utils/request.ts index c0240df..f2c9eae 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -2,6 +2,8 @@ import axios from 'axios' import router from '@/router/index' import { useGlobalStore, useUserInfoStore } from '@/stores' import { ElMessage } from 'element-plus' +import i18n from '@/lang' +const t = i18n.global.t // 扩展 AxiosRequestConfig 接口 declare module 'axios' { @@ -117,7 +119,7 @@ service.interceptors.response.use( // }) ElMessage({ type: 'error', - message: 'Please log in and try again.', + message: t("Login.pleaseLogTip"), duration: 5000 }) useUserInfoStore().logout() diff --git a/src/views/pay/index.vue b/src/views/pay/index.vue index 4bedcc7..bd58efa 100644 --- a/src/views/pay/index.vue +++ b/src/views/pay/index.vue @@ -38,6 +38,7 @@ overflow-y: auto; --content-top: 4.8rem; > .content { + min-height: calc(var(--app-view-height) - var(--footer-height)); max-width: 160rem; margin: 0 auto; padding: 4rem 9rem 10rem;