Merge remote-tracking branch 'origin/test' into test

e/member/login/indexloginstatus.php

@@ -4,31 +4,34 @@ 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'];
+}
+?>
+
+<?php
+$isShow = true;
+
+if (time() > strtotime('2018-05-01 00:00:00') && time() <= strtotime('2018-05-10 23:59:59')) {
+	$isShow = true;
 }
 ?>
 
 <?php if (!$iscas) { ?>
-    $(function(){
-<!--        $(".books").attr("href", "/e/member/login");-->
-        showRedpack();
-        $("#loginGits").attr("style", "display:block;");
-    });
-<?php }else { ?>
-    showRedpack("<?=$ucid?>");
-    var zhugeCheckRunHandler = false;
-    function zhugeCheckRun(){
-        if(!window.zhuge){
-                zhugeCheckRunHandler = setTimeout(zhugeCheckRun,500);
-        }else{
-            clearTimeout(zhugeCheckRunHandler);
-            window.zhuge.identify("<?=$ucid?>");
+	$(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 { ?>
+
+	<?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();
+<?php } ?>
\ No newline at end of file
-        }
-    }
-    zhugeCheckRun();
-<?php } ?>

bb.html → index_dev.html

@@ -49,7 +49,7 @@
 </div>
 
 <div class="enter-img">
-    <a href="[!--temp.ucenterurl--]invite-redpack/index"><img src="/skin/default/images/enter.png"></a>
+    <a href="[!--temp.ucenterurl--]invite-redpack/index" id="invite-redpack"><img src="/skin/default/images/enter.png"></a>
 </div>
 
 <div class="recommend-info">
@@ -213,8 +213,7 @@
     }
 </style>
 
-<div class="red-packet" id="redpack" style="display: none">
-</div>
+<div class="red-packet" id="redpack" style="display: none"></div>
 
 <script src="[!--news.url--]e/member/login/logincas.php"></script>
 <script type='text/javascript' src="[!--news.url--]skin/default/js/swiper.min.js"></script>
@@ -378,7 +377,12 @@
     };
 
     function inviteRedpack() {
-        window.location.href = "[!--temp.ucenterurl--]invite-redpack/index";
+        if(!/Android|webOS|iPhone|iPod|BlackBerry/i.test(navigator.userAgent)){
+            window.location.href = "http://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui&ckey=CK1391535911216";
+        }else {
+            window.location.href = "[!--temp.ucenterurl--]invite-redpack/index";
+        }
+
     }
 
     $(function () {