合并分支 'lihong' 到 'master'

修改



查看合并请求 !192

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

@@ -98,11 +98,11 @@
 <script type="text/javascript">
 <script type="text/javascript">
     var h=$(window).height();
     var h=$(window).height();
 
 
-    // $("body").height(h+"px")
-	//
-	// $('.to_register').click(function(){
-    //     window.location.href = "{:url('user/Register/index')}";
-	// });
+    $("body").height(h+"px")
+
+	$('.to_register').click(function(){
+        window.location.href = "{:url('user/Register/index')}";
+	});
     var popup_switch = true;
     var popup_switch = true;
     $('.btn').click(function() {
     $('.btn').click(function() {
         var mobile = $('input[name=mobile]').val();
         var mobile = $('input[name=mobile]').val();