diff --git a/ui/src/layout/components/top-bar/avatar/ResetPasssword.vue b/ui/src/layout/components/top-bar/avatar/ResetPasssword.vue
index da40f1b86..9c8bbb527 100644
--- a/ui/src/layout/components/top-bar/avatar/ResetPasssword.vue
+++ b/ui/src/layout/components/top-bar/avatar/ResetPasssword.vue
@@ -7,10 +7,9 @@
:rules="rules"
>
新密码
-
+
使用邮箱
-
+
-
+
- 获取验证码
diff --git a/ui/src/styles/app.scss b/ui/src/styles/app.scss
index 721fface2..76d0f0e53 100644
--- a/ui/src/styles/app.scss
+++ b/ui/src/styles/app.scss
@@ -144,6 +144,9 @@ h4 {
.ml-8 {
margin-left: var(--app-base-px);
}
+.ml-12 {
+ margin-left: calc(var(--app-base-px) + 4px);
+}
.ml-16 {
margin-left: calc(var(--app-base-px) * 2);
}
diff --git a/ui/src/styles/element-plus.scss b/ui/src/styles/element-plus.scss
index d9e32c5f3..532c1ae9d 100644
--- a/ui/src/styles/element-plus.scss
+++ b/ui/src/styles/element-plus.scss
@@ -8,6 +8,7 @@
.el-button {
padding: 5px 12px;
+
&.is-text {
padding: 4px !important;
font-size: 16px;
@@ -22,6 +23,9 @@
border-color: var(--el-button-border-color);
}
}
+.el-button--large {
+ font-size: 16px;
+}
.el-avatar {
--el-avatar-bg-color: var(--el-color-primary);
--el-avatar-size-small: 33px;
@@ -34,25 +38,37 @@
}
.el-form-item {
- margin-bottom: 18px;
+ margin-bottom: 16px;
.el-form-item {
- margin-bottom: 18px;
+ margin-bottom: 16px;
&:last-child {
margin-bottom: 0px;
}
}
}
+.el-form-item__error {
+ position: unset;
+ font-size: 14px;
+}
.el-dialog {
--el-dialog-title-font-size: 16px;
+ --el-dialog-padding-primary: 24px;
+ --el-dialog-content-font-size: 14px;
.dialog-sub-title {
color: var(--el-text-color-regular);
margin: 5px 0;
}
.el-dialog__body {
- padding: 15px var(--el-dialog-padding-primary) 10px !important;
+ padding: 16px var(--el-dialog-padding-primary) 8px !important;
}
}
+.el-dialog__header {
+ padding-bottom: 8px;
+}
+.el-dialog__footer {
+ padding-top: 0;
+}
.el-message-box {
--el-messagebox-font-size: 16px;
@@ -191,10 +207,21 @@
}
}
.el-textarea__inner {
- font-size: 13px;
+ font-size: 14px;
}
+
.el-input__inner {
- font-size: 13px;
+ font-size: 14px;
+}
+
+.el-input__wrapper {
+ padding: 1px 12px !important;
+}
+
+.el-input--large {
+ .el-input__inner {
+ font-size: 16px;
+ }
}
.el-select-group .el-select-dropdown__item {
diff --git a/ui/src/views/login/forgot-password/index.vue b/ui/src/views/login/forgot-password/index.vue
index d5ed0dba0..e0326a23b 100644
--- a/ui/src/views/login/forgot-password/index.vue
+++ b/ui/src/views/login/forgot-password/index.vue
@@ -1,44 +1,47 @@
- 忘记密码
+ 忘记密码
-
-
-
-
-
-
+
- 立即验证
+ 立即验证
{
})
}
-
+
diff --git a/ui/src/views/login/index.scss b/ui/src/views/login/index.scss
deleted file mode 100644
index cf044384a..000000000
--- a/ui/src/views/login/index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.login-submit-button {
- height: 40px;
-}
diff --git a/ui/src/views/login/index.vue b/ui/src/views/login/index.vue
index 092eb56fb..d95354a6a 100644
--- a/ui/src/views/login/index.vue
+++ b/ui/src/views/login/index.vue
@@ -9,30 +9,32 @@
ref="loginFormRef"
@keyup.enter="login"
>
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- 登录
+ 登录
注册
@@ -43,7 +45,7 @@
link
type="primary"
>
- 忘记密码
+ 忘记密码?
@@ -100,6 +102,4 @@ const login = () => {
})
}
-
+
diff --git a/ui/src/views/login/register/index.vue b/ui/src/views/login/register/index.vue
index dd62a61b9..9ef0491c1 100644
--- a/ui/src/views/login/register/index.vue
+++ b/ui/src/views/login/register/index.vue
@@ -1,70 +1,78 @@
- 用户注册
+ 用户注册
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+ 获取验证码
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 注册
+ 注册
import { ref } from 'vue'
import type { RegisterRequest } from '@/api/type/user'
-import { UserFilled, Lock, Message, Key } from '@element-plus/icons-vue'
import { useRouter } from 'vue-router'
import UserApi from '@/api/user'
import { MsgSuccess } from '@/utils/message'
@@ -183,6 +190,4 @@ const sendEmail = () => {
})
}
-
+
diff --git a/ui/src/views/login/reset-password/index.vue b/ui/src/views/login/reset-password/index.vue
index 165caf637..de643c6be 100644
--- a/ui/src/views/login/reset-password/index.vue
+++ b/ui/src/views/login/reset-password/index.vue
@@ -1,41 +1,46 @@
- 修改密码
+ 修改密码
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- 确认修改
{
})
}
-
+