Merge branch 'test' into dev

e/action/inviteRedpack.php

@@ -8,4 +8,5 @@
 require(__DIR__ . '/../extend/internalApi/autoload.php');
 require(__DIR__ . '/../config/config_ibanshou.php');
 \internalApi\base\Client::config($config['wxh.internal']['client']);
-echo json_encode(\internalApi\ucenter\MemberRedpack::getFirstRedpack());
+$uid = $_GET['uid'];
\ No newline at end of file
+echo json_encode(\internalApi\ucenter\MemberRedpack::getFirstRedpack($uid));
\ No newline at end of file

e/extend/internalApi/ucenter/MemberRedpack.php

@@ -11,8 +11,8 @@ use internalApi\base\Client;
 
 class MemberRedpack extends Client
 {
-    public static function getFirstRedpack()
+    public static function getFirstRedpack($userId)
     {
-        return self::call('memberRedpack.firstRedpack');
+        return self::call('memberRedpack.firstRedpack',compact('userId'));
     }
 }
\ No newline at end of file

e/member/login/indexloginstatus.php

@@ -4,29 +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");
-        $("#loginGits").attr("style", "display:block;");
-    });
-<?php }else { ?>
-    var zhugeCheckRunHandler = false;
-    function zhugeCheckRun(){
-        if(!window.zhuge){
-                zhugeCheckRunHandler = setTimeout(zhugeCheckRun,500);
-        }else{
-            clearTimeout(zhugeCheckRunHandler);
-            window.zhuge.identify("<?=$ucid?>");
-        }
-    }
-    zhugeCheckRun();
+
+	<?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 } ?>

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 () {

skin/default/css/style.css

@@ -1021,6 +1021,122 @@
     vertical-align: top;
 }
 
+/*邀请领红包*/
+.enter-img {
+    background: #fff;
+}
+.enter-img a {
+    display: inline-block;
+    width: 100%;
+    text-align: center;
+    padding: 15px 0 0;
+}
+.enter-img img {
+    width: 100%;
+}
+.red-packet {
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    background-color: rgba(0,0,0,.5);
+    z-index: 11;
+}
+.red-packet .info {
+    position: absolute;
+    left: 50%;
+    margin-left: -150px;
+    top: 50%;
+    width: 300px;
+    transform:translateY(-50%);
+}
+.red-packet .info img {
+    width: 100%;
+}
+.red-packet .info .text {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    text-align: center;
+    color: #fff;
+}
+.red-packet .info .text h3 {
+    height: 140px;
+    line-height: 145px;
+}
+.red-packet .info .text p {
+    font-size: 48px;
+    font-family: arial, sans-serif;
+    padding: 0 0 20px;
+}
+.red-packet .info .text b {
+    font-weight: normal;
+    font-size: 14px;
+    font-family: "Helvetica Neue", Helvetica, "Microsoft YaHei", "\5FAE\8F6F\96C5\9ED1", Arial, sans-serif;
+}
+.red-packet .info .text button {
+    position: relative;
+    width: 80px;
+    height: 80px;
+    display: inline-block;
+    border: 0;
+    margin-left: 7px;
+    outline: none;
+    border-radius: 100%;
+    background-color: #fff259;
+    color: red;
+    font-size: 24px;
+    box-shadow: 0 0 1px 0 rgba(0,0,0,0.3), 0 0 30px 2px rgba(0,0,0,0.15);
+}
+.red-packet .info .text button:after {
+    content: '';
+    position: absolute;
+    top: 5px;
+    left: 5px;
+    width: 70px;
+    height: 70px;
+    border-radius: 100%;
+    border: 2px dotted rgba(0,0,0,.2);
+    box-sizing: border-box;
+}
+.red-packet .info .text button span {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 50px;
+    line-height: 40px;
+    display: inline-block;
+    text-align: center;
+    color: #ec2661;
+    font-weight: bold;
+    font-size: 16px;
+}
+
+.my-redpacket {
+    display: block;
+    margin-top: 10px;
+    color: #fff;
+    font-size: 14px;
+}
+.red-packet .info .close {
+    position: absolute;
+    left: 50%;
+    bottom: -40px;
+    text-align: center;
+    display: inline-block;
+    margin-left: -21px;
+    width: 40px;
+    height: 40px;
+    line-height: 36px;
+    border: 1px solid #fff;
+    border-radius: 100%;
+    font-size: 24px;
+    color: #fff;
+}
+
 /*适配电脑端*/
 @media screen and (min-width: 900px){
     html {