Merge branch 'master' into test

# Conflicts:
#	e/member/login/indexloginstatus.php
#	index_dev.html

e/member/login/indexloginstatus.php

@@ -4,12 +4,12 @@ require(__DIR__ . "/../../class/db_sql.php");
 require(__DIR__ . "/../../member/class/user.php");
 require(__DIR__ . "/../../class/q_functions.php");
 $iscas = getcvar('mlcas');
-if($iscas){
+if ($iscas) {
 
-    $link=db_connect();
-    $empire=new mysqlquery();
-    $user = islogin();
-    $ucid = $user['ucid'];
+	$link = db_connect();
+	$empire = new mysqlquery();
+	$user = islogin();
+	$ucid = $user['ucid'];
 }
 ?>
 
@@ -21,31 +21,17 @@ if (time() > strtotime('2018-05-01 00:00:00') && time() <= strtotime('2018-05-10
 }
 ?>
 
-
 <?php if (!$iscas) { ?>
 	$(function(){
 	<?php if ($isShow) { ?>
 		showRedpack();$("#invite-main").attr("style", "display:block;");
 	<?php } ?>
-	<!--        $(".books").attr("href", "/e/member/login");-->
-	$("#loginGits").attr("style", "display:block;");
-	});
-<?php }else { ?>
-
+	<!--        $(".books").attr("href", "/e/member/login");-->	$("#loginGits").attr("style", "display:block;");	});
+<?php } else { ?>
 
 	<?php if ($isShow) { ?>
 		showRedpack("<?=$ucid?>");$("#invite-main").attr("style", "display:block;");
 	<?php } ?>
 
-
-	var zhugeCheckRunHandler = false;
-	function zhugeCheckRun(){
-	if(!window.zhuge){
-	zhugeCheckRunHandler = setTimeout(zhugeCheckRun,500);
-	}else{
-	clearTimeout(zhugeCheckRunHandler);
-	window.zhuge.identify("<?=$ucid?>");
-	}
-	}
-	zhugeCheckRun();
+	var zhugeCheckRunHandler = false;	function zhugeCheckRun(){	if(!window.zhuge){	zhugeCheckRunHandler = setTimeout(zhugeCheckRun,500);	}else{	clearTimeout(zhugeCheckRunHandler);	window.zhuge.identify("<?=$ucid?>");	}	}	zhugeCheckRun();
 <?php } ?>
\ No newline at end of file