~jiangyouyao/beauty-erp.git

			@@ -17,20 +17,20 @@
			.row > div:nth-child(1) {
			background: url(../../images/login-title.jpg) no-repeat;
			background-size: 100% 100%;
			height: 380px;
			height: 450px;
			}

			.row > div:nth-child(2) {
			background: #fff;
			height: 380px;
			height: 450px;
			}
			.download-bar {
			margin-top: 15px;
			color: #fff;
			color: #4968bd;
			}

			.download-bar a {
			color: #fff;
			color: #4968bd;
			margin: 0 5px;
			}

			@@ -84,7 +84,7 @@

			.signinpanel .dataForm > div > img {
			position: absolute;
			top: 9px;
			top: 13px;
			left: 5px;
			}

			@@ -107,11 +107,11 @@
			<body class="signin" onkeypress="dologin(event)">

			<div class="signinpanel">
			<div class="row" style="box-shadow: 1px 5px 10px #f1e2e2;">
			<div class="row" style="box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);">
			<div class="col-sm-6"></div>
			<div class="col-sm-6">
			<form method="post" class="dataForm">
			<h3 class="no-margins text-center title" style="color: #E60012;font-size: 18px;">登录</h3>
			<h3 class="no-margins text-center title" style="color: #666666;font-size: 24px;font-weight: bold">欢迎登录</h3>
			<div>
			<input autocomplete="off" id="account" type="text" placeholder="请输入用户名"
			class="form-control uname"/>
			@@ -126,53 +126,15 @@
			</div>
			<br> <br>

			<button type="button" onclick="login()" style="background-color: #E60012;border: none;"
			<button type="button" onclick="login()" style="background-color: #4f6cff;border: none;font-size: 18px;"
			class="btn btn-success btn-block">登录
			</button>

			</form>
			</div>
			<!-- <div class="col-sm-7">
			<div class="signin-info">
			<div class="logopanel m-b">
			<h1>[ Matrix-Java 简化你的开发 ]</h1>
			</div>
			<div class="m-b"></div>
			<h4>
			欢迎使用 <strong>Matrix-Java v4.0框架</strong>
			</h4>
			<ul class="m-b">
			<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
			代码，界面一键生成</li>
			<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 集团化权限控制</li>
			<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
			集成微信、支付宝接口</li>
			<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
			满足App接口开发</li>
			<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
			N多基础功能：短信、邮件、文章、广告、留言...</li>
			<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 安全</li>
			<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> 易用</li>
			<li><i class="fa fa-arrow-circle-o-right m-r-xs"></i>
			架构【SpingMvc+Mybatis+Mysql】</li>
			</ul>
			</div>
			</div>
			<div class="col-sm-5">
			<form method="post" class="dataForm">
			<h2 class="no-margins text-center">登录</h2>
			<input autocomplete="off" id="account" type="text" placeholder="账户"
			class="form-control uname" /> <br> <input autocomplete="off" id="password"
			type="password" class="form-control pword m-b" nullmsg="密码不能为空"
			placeholder="密码" /> <a href=""> </a> <br> <br>

			<button type="button" onclick="login()"
			class="btn btn-success btn-block">登录</button>

			</form>
			</div> -->
			</div>
			<div class="signup-footer" style="color: #fff;">
			<div class="signup-footer" style="color: #4968bd;">
			<div class="" style="font-size: 16px;">HIVE管理系统V2.2.0</div>
			<div class="">