Skip to content

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

Merge branch 'master' into test 

# Conflicts:
#	e/member/login/indexloginstatus.php
#	index_dev.html
parents 0d73bb53 9e75c233
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 12 deletions
e/member/login/indexloginstatus.php
View file @ ed1b4d97
...@@ -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,15 +21,31 @@ if (time() > strtotime('2018-05-01 00:00:00') && time() <= strtotime('2018-05-10 ...@@ -21,15 +21,31 @@ if (time() > strtotime('2018-05-01 00:00:00') && time() <= strtotime('2018-05-10
} }
?> ?>
<?php if (!$iscas) { ?> <?php if (!$iscas) { ?>
$(function(){<!-- $(".books").attr("href", "/e/member/login");--> $(function(){
<?php if ($isShow) { ?> <?php if ($isShow) { ?>
showRedpack();$("#invite-main").attr("style", "display:block;"); showRedpack();$("#invite-main").attr("style", "display:block;");
<?php } ?> <?php } ?>
$("#loginGits").attr("style", "display:block;");}); <!-- $(".books").attr("href", "/e/member/login");-->
<?php } else { ?><?php if ($isShow) { ?> $("#loginGits").attr("style", "display:block;");
showRedpack("<?=$ucid?>");$("#invite-main").attr("style", "display:block;"); });
<?php } ?> <?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;
<?php } ?> function zhugeCheckRun(){
if(!window.zhuge){
zhugeCheckRunHandler = setTimeout(zhugeCheckRun,500);
}else{
clearTimeout(zhugeCheckRunHandler);
window.zhuge.identify("<?=$ucid?>");
}
}
zhugeCheckRun();
<?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