Merge branch 'master' of http://114.215.101.231:8099/liuzhen/qiaohu into 1iuzhen

# Conflicts:
#	public/themes/simpleboot3/public/mobile/css/init.css

@@ -44,7 +44,7 @@ html,
 body {
 	position: relative;
 	width: 100%;
-	height: 100%;
+	/*height: 100%;*/
 	padding: 0;
 	margin: 0;
 	background-color: #F8F8F8;
@@ -115,8 +115,7 @@ span.back_href {
 }
 .container{
 	width: 7.5rem; 
-	/*height: 100%;*/
-	margin: 0 auto;
+	/*height: 100%;*/	margin: 0 auto;
 	box-sizing: border-box;
 	/*overflow-y: scroll;*/
 	/*overflow-x: hidden;*/
@@ -243,5 +242,5 @@ span.back_href {
 	left: 0;
 	top: 0;
 	display: none;
-	z-index: 5;
+	z-index: 6;
 }

-.container {
+
+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%;*/
 	padding-top: 1rem;
 }
 
@@ -57,7 +62,7 @@
 .input_num{
 	width: 6.1rem;
 	height: 1rem;
-	background-color: #FFFFFF;
+	background-color: #fff;
 	margin: 0 auto;
 	border-radius: 0.2rem;
 	box-shadow: 0rem 0rem 0.4rem rgba(0,0,0,0.1) inset;

@@ -27,6 +27,13 @@
 			background-color: #FFFFFF;
 			box-shadow: 0.1rem 0.1rem 0.2rem rgba(0,0,0,0.6);
 		}
+		.get_num {
+			position: absolute;
+			font-size: 0.28rem;
+			color: #F4AC30;
+			line-height: 1rem;
+			right: 1.37rem;
+		}
 	</style>
 </head>
 
@@ -46,7 +53,7 @@
 	<div class="login_img">
 		<img src="__TMPL__/public/mobile/images/login_pic1.png" class="img_detail" />
 		<div class="login_text">
-			<p>用户登录2323</p>
+			<p>用户登录</p>
 			<span>仅限天津及唐山地区用户</span>
 		</div>
 	</div>
@@ -59,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">