Commit 3cce7a6b authored by 王万里's avatar 王万里

feat: 二连浩特登录

parent d86bc88a
/* eslint-disable */ /* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin; // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
// const proxyURL = 'https://work.panda-water.cn'; // const proxyURL = 'https://work.panda-water.cn';
<<<<<<< HEAD
const proxyURL = 'http://localhost:8090';
=======
const proxyURL = 'http://192.168.10.179:8095'; const proxyURL = 'http://192.168.10.179:8095';
>>>>>>> 1cdcd9fe7740ebe057acfc71a5a06eb9e2c4a7ad
// const proxyURL = 'https://panda-water.cn' // const proxyURL = 'https://panda-water.cn'
module.exports = { module.exports = {
......
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
...@@ -11,6 +11,8 @@ import styles from './index.less'; ...@@ -11,6 +11,8 @@ import styles from './index.less';
import Account from '../../../js/useAccount'; import Account from '../../../js/useAccount';
import { defaultApp } from '../../../../../../micro'; import { defaultApp } from '../../../../../../micro';
import QRCode from 'qrcode.react'; import QRCode from 'qrcode.react';
import leftLogo from './images/ls-logo.png'
import loginLogo from './images/二连浩特icon.png'
import classnames from 'classnames'; import classnames from 'classnames';
import moment from 'moment'; import moment from 'moment';
...@@ -156,7 +158,7 @@ const Login = forwardRef((props, _ref) => { ...@@ -156,7 +158,7 @@ const Login = forwardRef((props, _ref) => {
<div className={styles['left-imgbox']}></div> <div className={styles['left-imgbox']}></div>
<div className={styles['inner-center']}> <div className={styles['inner-center']}>
<div className={styles['welcome-title']}> <div className={styles['welcome-title']}>
欢迎登录 <img src={loginLogo}/>
</div> </div>
<div className={classnames(styles['inner-bg'], styles['login-part'])} ref={loginFormRef}> <div className={classnames(styles['inner-bg'], styles['login-part'])} ref={loginFormRef}>
{renderPlatform()} {renderPlatform()}
...@@ -165,8 +167,7 @@ const Login = forwardRef((props, _ref) => { ...@@ -165,8 +167,7 @@ const Login = forwardRef((props, _ref) => {
</div> </div>
<div className={styles['login-header']}> <div className={styles['login-header']}>
<div className={styles['left-title']}> <div className={styles['left-title']}>
<div className={styles['cn-title']}>呼和浩特和林格尔县智慧水务平台</div> <img src={leftLogo}/>
<div className={styles['en-title']}>Intelligent water service platform of Helingeer County, Hohhot</div>
</div> </div>
<div className={styles['right-timebox']}> <div className={styles['right-timebox']}>
<div className={styles['curr-time']}>{dateObj.curTime}</div> <div className={styles['curr-time']}>{dateObj.curTime}</div>
......
.login { .login {
width: 100%; width: 100%;
height: 100%; height: 100%;
background: url('./images/4.png') no-repeat center; background: url('./images/乐山登录背景.png') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
background-clip: border-box; background-clip: border-box;
position: relative; position: relative;
...@@ -13,8 +13,9 @@ ...@@ -13,8 +13,9 @@
} }
.login .inner-bg { .login .inner-bg {
width: 100%; width: 78%;
height: 100%; // height: 100%;
margin: 13% 11% 25% 11%;
&>div { &>div {
...@@ -24,25 +25,25 @@ ...@@ -24,25 +25,25 @@
} }
.inner-wrapper { .inner-wrapper {
width: 800px; position: absolute;
height: 400px; top: 50%;
left: 50%;
width: 1100px;
height: 646px;
margin-left: -550px;
margin-top: -298px;
background: url('./images/二连浩特登陆框.png') no-repeat top;
background-size: 100% 100%;
display: flex; display: flex;
justify-content: center; align-items: flex-end;
align-items: center;
border-radius: 10px;
// position: absolute;
// top: 46%;
// right: 0;
// transform: translateY(-50%);
} }
.left-imgbox { .left-imgbox {
width: 100%; width: 682px;
height: 100%; height: 596px;
background: url('./images/5.png') no-repeat center; background: url('./images/二连浩特登陆界面配图-动态.gif') no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
background-clip: border-box; background-clip: border-box;
width: 400px;
} }
.img-wrapper { .img-wrapper {
...@@ -93,24 +94,20 @@ ...@@ -93,24 +94,20 @@
.inner-center { .inner-center {
width: 400px; width: 418px;
height: 400px; height: 596px;
background-color: #ffffff; border-radius: 0px 0px 15px 15px;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
align-items: center; align-items: center;
border-radius: 0 10px 10px 0;
} }
.welcome-title{ .welcome-title{
width: 280px; width: 100%;
height: 115px; height: 178px;
line-height: 115px; display: flex;
font-size: 21px; justify-content: center;
font-family: Microsoft YaHei; align-items: flex-end;
font-weight: 400;
color: #000000;
opacity: 0.85;
} }
.formgroup2 { .formgroup2 {
...@@ -176,26 +173,14 @@ ...@@ -176,26 +173,14 @@
.login-header{ .login-header{
width: 100%; width: 100%;
position: absolute; position: absolute;
top: 30px; top: 20px;
padding: 0 38px; padding: 0 32px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.left-title{ .left-title{
.cn-title{
font-size: 26px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
}
.en-title{
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
opacity: 0.65;
}
} }
.right-timebox{ .right-timebox{
display: flex; display: flex;
...@@ -225,4 +210,51 @@ ...@@ -225,4 +210,51 @@
} }
} }
} }
}
:global{
.@{ant-prefix}src-pages-user-login-components-login-index-login {
.@{ant-prefix}src-pages-user-login-components-login-index-prefixIcon{
color: #00BDA0;
}
}
.@{ant-prefix}src-pages-user-login-components-login-index-login {
.@{ant-prefix}src-pages-user-login-components-login-index-submit{
background-color: #00BDA0;
border-color: #00BDA0;
border-radius: 20px;
}
}
.@{ant-prefix}-checkbox-checked::after{
border: 1px solid #00BDA0 !important;
}
.@{ant-prefix}-checkbox-checked {
.@{ant-prefix}-checkbox-inner {
background-color: #00BDA0 !important;
border-color: #00BDA0 !important;
}
}
.@{ant-prefix}-input-affix-wrapper:not(.@{ant-prefix}-input-affix-wrapper-disabled):hover{
border-color: #00BDA0 !important;
}
.@{ant-prefix}-checkbox-wrapper:hover
.@{ant-prefix}-checkbox-inner,
.@{ant-prefix}-checkbox:hover .@{ant-prefix}-checkbox-inner,
.@{ant-prefix}-checkbox-input:focus + .@{ant-prefix}-checkbox-inner {
border-color: #00BDA0 !important;
}
.@{ant-prefix}-btn-primary:hover, .@{ant-prefix}-btn-primary:focus{
background-color: #00BDA0 !important;
border-color: #00BDA0 !important;
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment