Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/Aida_Purchaser_Front

src/lang/en.ts

@@ -48,7 +48,8 @@ export default {
 		submit: 'Submit',
 		enterNewPassword: 'Enter a new password for<br/><span>{email}</span>',
 		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!',

src/lang/zh-cn.ts

@@ -46,7 +46,8 @@ export default {
 		submit: '提交',
 		enterNewPassword: '请输入新密码<br/><span>{email}</span>',
 		passwordsDoNotMatch: '两次输入密码不一致',
-		logOffTip: '确定退出登录吗？'
+		logOffTip: '确定退出登录吗？',
+		pleaseLogTip: '请重新登录并重试。',
 	},
 	RegisterSuccess: {
 		title1: '欢迎来到 Stylish Parade！',

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()

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;