Skip to content

S
s_ibanshou
Commit 9a305a1c authored by wangjj's avatar wangjj
Browse files
Options

Merge branch 'master' into test 

# Conflicts:
#	e/member/login/indexloginstatus.php
#	index_dev.html
parent ed1b4d97
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 22 deletions
e/member/login/indexloginstatus.php
View file @ 9a305a1c
...@@ -4,12 +4,12 @@ require(__DIR__ . "/../../class/db_sql.php"); ...@@ -4,12 +4,12 @@ require(__DIR__ . "/../../class/db_sql.php");
require(__DIR__ . "/../../member/class/user.php"); require(__DIR__ . "/../../member/class/user.php");
require(__DIR__ . "/../../class/q_functions.php"); require(__DIR__ . "/../../class/q_functions.php");
$iscas = getcvar('mlcas'); $iscas = getcvar('mlcas');
if($iscas){ if ($iscas) {
$link=db_connect(); $link = db_connect();
$empire=new mysqlquery(); $empire = new mysqlquery();
$user = islogin(); $user = islogin();
$ucid = $user['ucid']; $ucid = $user['ucid'];
} }
?> ?>
...@@ -21,31 +21,17 @@ if (time() > strtotime('2018-05-01 00:00:00') && time() <= strtotime('2018-05-10 ...@@ -21,31 +21,17 @@ if (time() > strtotime('2018-05-01 00:00:00') && time() <= strtotime('2018-05-10
} }
?> ?>
<?php if (!$iscas) { ?> <?php if (!$iscas) { ?>
$(function(){ $(function(){
<?php if ($isShow) { ?> <?php if ($isShow) { ?>
showRedpack();$("#invite-main").attr("style", "display:block;"); showRedpack();$("#invite-main").attr("style", "display:block;");
<?php } ?> <?php } ?>
<!-- $(".books").attr("href", "/e/member/login");--> <!-- $(".books").attr("href", "/e/member/login");--> $("#loginGits").attr("style", "display:block;"); });
$("#loginGits").attr("style", "display:block;"); <?php } else { ?>
});
<?php }else { ?>
<?php if ($isShow) { ?> <?php if ($isShow) { ?>
showRedpack("<?=$ucid?>");$("#invite-main").attr("style", "display:block;"); showRedpack("<?=$ucid?>");$("#invite-main").attr("style", "display:block;");
<?php } ?> <?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 } ?> <?php } ?>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment