diff --git a/.env.usa b/.env.usa index 3dae9013..fb686483 100644 --- a/.env.usa +++ b/.env.usa @@ -2,7 +2,7 @@ ENV = 'usa' NODE_ENV = 'usa' # base public path -VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-03/' +VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-10/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = false diff --git a/src/assets/icons/svg/login-bg.svg b/src/assets/icons/svg/login-bg.svg new file mode 100644 index 00000000..7fe7c3cb --- /dev/null +++ b/src/assets/icons/svg/login-bg.svg @@ -0,0 +1,781 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/icons/svg/login-logo.svg b/src/assets/icons/svg/login-logo.svg new file mode 100644 index 00000000..1778278a --- /dev/null +++ b/src/assets/icons/svg/login-logo.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/title-logo.png b/src/assets/title-logo.png index 396619c9..37531211 100644 Binary files a/src/assets/title-logo.png and b/src/assets/title-logo.png differ diff --git a/src/views/login/index.vue b/src/views/login/index.vue index caff7e70..095822bc 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -15,16 +15,28 @@ /> -
- +
+ +
- -
{{ $t("login:title:system") }}
+
{{ $t("login:title:system") }}
@@ -96,7 +108,11 @@ @@ -109,6 +125,7 @@ type="text" size="medium" @click.native.prevent="handleResetPwd" + style="color: rgb(0, 147, 221)" > {{ $t("login:button:forgetPassword") }} @@ -194,6 +211,8 @@ import TopLang from "./topLang"; // import NoticeMarquee from '../trials/trials-layout/components/noticeMarquee' import Vcode from "vue-puzzle-vcode"; import Img1 from "@/assets/pic-2.png"; +import loginBg from "@/assets/icons/svg/login-bg.svg"; +import loginLogo from "@/assets/icons/svg/login-logo.svg"; export default { name: "Login", components: { TopLang, Vcode }, @@ -237,6 +256,8 @@ export default { isShow: false, showCode: false, Img1, + loginBg, + loginLogo, }; }, computed: { @@ -386,7 +407,7 @@ export default { /* 修复input 背景不协调 和光标变色 */ $bg: #283443; -$light_gray: #909399; +$light_gray: #0093dd; $cursor: #fff; // @supports (-webkit-mask: none) and (not (cater-color: $cursor)) { @@ -439,6 +460,9 @@ $light_gray: #606266; height: 100%; overflow: auto; background: rgb(249, 249, 249); + ::v-deep .el-input__inner::placeholder { + color: $dark_gray; + } .login-header { margin: 10px 0px 20px 10px; height: 3rem; @@ -454,7 +478,7 @@ $light_gray: #606266; transform: translate(-50%, -50%); // margin-top: -230px; // margin-left: -400px; - width: 1200px; + width: 1100px; height: 600px; // margin: 30px auto; box-sizing: border-box; @@ -486,6 +510,12 @@ $light_gray: #606266; height: 100%; } } + .login-image-usa { + width: 100%; + display: flex; + align-items: center; + justify-content: center; + } } .login-r { position: relative; @@ -507,7 +537,7 @@ $light_gray: #606266; .title-container { // margin-bottom: 50px; text-align: center; - margin-top: 15%; + margin-top: 18%; .title { font-size: 35px; color: $light_gray; diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue index 8bae8fb9..f243604a 100644 --- a/src/views/trials/trials-layout/components/trialsNavbar.vue +++ b/src/views/trials/trials-layout/components/trialsNavbar.vue @@ -9,7 +9,7 @@ class="title-logo" /> - + {{ $t("trials:trials:title:eics") }} @@ -225,7 +225,7 @@ export default { margin-right: 10px; } .title-logo { - height: 32px; + height: 36px; } span { font-size: 20px;