合并分支 'lihong' 到 'master'

修改



查看合并请求 !191

@@ -98,11 +98,11 @@
 <script type="text/javascript">
     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;
     $('.btn').click(function() {
         var mobile = $('input[name=mobile]').val();