diff --git a/src/app/layout/passport/passport.component.html b/src/app/layout/passport/passport.component.html index b6ad1782..92543b1a 100644 --- a/src/app/layout/passport/passport.component.html +++ b/src/app/layout/passport/passport.component.html @@ -9,8 +9,8 @@ - -
+ +
diff --git a/src/app/layout/passport/passport.component.less b/src/app/layout/passport/passport.component.less index c6208a48..4835f570 100644 --- a/src/app/layout/passport/passport.component.less +++ b/src/app/layout/passport/passport.component.less @@ -8,18 +8,25 @@ .ant-layout-header { background: #ffffff; - box-shadow: 0px 5px 5px #d1d1d1; + // box-shadow: 0px 5px 5px #d1d1d1; } nz-content { background : url('../../../assets/images/login/login-bg.jpg') 100% 100% no-repeat; - background-size: cover + background-size: cover; + overflow : hidden; } passport-login { background: transparent; } + .earth-box { + background : url('../../../assets/images/login/5-地球元素02.png') 100% 100% no-repeat; + background-size: cover; + overflow : hidden; + } + .earth { animation : eatthAnimation 60s linear infinite; -webkit-animation: eatthAnimation 60s linear infinite; diff --git a/src/app/routes/passport/components/login/login.component.html b/src/app/routes/passport/components/login/login.component.html index 07edd142..c41eaa89 100644 --- a/src/app/routes/passport/components/login/login.component.html +++ b/src/app/routes/passport/components/login/login.component.html @@ -10,141 +10,88 @@ -->
-
+
+ +
@@ -153,4 +100,4 @@ 获取验证码 请等待{{ count }}s - + \ No newline at end of file diff --git a/src/app/routes/passport/components/login/login.component.less b/src/app/routes/passport/components/login/login.component.less index 5e69a1b2..64faf778 100644 --- a/src/app/routes/passport/components/login/login.component.less +++ b/src/app/routes/passport/components/login/login.component.less @@ -5,14 +5,14 @@ flex-direction : column; justify-content : space-between; width : 100%; - max-width : 960px; + max-width : 473px; height : calc(100vh - 64px); margin : auto; -webkit-box-orient : vertical; .box-content { width : 100%; - height : 600px; + height : 630px; border-radius: 0px 16px 16px 0px; .login-logo { @@ -25,9 +25,10 @@ background-color: #fff; .login-box-content { - max-width: 434px; - margin : auto; - padding : 88px 0 38px; + max-width : 340px; + margin : auto; + padding : 46px 0 38px; + text-align: center; } } @@ -107,7 +108,7 @@ width: 281px; .ant-tabs-tab-btn { - font-size : 24px; + font-size : 20px; color : #86909C; font-weight: 500; } @@ -119,20 +120,25 @@ } .ant-tabs-tab { - padding: 8px 0; + padding: 8px 0 20px; + } + + .ant-tabs-tab+.ant-tabs-tab { + margin: 0 0 0 74px; } .ant-tabs-top>.ant-tabs-nav { - margin: 0 0 38px 0; + margin: 0 0 22px 0; .ant-tabs-ink-bar { - background: #26282A; + // background: #26282A; + height: 4px; } } // input 框样式修改 nz-input-group { - height : 44px; + height : 48px; font-size : 14px; border-radius: 4px; border-color : #E5E6EB; @@ -152,7 +158,7 @@ } .ant-form-item { - margin-bottom: 32px; + margin-bottom: 24px; } .ant-form-item-with-help { @@ -161,24 +167,36 @@ .ant-form-item-explain, .ant-form-item-extra { - min-height : 32px; + min-height : 24px; line-height: 2; } + .ant-form-item-explain, + .ant-form-item-extra { + font-size: 12px; + } + // 按钮样式修改 .ant-btn { padding: 0 16px 12px; } + .but { + font-size : 14px; + line-height: 48px; + height : 48px; + color : #86909C; + } + .ant-btn-primary { - color : #fff; - background : #26282A; - border-color : #26282A; - font-size : 14px; - line-height : 40px; - height : 44px; + color : #fff; + // background : #26282A; + // border-color : #26282A; + border-radius: 4px } + + } @media (max-width: 990px) { diff --git a/src/app/routes/passport/passport.module.ts b/src/app/routes/passport/passport.module.ts index ad3a9f31..24e76ce6 100644 --- a/src/app/routes/passport/passport.module.ts +++ b/src/app/routes/passport/passport.module.ts @@ -25,7 +25,7 @@ import { ProPageModule } from 'src/app/layout/pro/shared/page'; import { UserLoginComponent } from './components/login/login.component'; import { OrderAgreementComponent } from './components/order-agreement/order-agreement.component'; import { UserRetrievePasswordComponent } from './components/retrieve-password/retrieve-password.component'; - +import { NzDividerModule } from 'ng-zorro-antd/divider'; import { PassportRoutingModule } from './passport-routing.module'; const COMPONENTS = [ @@ -54,6 +54,7 @@ const COMPONENTS = [ NzToolTipModule, NzPopoverModule, NzProgressModule, + NzDividerModule, NzAvatarModule, SEModule, ResultModule, diff --git a/src/assets/images/login/5-地球元素02.png b/src/assets/images/login/5-地球元素02.png new file mode 100644 index 00000000..23d62d26 Binary files /dev/null and b/src/assets/images/login/5-地球元素02.png differ diff --git a/src/assets/login/js/script.js b/src/assets/login/js/script.js index 30412e3f..4216eb61 100644 --- a/src/assets/login/js/script.js +++ b/src/assets/login/js/script.js @@ -118,7 +118,7 @@ clearInterval(me.createIntervalId); } counter++; - }.bind(this), 250); + }.bind(this), 50); } else { // Create particle objects