From 230728b8d28b610b5d3042f5ef495a7f4bd45e53 Mon Sep 17 00:00:00 2001
From: du <13220750630.163.com>
Date: 星期二, 10 六月 2025 10:51:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
easegen-front/src/locales/zh-CN.ts | 2 +-
easegen-front/src/views/Login/Login.vue | 17 ++++++++++++-----
easegen-front/src/views/Login/components/LoginForm.vue | 2 +-
easegen-front/src/views/Login/components/LoginFormTitle.vue | 5 ++++-
4 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/easegen-front/src/locales/zh-CN.ts b/easegen-front/src/locales/zh-CN.ts
index 32a3172..6730dc4 100644
--- a/easegen-front/src/locales/zh-CN.ts
+++ b/easegen-front/src/locales/zh-CN.ts
@@ -369,7 +369,7 @@
},
login: {
backSignIn: '杩斿洖',
- signInFormTitle: '鐧诲綍',
+ signInFormTitle: '鐧� 褰�',
ssoFormTitle: '涓夋柟鎺堟潈',
mobileSignInFormTitle: '鎵嬫満鐧诲綍',
qrSignInFormTitle: '浜岀淮鐮佺櫥褰�',
diff --git a/easegen-front/src/views/Login/Login.vue b/easegen-front/src/views/Login/Login.vue
index ebca7cb..443689e 100644
--- a/easegen-front/src/views/Login/Login.vue
+++ b/easegen-front/src/views/Login/Login.vue
@@ -4,7 +4,8 @@
<!-- 宸︿晶鍥剧墖 -->
<div class="Left-Area">
<div class="TitleText">
- <h1>鏁板瓧浜烘櫤鑳戒氦浜掑钩鍙�</h1>
+ <h1>鏁板瓧浜�</h1>
+ <h1>鏅鸿兘浜や簰骞冲彴</h1>
</div>
</div>
<!-- 鍙宠竟鐨勭櫥褰曠晫闈� -->
@@ -90,7 +91,7 @@
}
.bei .BeiArea .Left-Area {
- width: 500px;
+ width: 420px;
height: 450px;
display: flex;
justify-content: center;
@@ -100,6 +101,7 @@
.bei .BeiArea .Left-Area .TitleText {
display: flex;
+ flex-direction: column;
justify-content: center;
align-items: center;
}
@@ -107,13 +109,18 @@
.bei .BeiArea .Left-Area .TitleText h1 {
color: #fff;
font-size: 2.6rem;
+ text-align: center;
+}
+
+.bei .BeiArea .Left-Area .TitleText h1:first-of-type{
+ margin-bottom: 20px;
}
.bei .BeiArea .form-box {
box-sizing: border-box;
background: #fff;
/* width: calc(400px + (100vw - 1900px) * 0.5); */
- width: 500px;
+ width: 420px;
height: 450px;
padding: 20px 40px;
}
@@ -143,13 +150,13 @@
@media ( max-width:1550px ){
.bei .BeiArea .Left-Area .TitleText h1{
- font-size: 2.4rem !important;
+ font-size: 2.6rem !important;
}
}
@media ( max-width:1050px ){
.bei .BeiArea .Left-Area .TitleText h1{
- font-size: 2rem !important;
+ font-size: 2.6rem !important;
}
}
diff --git a/easegen-front/src/views/Login/components/LoginForm.vue b/easegen-front/src/views/Login/components/LoginForm.vue
index 5c83098..d00276d 100644
--- a/easegen-front/src/views/Login/components/LoginForm.vue
+++ b/easegen-front/src/views/Login/components/LoginForm.vue
@@ -382,7 +382,7 @@
padding: 20px;
box-sizing: border-box;
font-size: 20px;
- margin-top: 10px;
+ margin-top: 15px;
}
}
}
diff --git a/easegen-front/src/views/Login/components/LoginFormTitle.vue b/easegen-front/src/views/Login/components/LoginFormTitle.vue
index ae3a2c4..c90dd00 100644
--- a/easegen-front/src/views/Login/components/LoginFormTitle.vue
+++ b/easegen-front/src/views/Login/components/LoginFormTitle.vue
@@ -3,11 +3,14 @@
.c717a8a{
color: #717a8a;
text-align: center;
+ font-weight: 400;
+ margin-bottom: 5px;
+ margin-top: 45px;
}
</style>
<template>
- <h2 class="enter-x mb-3 text-2xl font-bold xl:text-3xl c717a8a" >
+ <h2 class="enter-x mb-3 text-2xl xl:text-3xl c717a8a" >
{{ getFormTitle }}
</h2>
</template>
--
Gitblit v1.9.3