合并分支 'lihong' 到 'master'

Lihong



查看合并请求 !17

@@ -44,7 +44,7 @@ html,
 body {
 	position: relative;
 	width: 100%;
-	height: 100%;
+	/*height: 100%;*/
 	padding: 0;
 	margin: 0;
 	background-color: #F8F8F8;

+
 body{
 	background: url(../../images/login_bg.png) center no-repeat;
+	background-size: 100% 100%;
 }
-
 .container {
 	/*background: url(../../images/login_bg.png) center no-repeat;*/
-	background-size: 100% 100%;
+	/*background-size: 100% 100%;*/
 	padding-top: 1rem;
 }
 

@@ -53,7 +53,7 @@
 	<div class="login_img">
 		<img src="__TMPL__/public/mobile/images/login_pic1.png" class="img_detail" />
 		<div class="login_text">
-			<p>用户登录1</p>
+			<p>用户登录123</p>
 			<span>仅限天津及唐山地区用户</span>
 		</div>
 	</div>
@@ -66,12 +66,9 @@
 		<input type="text" name="code" id="code" value="" class="input_text" placeholder="请输入验证码" />
 		<p class="get_num">获取验证码</p>
 	</div>
-
 	<div class="btn">
 		登录
 	</div>
-
-
 	<p class="no_num">还没有账号，<span class="to_register">去注册</span></p>
 
 	<div class="bottom_icon">