diff --git a/src/assets/loginmini/icon/icon_dow.png b/src/assets/loginmini/icon/icon_dow.png deleted file mode 100644 index 03d928d..0000000 Binary files a/src/assets/loginmini/icon/icon_dow.png and /dev/null differ diff --git a/src/assets/loginmini/icon/jeecg_ad.png b/src/assets/loginmini/icon/jeecg_ad.png deleted file mode 100644 index 19a2583..0000000 Binary files a/src/assets/loginmini/icon/jeecg_ad.png and /dev/null differ diff --git a/src/assets/loginmini/icon/jeecg_logo.png b/src/assets/loginmini/icon/jeecg_logo.png deleted file mode 100644 index 109687f..0000000 Binary files a/src/assets/loginmini/icon/jeecg_logo.png and /dev/null differ diff --git a/src/assets/loginmini/icon/jeecg_bg.png b/src/assets/loginmini/icon/login-bg.png similarity index 100% rename from src/assets/loginmini/icon/jeecg_bg.png rename to src/assets/loginmini/icon/login-bg.png diff --git a/src/assets/loginmini/icon/logo.png b/src/assets/loginmini/icon/logo.png deleted file mode 100644 index ad1cb65..0000000 Binary files a/src/assets/loginmini/icon/logo.png and /dev/null differ diff --git a/src/assets/loginmini/style/base.less b/src/assets/loginmini/style/base.less index c6777c7..a69c8f9 100644 --- a/src/assets/loginmini/style/base.less +++ b/src/assets/loginmini/style/base.less @@ -41,11 +41,6 @@ body { box-sizing: border-box; } -a { - text-decoration: none; - color: #000; -} - a, label, button, @@ -54,18 +49,6 @@ select { -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } -img { - max-width: 100%; - height: auto; - display: block; - border: 0; -} - -body { - background: #e3f0ff; - color: #666; -} - html, body, div, @@ -116,98 +99,6 @@ textarea { outline: none; } -li { - list-style: none; -} - -a { - color: #666; -} - -.clearfix::after { - clear: both; - content: '.'; - display: block; - height: 0; - visibility: hidden; -} - -.clearfix { -} - -.divHeight { - width: 100%; - height: 10px; - background: #f5f5f5; - position: relative; - overflow: hidden; -} - -.r-line { - position: relative; -} - -.r-line:after { - content: ''; - position: absolute; - z-index: 0; - top: 0; - right: 0; - height: 100%; - border-right: 1px solid #d9d9d9; - -webkit-transform: scaleX(0.5); - transform: scaleX(0.5); - -webkit-transform-origin: 100% 0; - transform-origin: 100% 0; -} - -.b-line { - position: relative; -} - -.b-line:after { - content: ''; - position: absolute; - z-index: 2; - bottom: 0; - left: 0; - width: 100%; - height: 1px; - border-bottom: 1px solid #dedede; - -webkit-transform: scaleY(0.5); - transform: scaleY(0.5); - -webkit-transform-origin: 0 100%; - transform-origin: 0 100%; -} - -.aui-arrow { - position: relative; - padding-right: 0.8rem; -} - -.aui-arrow span { - font-size: 0.8rem; - color: #9b9b9b; -} - -.aui-arrow:after { - content: ' '; - display: inline-block; - height: 6px; - width: 6px; - border-width: 2px 2px 0 0; - border-color: #848484; - border-style: solid; - -webkit-transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0); - transform: matrix(0.71, 0.71, -0.71, 0.71, 0, 0); - position: relative; - position: absolute; - top: 50%; - margin-top: -4px; - right: 2px; - border-radius: 1px; -} - .aui-flex { display: -webkit-box; display: -webkit-flex; @@ -227,125 +118,6 @@ a { color: #333; } -/* 必要布局样式css */ -.aui-flexView { - width: 100%; - height: 100%; - margin: 0 auto; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-box-orient: vertical; - -webkit-box-direction: normal; - -webkit-flex-direction: column; - -ms-flex-direction: column; - flex-direction: column; -} - -.aui-scrollView { - width: 100%; - height: 100%; - -webkit-box-flex: 1; - -webkit-flex: 1; - -ms-flex: 1; - flex: 1; - overflow-y: auto; - overflow-x: hidden; - -webkit-overflow-scrolling: touch; - position: relative; - padding-bottom: 53px; -} - -.aui-navBar { - height: 44px; - position: relative; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - z-index: 102; - background-color: #5064eb; -} - -.aui-navBar-item { - height: 44px; - min-width: 15%; - -webkit-box-flex: 0; - -webkit-flex: 0 0 15%; - -ms-flex: 0 0 15%; - flex: 0 0 15%; - padding: 0 0.9rem; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-box-align: center; - -webkit-align-items: center; - -ms-flex-align: center; - align-items: center; - font-size: 0.7rem; - white-space: nowrap; - overflow: hidden; - color: #808080; - position: relative; -} - -.aui-navBar-item:first-child { - -webkit-box-ordinal-group: 2; - -webkit-order: 1; - -ms-flex-order: 1; - order: 1; - margin-right: -25%; - font-size: 0.9rem; - font-weight: bold; -} - -.aui-navBar-item:last-child { - -webkit-box-ordinal-group: 4; - -webkit-order: 3; - -ms-flex-order: 3; - order: 3; - -webkit-box-pack: end; - -webkit-justify-content: flex-end; - -ms-flex-pack: end; - justify-content: flex-end; -} - -.aui-center { - -webkit-box-ordinal-group: 3; - -webkit-order: 2; - -ms-flex-order: 2; - order: 2; - display: -webkit-box; - display: -webkit-flex; - display: -ms-flexbox; - display: flex; - -webkit-box-pack: center; - -webkit-justify-content: center; - -ms-flex-pack: center; - justify-content: center; - -webkit-box-align: center; - -webkit-align-items: center; - -ms-flex-align: center; - align-items: center; - height: 44px; - width: 80%; - margin-left: 22%; -} - -.aui-center-title { - text-align: center; - width: 100%; - white-space: nowrap; - overflow: hidden; - display: block; - text-overflow: ellipsis; - font-size: 0.95rem; - color: #fff; - font-weight: 500; -} - .icon { width: 20px; height: 20px; @@ -358,8 +130,14 @@ a { } .login-background-img { - background-image: url(../icon/jeecg_bg.png); + background-image: url(../icon/login-bg.png); background-size: cover; background-position: top center; background-repeat: no-repeat; } + +@mini-login-prefix-cls: ~'@{namespace}-mini-login'; +.@{mini-login-prefix-cls} { + width: 100%; + height: 100%;; +} diff --git a/src/assets/loginmini/style/home.less b/src/assets/loginmini/style/home.less index ba0ba96..f3c4ff3 100644 --- a/src/assets/loginmini/style/home.less +++ b/src/assets/loginmini/style/home.less @@ -1,6 +1,5 @@ .aui-content { - padding: 40px 60px; - min-height: 97vh; + width: 100%; } .aui-container { @@ -36,8 +35,23 @@ background-size: cover; } -.aui-image-text{ +.aui-image-text { + background-image: url(../icon/login-ad-text.png); + background-position: center; + background-repeat: repeat-x; + background-size: auto 530px; width: 100%; + height: 100%; + + &-register { + background-size: auto 630px; + } + &-codelogin { + background-size: auto 600px; + } + &-forgotpad { + background-size: auto 550px; + } } .aui-formBox { @@ -281,35 +295,6 @@ font-size: 14px; } -.phoneChina { - position: absolute; - bottom: 10px; - left: 0; - font-size: 14px; - color: #040404; -} - -.phoneChina::after { - position: absolute; - right: -25px; - bottom: 0; - content: ''; - background-image: url(../icon/icon_dow.png); - background-size: 18px; - width: 18px; - height: 18px; -} - -.phoneChina:before { - position: absolute; - right: -42px; - bottom: -15px; - content: ' '; - background: #fff; - width: 18px; - height: 18px; -} - .aui-ewm { width: 280px; margin: 0 auto; diff --git a/src/locales/lang/en/sys.ts b/src/locales/lang/en/sys.ts index 2054017..95356fc 100644 --- a/src/locales/lang/en/sys.ts +++ b/src/locales/lang/en/sys.ts @@ -105,5 +105,12 @@ export default { smsCode: 'SMS code', mobile: 'Mobile', captcha: 'Captcha', + + //重置密码页面英文 + authentication:'authentication', + resetLoginPassword:'reset login password', + resetSuccess:'reset succeeded', + nextStep:'next step', + goToLogin:'go to login' }, }; diff --git a/src/locales/lang/zh-CN/sys.ts b/src/locales/lang/zh-CN/sys.ts index 03d9e6b..ac8237f 100644 --- a/src/locales/lang/zh-CN/sys.ts +++ b/src/locales/lang/zh-CN/sys.ts @@ -100,5 +100,12 @@ export default { smsCode: '短信验证码', mobile: '手机号码', captcha: '验证码', + + //重置密码页面中文 + authentication:'验证身份', + resetLoginPassword:'重置登录密码', + resetSuccess:'重置成功', + nextStep:'下一步', + goToLogin:'去登录' }, }; diff --git a/src/views/core/loginmini/MiniCodelogin.vue b/src/views/core/loginmini/MiniCodelogin.vue index 982d904..9509b9f 100644 --- a/src/views/core/loginmini/MiniCodelogin.vue +++ b/src/views/core/loginmini/MiniCodelogin.vue @@ -3,14 +3,12 @@
-
- -
+
-
+
{{ t('sys.login.qrSignInFormTitle') }}
@@ -38,7 +36,7 @@
@@ -56,50 +54,35 @@
- - - diff --git a/src/views/core/loginmini/MiniForgotpad.vue b/src/views/core/loginmini/MiniForgotpad.vue index 521d30d..3a70861 100644 --- a/src/views/core/loginmini/MiniForgotpad.vue +++ b/src/views/core/loginmini/MiniForgotpad.vue @@ -3,9 +3,7 @@
-
- -
+
@@ -29,9 +27,8 @@
-
+
- - - - -

恭喜您,重置密码成功!

-
@@ -90,21 +82,16 @@
- diff --git a/src/views/core/loginmini/MiniLogin.vue b/src/views/core/loginmini/MiniLogin.vue index 9fb4e87..5490625 100644 --- a/src/views/core/loginmini/MiniLogin.vue +++ b/src/views/core/loginmini/MiniLogin.vue @@ -1,6 +1,6 @@ - diff --git a/src/views/core/loginmini/MiniRegister.vue b/src/views/core/loginmini/MiniRegister.vue index 387e503..e9d772a 100644 --- a/src/views/core/loginmini/MiniRegister.vue +++ b/src/views/core/loginmini/MiniRegister.vue @@ -1,11 +1,9 @@ - diff --git a/src/views/core/loginmini/OAuth2Login.vue b/src/views/core/loginmini/OAuth2Login.vue deleted file mode 100644 index 7a0d2e0..0000000 --- a/src/views/core/loginmini/OAuth2Login.vue +++ /dev/null @@ -1,86 +0,0 @@ - - -