diff --git a/src/assets/imgs/login/bg.png b/src/assets/imgs/login/bg.png new file mode 100644 index 000000000..0ef8a3cec Binary files /dev/null and b/src/assets/imgs/login/bg.png differ diff --git a/src/assets/imgs/login/big-arrow-left.png b/src/assets/imgs/login/big-arrow-left.png new file mode 100644 index 000000000..759065e76 Binary files /dev/null and b/src/assets/imgs/login/big-arrow-left.png differ diff --git a/src/assets/imgs/login/big-arrow-right.png b/src/assets/imgs/login/big-arrow-right.png new file mode 100644 index 000000000..c16f15a7e Binary files /dev/null and b/src/assets/imgs/login/big-arrow-right.png differ diff --git a/src/assets/imgs/login/card-bg.png b/src/assets/imgs/login/card-bg.png new file mode 100644 index 000000000..f91abfafd Binary files /dev/null and b/src/assets/imgs/login/card-bg.png differ diff --git a/src/assets/imgs/login/i-code.png b/src/assets/imgs/login/i-code.png new file mode 100644 index 000000000..d5ca9ea20 Binary files /dev/null and b/src/assets/imgs/login/i-code.png differ diff --git a/src/assets/imgs/login/i-lock.png b/src/assets/imgs/login/i-lock.png new file mode 100644 index 000000000..59dcce65d Binary files /dev/null and b/src/assets/imgs/login/i-lock.png differ diff --git a/src/assets/imgs/login/i-people.png b/src/assets/imgs/login/i-people.png new file mode 100644 index 000000000..57c0a6491 Binary files /dev/null and b/src/assets/imgs/login/i-people.png differ diff --git a/src/assets/scss/common-dai.scss b/src/assets/scss/common-dai.scss index df30eac4c..4ea98fcf1 100644 --- a/src/assets/scss/common-dai.scss +++ b/src/assets/scss/common-dai.scss @@ -496,7 +496,7 @@ img { overflow: hidden; transition: width 0.3s; background-color: transparent; - padding: 8px; + padding: 8px 0 8px 8px; .aui-sidebar_wrap { height: 100%; diff --git a/src/assets/scss/pages/login.scss b/src/assets/scss/pages/login.scss index e2636f9b8..143d91da9 100644 --- a/src/assets/scss/pages/login.scss +++ b/src/assets/scss/pages/login.scss @@ -1,4 +1,7 @@ -.aui-page__login { +@import "~@/assets/scss/c/config.scss"; +@import "~@/assets/scss/c/function.scss"; + +.g-bd { &::before, &::after { position: absolute; @@ -10,211 +13,265 @@ content: ""; } &::before { - background-image: url(~@/assets/img/login_bg.jpg); + background-image: url(~@/assets/imgs/login/bg.png); background-size: cover; } &::after { - background-color: rgba(38, 50, 56, 0.4); + // background-color: rgba(38, 50, 56, 0.1); + } +} + +.m-fm { + position: absolute; + top: 0; + bottom: 0; + right: 0; + left: 0; + margin: auto; + width: 650px; + height: 500px; + + @keyframes title { + 0% { + transform: translateY(-100px); + transform: scale(0%); + opacity: 0; + } + + 50% { + transform: translateY(-100px); + transform: scale(50%); + opacity: 0; + } + + 100% { + transform: translateY(0); + transform: scale(100%); + opacity: 1; + } } - .aui-content { - display: flex; - flex-flow: column wrap; - justify-content: center; - align-items: center; - min-height: 100vh; - padding: 50px 20px 150px; + + .title { + margin: 0 auto; text-align: center; - &__wrapper { - height: 100vh; - background-color: transparent; - overflow-x: hidden; - overflow-y: auto; + line-height: 80px; + font-size: 41px; + font-family: "思源宋体"; + font-weight: bold; + color: #ffffff; + background: linear-gradient(0deg, #0385ff 0%, #ffffff 50%, #ffffff 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + animation: title 0.33s * 1.5 ease-out; + } + + @keyframes decorationLeft { + 0% { + transform: translateX(100px); + } + + 100% { + transform: translateX(0px); } } - .login-header { - padding: 20px; - color: #fff; - .login-brand { - margin: 0 0 15px; - font-size: 40px; - font-weight: 400; - letter-spacing: 2px; - // text-transform: uppercase; - } - .login-intro { - padding: 0; - margin: 0; - list-style: none; - > li { - font-size: 16px; - line-height: 1.5; - color: rgba(255, 255, 255, 0.6); - & + li { - margin-top: 5px; - } - } + @keyframes decorationRight { + 0% { + transform: translateX(-100px); + } + + 100% { + transform: translateX(0px); } } - .login-body, - .login-footer { - width: 460px; + + .decoration { + .i-left { + position: absolute; + left: 0; + top: 70px; + width: 54px; + height: 377px; + animation: decorationLeft 0.33s ease-out; + } + .i-right { + position: absolute; + right: 0; + top: 70px; + width: 54px; + height: 377px; + animation: decorationRight 0.33s ease-out; + } } - .login-body { - padding: 20px 30px; - background-color: #fff; - .login-title { - font-size: 18px; - font-weight: 400; + + @keyframes fm { + 0% { + transform: scale(50%); + opacity: 0.3; } - .el-input__prefix .el-input__icon { - font-size: 16px; + + 100% { + transform: scale(100%); + opacity: 1; } - .login-captcha { - height: $--input-height; - line-height: $--input-height -2px; - > img { - max-width: 100%; - cursor: pointer; + } + + .fm { + box-sizing: border-box; + margin: -30px auto 0; + padding: 110px 150px 50px; + width: 555px; + height: 368px; + background-image: url(~@/assets/imgs/login/card-bg.png); + background-size: cover; + animation: fm 0.33s ease-out; + + .fm-item { + box-sizing: border-box; + margin: 0 auto; + margin-bottom: 16px; + width: 255px; + height: 38px; + line-height: 38px; + background: #102163; + display: flex; + align-items: center; + + .input { + width: 85%; + margin-bottom: 0; + + input { + display: block; + padding-left: 0; + line-height: 38px; + height: 38px; + width: 100%; + border: none; + background-color: transparent; + color: #fff; + font-size: 14px; + + &::placeholder { + color: #d7d7d7; + } + &:active { + background-color: transparent; + } + } } - } - .login-shortcut { - margin-bottom: 20px; - &__title { + + .ico { position: relative; - margin: 0 0 15px; - font-weight: 400; + width: 50px; + height: 38px; - &::before { + img { position: absolute; - top: 50%; - right: 0; + top: 0; left: 0; - z-index: 1; - content: ""; - height: 1px; - margin-top: -0.5px; - background-color: $--border-color-base; - overflow: hidden; - } - > span { - position: relative; - z-index: 2; - padding: 0 20px; - color: rgba(0, 0, 0, 0.3); - background-color: #fff; + right: 0; + bottom: 0; + margin: auto; + width: 18px; } } - &__list { - padding: 0; + } + + .fm-captcha { + box-sizing: border-box; + margin: 0 auto; + margin-bottom: 16px; + width: 255px; + display: flex; + align-items: center; + + .fm-item { margin: 0; - list-style: none; - font-size: 0; - > li { - display: inline-block; - vertical-align: middle; - margin: 0 10px; - font-size: 28px; + width: 140px; + .input { + width: 70%; } } - } - .login-guide { - color: rgba(0, 0, 0, 0.3); - } - } - .login-footer { - position: absolute; - bottom: 0; - padding: 20px; - color: rgba(255, 255, 255, 0.6); - p { - margin: 10px 0; - } - a { - padding: 0 5px; - color: rgba(255, 255, 255, 0.6); - &:focus, - &:hover { - color: #fff; + + .captcha { + position: relative; + margin-left: auto; + width: 105px; + height: 38px; + + img { + display: block; + width: 100%; + height: 100%; + background-color: #eee; + border: none; + } } } - } - // 右侧垂直风格 - &--right-vertical { - .aui-content { - flex-flow: row nowrap; - justify-content: flex-start; - align-items: stretch; - padding: 0; - } - .login-header { - flex: 1; - display: flex; - flex-flow: column wrap; - justify-content: center; - padding: 30px 120px; - text-align: left; - } - .login-body { - position: relative; - display: flex; - flex-flow: column wrap; - justify-content: center; - padding: 120px 30px 150px; + + .fm-btn { + box-sizing: border-box; + margin: 0 auto; + margin-top: 30px; + width: 255px; + height: 38px; + background: linear-gradient(0deg, #0061ff 0%, #0096ff 100%); + border-radius: 2px; + line-height: 38px; + font-size: 20px; + font-weight: 500; + color: #ffffff; text-align: center; - .login-guide { - margin-top: 0; - } - } - .login-footer { - right: 0; - color: $--color-text-regular; - a { - color: $--color-text-regular; - &:focus, - &:hover { - color: $--color-primary; - } - } + cursor: pointer; } } } -@media (max-width: 991px) { - .aui-page__login { - &--right-vertical { - .login-header { - padding: 30px; - } - } + +.m-footer { + position: absolute; + bottom: 0; + left: 0; + right: 0; + padding: 20px; + color: rgba(255, 255, 255, 0.6); + text-align: center; + p { + margin: 10px 0; } -} -@media (max-width: 767px) { - .aui-page__login { - &--right-vertical { - .login-header { - .login-brand, - .login-intro { - display: none; - } - } + a { + padding: 0 5px; + color: rgba(255, 255, 255, 0.6); + &:focus, + &:hover { + color: #fff; } } } -@media (max-width: 575px) { - .aui-page__login { - .login-body, - .login-footer { - width: 100%; - } - .login-captcha { - text-align: left; - > img { - width: 136px; - } + +.m-pop { + height: auto; + + .div_row { + height: 50px; + text-align: center; + line-height: 50px; + + &:hover { + color: rgb(2, 119, 173); + font-weight: bold; + text-decoration: underline; } - &--right-vertical { - .login-header { - display: none; - } + + .i_icon { + width: 15px; + height: 15px; + margin-right: 10px; + float: left; + } + .span_name { + font-size: 18px; + cursor: pointer; + /* color: rgb(37, 156, 235); */ } } } diff --git a/src/assets/scss/pages/loginWork.scss b/src/assets/scss/pages/loginWork.scss deleted file mode 100644 index 7f5689f2f..000000000 --- a/src/assets/scss/pages/loginWork.scss +++ /dev/null @@ -1,196 +0,0 @@ -@import "~@/assets/scss/c/config.scss"; -@import "~@/assets/scss/c/function.scss"; - -.g-bd { - &::before, - &::after { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: -1; - content: ""; - } - &::before { - background-image: url(~@/assets/img/login/bg.png); - background-size: cover; - } - &::after { - // background-color: rgba(38, 50, 56, 0.1); - } -} - -.m-fm { - position: absolute; - top: 0; - bottom: 0; - right: 13%; - margin: auto; - width: 484px; - height: 429px; - background: #ffffff; - box-shadow: 0px 5px 10px 0px rgba(213, 225, 238, 0.5); - border-radius: 12px 12px 12px 12px; - - .wrap { - padding-top: 5px; - - .title { - margin: 0 auto; - width: 400px; - line-height: 80px; - border-bottom: 1px solid #d4d4d4; - font-size: 34px; - font-family: PingFang SC; - font-weight: bold; - color: #000000; - text-align: center; - } - .fm { - padding: 15px 30px; - - .fm-item { - box-sizing: border-box; - margin: 0 auto; - margin-top: 16px; - width: 400px; - height: 46px; - line-height: 46px; - border: 1px solid #c6c6c6; - border-radius: 4px; - display: flex; - align-items: center; - - .input { - width: 85%; - margin-bottom: 0; - - input { - display: block; - padding-left: 15px; - line-height: 44px; - height: 44px; - width: 100%; - border: none; - } - } - - .ico { - position: relative; - width: 35px; - height: 46px; - - img { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - margin: auto; - } - } - } - - .fm-captcha { - box-sizing: border-box; - margin: 0 auto; - margin-top: 16px; - width: 400px; - display: flex; - align-items: center; - - .fm-item { - margin: 0; - width: 200px; - } - - .captcha { - position: relative; - margin-left: auto; - width: 180px; - height: 46px; - - img { - display: block; - width: 100%; - height: 100%; - background-color: #eee; - border: none; - } - } - } - - .fm-btn { - box-sizing: border-box; - margin: 0 auto; - margin-top: 40px; - width: 400px; - height: 56px; - line-height: 56px; - background: linear-gradient(90deg, #1a5afd, #26c4ff); - border-radius: 4px; - font-size: 23px; - font-family: PingFang SC; - font-weight: 500; - color: #ffffff; - text-align: center; - cursor: pointer; - } - } - .hint { - display: none; - padding-left: 40px; - color: rgb(255, 80, 80); - } - } -} - -.m-footer { - position: absolute; - bottom: 0; - left: 0; - right: 0; - padding: 20px; - color: rgba(255, 255, 255, 0.6); - text-align: center; - p { - margin: 10px 0; - } - a { - padding: 0 5px; - color: rgba(255, 255, 255, 0.6); - &:focus, - &:hover { - color: #fff; - } - } -} - -.m-pop { - height: auto; - - .div_row { - height: 50px; - text-align: center; - line-height: 50px; - - &:hover { - color: rgb(2, 119, 173); - font-weight: bold; - text-decoration: underline; - } - - .i_icon { - width: 15px; - height: 15px; - margin-right: 10px; - float: left; - } - .span_name { - font-size: 18px; - cursor: pointer; - /* color: rgb(37, 156, 235); */ - } - } -} diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 8cc2f8a25..1dde0012d 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -329,8 +329,7 @@ export default { .g-cnt { background: #ffffff; border-radius: 3px; - margin-top: -30px; - margin-right: 8px; + margin: -30px 8px 10px; .m-crumb { padding-left: 10px; diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue index 3e77cdbde..07cb48d5d 100644 --- a/src/views/pages/login.vue +++ b/src/views/pages/login.vue @@ -2,61 +2,65 @@
-
-

{{ $t("brand.work") }}

-
- -
-
- -
- - - +

{{ $t("brand.work") }}

+
+ + +
+
+ +
+
+ +
+ + + +
+
+
+
+ + + +
+
- +
- +
-
-
- - - -
-
- -
+
+
+
-
- {{ $t("login.title") }} -
-
请使用小程序端的账号密码登录
- -
+
+ {{ $t("login.title") }} +
+
@@ -296,4 +300,4 @@ export default { }; - +