debug

data/resource/mobile/invite_friend/css/main.css

@@ -18,15 +18,26 @@ time, mark, audio, video {
     -webkit-user-select:none;
     user-select:none;
 }
-
-body {
+ul, ol, li {
+    list-style: none;
+}
+html, body {
+    font-size: 24px;
     line-height: 1;
 }
 
 :focus {
     outline: 1;
 }
+.clearfix:before,
+.clearfix:after{
+    display: table;
+    content: " ";
+}
 
+.clearfix:after{
+    clear: both;
+}
 a,span {
     -webkit-tap-highlight-color: rgba(0,0,0,0);
 }
@@ -108,10 +119,27 @@ html {
 }
 .top {
     position: relative;
-    height: 1618px;
-    background: url("../images/top_bg.jpg?v=11") no-repeat;
+    /*height: 1618px;*/
+    /*background: url("../images/top_bg.jpg?v=11") no-repeat;*/
+    /*background-size: 100%;*/
+
+
+
+    height: 750px;
+    padding-top: 580px;
+    box-sizing: border-box;
+    background: url("../images/gifts_cover.jpg") no-repeat;
     background-size: 100%;
 }
+.gifts_cover_bg {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 562px;
+    background: url(../images/gifts_cover.jpg) no-repeat;
+    background-size: 100% 100%;
+}
 .top .label {
     position: absolute;
     width: 100%;
@@ -140,13 +168,13 @@ html {
     width: 750px;
     margin: 0 auto;
     padding-bottom: 20px;
-    background: url("../images/center_bg.jpg?v=11") center 0 #fffaf5 no-repeat;
+    /*background: url("../images/center_bg.jpg?v=11") center 0 #fffaf5 no-repeat;*/
 }
 .user_msg {
-    width: 724px;
-    height: 257px;
-    margin-left: 18px;
     text-align: center;
+    margin: 0 30px;
+    height: 257px;
+    border: 8px solid #a66c4b;
 }
 .user_msg .user {
     float: left;
@@ -195,7 +223,8 @@ html {
 .user_msg .get_bonus {
     position: relative;
     float: left;
-    width: 453px;
+    /*width: 453px;*/
+    width: 412px;
     height: 196px;
     box-sizing: border-box;
     margin-top: 12px;
@@ -203,8 +232,10 @@ html {
 .total {
     font-size: 36px;
     margin-top: 60px;
-    margin-bottom: 37px;
-    color: #fc5762;
+    /*margin-bottom: 37px;*/
+    margin-bottom: 10px;
+    color: #b87e59;
+    /*color: #fc5762;*/
 }
 .total .price {
     display: inline-block;
@@ -300,21 +331,22 @@ html {
     display: -webkit-box;
     -webkit-box-align: center;
 }
-/*.item .call_btn {*/
-    /*color: #fff;*/
-    /*padding: 2px 10px;*/
+.item .call_btn {
+    color: #fff;
+    padding: 2px 10px;
     /*background: #FE4F4C;*/
-    /*font-size: 24px;*/
-    /*position: absolute;*/
-    /*top: 50%;*/
-    /*right: 0;*/
-    /*line-height: 38px;*/
-    /*text-align: center;*/
-    /*-webkit-transform: translateY(-50%);*/
-/*}*/
-/*.item .call_btn.called {*/
-    /*background: #999999;*/
-/*}*/
+    background: #2b2b2b;
+    font-size: 24px;
+    position: absolute;
+    top: 50%;
+    right: 0;
+    line-height: 38px;
+    text-align: center;
+    -webkit-transform: translateY(-50%);
+}
+.item .call_btn.called {
+    background: #999999;
+}
 .item a {
     display: -webkit-box;
     -webkit-box-align: center;
@@ -383,16 +415,23 @@ html {
 }
 
 .rules {
-    position: absolute;
-    width: 414px;
-    height: 31px;
-    left: 50%;
-    bottom: 67px;
-    background: url("../images/rule_btn.png?v=8") no-repeat;
-    background-size: 100%;
-    z-index: 99;
-    -webkit-tap-highlight-color: rgba(0,0,0,0);
-    -webkit-transform: translateX(-50%);
+    /*position: absolute;*/
+    /*width: 414px;*/
+    /*height: 31px;*/
+    /*left: 50%;*/
+    /*bottom: 67px;*/
+    /*background: url("../images/rule_btn.png?v=8") no-repeat;*/
+    /*background-size: 100%;*/
+    /*z-index: 99;*/
+    /*-webkit-tap-highlight-color: rgba(0,0,0,0);*/
+    /*-webkit-transform: translateX(-50%);*/
+    display: block;
+    margin-top: 10px;
+    padding: 18px 0 28px;
+    font-size: 30px;
+    line-height: 1;
+    text-align: center;
+    color: #333;
 }
 .pop {
     position: fixed;
@@ -693,7 +732,8 @@ html {
     content: "";
     width: 100%;
     height: 2px;
-    background: #FE4F4C;
+    /*background: #FE4F4C;*/
+    background: #2b2b2b;
     top: 50%;
     left: 0;
     margin-top: -1px;
@@ -726,14 +766,51 @@ html {
 
 
 .share_btn {
+    /*position: absolute;*/
+    /*width: 663px;*/
+    /*height: 163px;*/
+    /*left: 50%;*/
+    /*bottom: 116px;*/
+    /*background: url(../images/share_btn.png?v=9) no-repeat;*/
+    /*background-size: 100%;*/
+    /*z-index: 99;*/
+    /*-webkit-tap-highlight-color: rgba(0,0,0,0);*/
+    /*-webkit-transform: translateX(-50%);*/
+    width: 80%;
+    height: 96px;
+    line-height: 98px;
+    text-align: center;
+    background: #2B2B2B;
+    border-radius: 5px;
+    font-size: 46px;
+    color: #f6d7a2;
+    margin: auto;
+}
+
+
+.gifts_tips_list {
+    padding: 0 30px 16px 0;
+}
+.gifts_tips_item {
+    position: relative;
+    padding-left: 40px;
+    font-size: 28px;
+    line-height: 42px;
+    color: #333;
+}
+.tips_count {
     position: absolute;
-    width: 663px;
-    height: 163px;
-    left: 50%;
-    bottom: 116px;
-    background: url(../images/share_btn.png?v=9) no-repeat;
-    background-size: 100%;
-    z-index: 99;
-    -webkit-tap-highlight-color: rgba(0,0,0,0);
-    -webkit-transform: translateX(-50%);
+    left: 0;
+    top: 1px;
+    width: 34px;
+    height: 34px;
+    line-height: 36px;
+    text-align: center;
+    border-radius: 50%;
+    font-size: 28px;
+    color: #fff;
+    background: #000;
 }
+.mt8 {
+    margin-top: 8px;
+}

mobile/control/control.php

@@ -325,9 +325,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018092005";
+    return "v=2018092006";
 }
 function shop_version()
 {
-    return "v=2018092005";
+    return "v=2018092006";
 }

mobile/control/invite_friend.php

@@ -66,7 +66,27 @@ class invite_friendControl extends mobileControl
     }
 }
 
-
+class friend_caller extends user_session\storage
+{
+    public function __construct()
+    {
+        parent::__construct();
+    }
+    public function limit_type()
+    {
+        return user_session\storage::DAILY_SUPPORT;;
+    }
+    public function storage_tag()
+    {
+        return 'friend_caller';
+    }
+    public function called($user) {
+        return $this->base_supported($user);
+    }
+    public function call($user) {
+        parent::base_support($user);
+    }
+}
 
 class tpl_invite_friend
 {
@@ -142,22 +162,19 @@ class tpl_invite_friend
     }
     private function show_noinvitee()
     {
-        echo "<div class=\"split_line_header mt20\">";
-        echo "<div class=\"split_line\"></div>";
-        echo "<span class=\"split_text\">TA尚未邀请好友</span>";
-        echo " </div>";
-
+        echo "<div class=\"bonus_list\">";
+        echo "<span class=\"invite_null\">TA尚未邀请好友</span>";
+        echo "</div>";
     }
 
     private function show_relay()
     {
         $minfo = $this->mUserInfo;
         $inviter_id = $minfo->inviter_id();
-
-        $str = "<div class=\"profit_box\">
-                    <div class=\"left_profit\">
-                        <img class=\"profit_avatar\" src=\"{$minfo->avatar()}\">
-                         <p class=\"f14 col333 lineH1\">{$minfo->nickname()}</p>";
+        $str = "<div class=\"user_msg clearfix\">
+                    <div class=\"user\">
+                        <div class=\"user_img\"><img src=\"{$minfo->avatar()}\"></div>
+                        <div class=\"user_name\">{$minfo->nickname()}</div>";
         echo $str;
 
         if($inviter_id > 0) {
@@ -172,38 +189,12 @@ class tpl_invite_friend
         }
 
         $str =     "</div>
-                    <div class=\"right_profit\">
-                        <p class=\"profit_money mb9\">{$minfo->reward_amount()}<span class=\"profit_unit\">元</span></p>
-                         <p class=\"f14 col666 lineH1\">邀请好友累计获得收益</p>
+                    <div class=\"get_bonus\">
+                        <div class=\"total\"><span class=\"price\">{$minfo->reward_amount()}</span>元</div>
+                        <p style='font-size: 28px;color: #666'>邀请好友累计获得收益</p>
                     </div>
                 </div>";
         echo $str;
-
-
-
-//        $str = "<div class=\"user_msg\">
-//                    <div class=\"user\">
-//                        <div class=\"user_img\"><img src=\"{$minfo->avatar()}\"></div>
-//                        <div class=\"user_name\">{$minfo->nickname()}</div>";
-//        echo $str;
-//
-//        if($inviter_id > 0) {
-//            $url = BASE_SITE_URL . "/mobile/index.php?act=invite_friend&op=index&client_type=wap&curuser={$inviter_id}";
-//            $inviter = new member_info($inviter_id);
-//            $str = "<div class=\"invite_user\">
-//                        <a href=\"{$url}\">
-//                            <span class=\"label\">邀请者：</span><img src=\"{$inviter->avatar()}\" class=\"invite_img\">
-//                        </a>
-//                    </div>";
-//            echo $str;
-//        }
-//
-//        $str =     "</div>
-//                    <div class=\"get_bonus\">
-//                        <div class=\"total\"><span class=\"price\">{$minfo->reward_amount()}</span>元</div>
-//                    </div>
-//                </div>";
-//        echo $str;
     }
 
 //    private function show_bonus()
@@ -221,8 +212,6 @@ class tpl_invite_friend
 
     private function show_rewared()
     {
-        $html = "";
-
         if(empty($this->mMineInfo) && empty($this->mRewardedInvites)) {
             return false;
         }
@@ -233,37 +222,24 @@ class tpl_invite_friend
             $count = count($this->mRewardedInvites);
         }
 
-        $html .="<div class=\"split_line_header mt20\">
-                    <div class=\"split_line\"></div>
-                    <span class=\"split_text\">已带来收益的好友({$count})</span>
-                </div>";
+        echo "<div class=\"bonus_list\">";
+        echo "<div class=\"prompt_label\">
+                    <span class=\"title\">已带来收益的好友<span class=\"invite_num\">({$count})</span></span>
+              </div>";
 
-        $mem_html = "";
         if(!empty($this->mMineInfo) && $this->mMineInfo->rewared_inviter()) {
-            $mem_html .= $this->show_invitee($this->mMineInfo);
+            $this->show_invitee($this->mMineInfo);
         }
         foreach ($this->mRewardedInvites as $minfo) {
-            $mem_html .= $this->show_invitee($minfo);
+            $this->show_invitee($minfo);
         }
+        echo "</div>";
 
-
-        if($count > 0) {
-            $mem_html = "<div class=\"gifts_list\">
-                            <div class=\"weui-cells\">"
-                . $mem_html .
-                "</div>
-                        </div>";
-        }
-
-        $html = $html . $mem_html;
-
-        echo $html;
         return true;
     }
 
     private function show_rewarding()
     {
-        $html = "";
         if(empty($this->mMineInfo) && empty($this->mRewardingInvites)) {
             return false;
         }
@@ -274,47 +250,35 @@ class tpl_invite_friend
             $count = count($this->mRewardingInvites);
         }
 
-        $html .="<div class=\"split_line_header mt20\">
-                    <div class=\"split_line\"></div>
-                    <span class=\"split_text\">尚未带来收益的好友({$count})</span>
-                </div>";
-
+        echo "<div class=\"bonus_list\">";
+        echo "<div class=\"prompt_label\">
+                    <span class=\"title\">尚未带来收益的好友<span class=\"invite_num\">({$count})</span></span>
+              </div>";
 
-        $mem_html = "";
         if(!empty($this->mMineInfo) && $this->mMineInfo->rewared_inviter() == false) {
-            $mem_html .=$this->show_invitee($this->mMineInfo);
+            $this->show_invitee($this->mMineInfo);
         }
         foreach ($this->mRewardingInvites as $minfo) {
-            $mem_html .=$this->show_invitee($minfo);
+            $this->show_invitee($minfo);
         }
+        echo "</div>";
 
-        if($count > 0) {
-            $mem_html = "<div class=\"gifts_list\">
-                            <div class=\"weui-cells\">"
-                                . $mem_html .
-                           "</div>
-                        </div>";
-        }
-
-        $html = $html . $mem_html;
-
-        echo $html;
         return true;
     }
 
     private function show_prompt()
     {
-        $str = "<div class=\"split_line_header mt21 mb17\">
-                    <div class=\"split_line\"></div>
-                    <span class=\"split_text\" style=\"padding-left:24px;padding-right: 24px;\">提示</span>
+        $str = "<div class=\"prompt\">
+                    <div class=\"prompt_label\">
+                        <span class=\"title\">提示</span>
+                    </div>
+                    <div class=\"gifts_tips_list\">
+                        <div class=\"gifts_tips_item\"><span class=\"tips_count\">1</span>由于近期发现恶意刷红包用户，为保障体验，在邀请好 友之后，需要好友微信授权、注册、下载APP登录后才 给予邀请奖励。</div>
+                        <div class=\"gifts_tips_item mt4\"><span class=\"tips_count\">2</span>您可以点击“召唤TA”，邀请好友回来。（同一用户 每天只能召唤一次） </div>
+                        <div class=\"gifts_tips_item mt4\"><span class=\"tips_count\">3</span>熊猫美妆有权解散违规邀请的用户，收回已发红包并 关闭相关订单。（具体细节查看规则）</div>
+                    </div>
                 </div>
-
-                <ul class=\"gifts_tips_list\">
-                    <li class=\"gifts_tips_item\"><span class=\"tips_count\">1</span>由于近期发现恶意刷红包用户，为保障体验，在邀请好 友之后，需要好友微信授权、注册、下载APP登录后才 给予邀请奖励。</li>
-                    <li class=\"gifts_tips_item mt4\"><span class=\"tips_count\">2</span>您可以点击“召唤TA”，邀请好友回来。（同一用户 每天只能召唤一次） </li>
-                    <li class=\"gifts_tips_item mt4\"><span class=\"tips_count\">3</span>熊猫美妆有权解散违规邀请的用户，收回已发红包并 关闭相关订单。（具体细节查看规则）</li>
-                </ul>
-                <div class=\"briefing_address free_gifts\" style='margin-bottom: 50px;' ></div>";
+                <div class=\"briefing_address\"></div>";
         echo $str;
     }
 
@@ -325,50 +289,40 @@ class tpl_invite_friend
         $called = $this->mCaller->called($user);
 
         $url = BASE_SITE_URL . "/mobile/index.php?act=invite_friend&op=index&client_type=wap&curuser={$user}";
-
-        $html = "<div class=\"weui-cell x_line\">
-                <a href=\"{$url}\">
-                    <div class=\"weui-cell__hd\">
-                        <img src=\"{$minfo->avatar()}\">
-                    </div>
-                    <div class=\"weui-cell__bd\">
-                        <p>{$minfo->nickname()}</p>
-                        <p class=\"week_total\">邀请{$minfo->invitees()}人 | 收益{$minfo->reward_amount()}元</p>
-                    </div>
-                ";
-
+        $str = "<div class=\"item\">
+                        <a href=\"{$url}\">
+                            <div class=\"user_img\">
+                            <img src=\"{$minfo->avatar()}\">
+                            </div>
+                            <div class=\"user_name text-overflow\">
+                              <p class=\"text-overflow\"> {$minfo->nickname()}</p>
+                              <p class=\"invite_msg\">邀请{$minfo->invitees()}人,收益<span class=\"price\">{$minfo->reward_amount()}</span>元</p>
+                            </div>";
         if($this->mMine == false)
         {
-            $html  .= "<div class=\"look_btn\">
-                           <span class=\"arrow\"></span>
-                       </div>";
+            $str        .= "<div class=\"look_btn\">
+                               <span class=\"arrow\"></span>
+                            </div>";
         }
-        $html.= "</a>";
+        $str         .= "</a>";
 
         if($this->mMine)
         {
             if($called) {
-//                $html .= "<span class=\"call_btn called\" data-user=\"{$user}\">召唤TA</span>";
-                $html .="<div class=\"weui-cell__ft\">
-//                        <a href=\"javascript:void(0)\"  class=\"weui-btn weui-btn_mini donate call_btn called\">召唤TA</a>
-//                      </div>";
+                $str .=     "<span class=\"call_btn called\" data-user=\"{$user}\">召唤TA</span>";
             } else {
-//                $html .= "<span class=\"call_btn\" data-user=\"{$user}\">召唤TA</span>";
-                $html .= "<div class=\"weui-cell__ft\">
-//                        <a href=\"javascript:void(0)\"  class=\"weui-btn weui-btn_mini donate call_btn\">召唤TA</a>
-//                      </div>";
+                $str .=     "<span class=\"call_btn\" data-user=\"{$user}\">召唤TA</span>";
             }
         }
-        $html .= "</div>";
-
-        return $html;
+        $str .= "</div>";
+        echo $str;
     }
 
     public function show_open()
     {
         if(!session_helper::isapp())
         {
-            echo "<div class=\"fixed_bottom free_gifts\">
+            echo "<div class=\"fixed_bottom\">
                         <span class=\"logo\"></span>
                         <div class=\"label\">
                             <p>熊猫美妆</p>

mobile/control/member_bonus.php

@@ -1231,29 +1231,29 @@ class member_bonusControl extends mbMemberControl
     {
         return self::outsuccess(null,"bonus/free_gifts");
 
-        $user = intval($_GET['curuser']);
-        if(session_helper::need_wechat_author())
-        {
-            $author = new thrid_author\wxauthor();
-            $url = author_url::inviter_url($user);
-            $url = $author->enter($url);
-            return self::outsuccess(['direct_uri' => $url],"redirect");
-        }
-
-        if($user <= 0)
-        {
-            if(session_helper::logined()) {
-                $user = session_helper::memberid();
-            }
-        }
-
-        $type_sn = account_helper::invite_bonus(session_helper::share_id());
-        if($user > 0) {
-            return self::outsuccess(['tpl' => new tpl_free_gifts($user,$type_sn)],"bonus/free_gifts",'wap');
-        }
-        else {
-            return self::outerr(errcode::ErrParamter);
-        }
+//        $user = intval($_GET['curuser']);
+//        if(session_helper::need_wechat_author())
+//        {
+//            $author = new thrid_author\wxauthor();
+//            $url = author_url::inviter_url($user);
+//            $url = $author->enter($url);
+//            return self::outsuccess(['direct_uri' => $url],"redirect");
+//        }
+//
+//        if($user <= 0)
+//        {
+//            if(session_helper::logined()) {
+//                $user = session_helper::memberid();
+//            }
+//        }
+//
+//        $type_sn = account_helper::invite_bonus(session_helper::share_id());
+//        if($user > 0) {
+//            return self::outsuccess(['tpl' => new tpl_free_gifts($user,$type_sn)],"bonus/free_gifts",'wap');
+//        }
+//        else {
+//            return self::outerr(errcode::ErrParamter);
+//        }
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

mobile/templates/default/invite_friend/invite.php

@@ -3,32 +3,23 @@
 <head>
     <meta charset="UTF-8">
     <title>邀请好友</title>
-    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">
+    <meta name="viewport" content="width=750,user-scalable=no,target-densitydpi=device-dpi">
     <meta name="format-detection" content="telephone=no">
     <link rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/invite_friend/css/main.css?<?php echo bonus_version(); ?>">
-    <link type="text/css" rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/css/weui.css?<?php echo bonus_version(); ?>"/>
-    <link rel="stylesheet" href="https://cdn.bootcss.com/jquery-weui/1.2.0/css/jquery-weui.min.css?<?php echo bonus_version(); ?>">
-    <link type="text/css" rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/css/homepage.css?<?php echo bonus_version(); ?>"/>
-    <link type="text/css" rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/css/free_gifts.css?<?php echo bonus_version(); ?>"/>
 </head>
 
 <body>
-<!--<div class="container">-->
-<div class="">
-    <div class="gifts_cover">
+<div class="container">
+    <div class="top">
         <div class="gifts_cover_bg"></div>
-        <div class="get_more_gifts" id="rules">多邀多得  |  更多详情见规则 ></div>
+        <div class="share_btn" id="share_btn">分享赚红包 ></div>
+        <div class="rules" id="rules">多邀多得  |  更多详情见规则 ></div>
+    </div>
+    <div class="bonus_content">
         <?php $output['tpl']->show(); ?>
     </div>
-<!--    <div class="top">-->
-<!--        <div class="share_btn" id="share_btn"></div>-->
-<!--        <div class="rules" id="rules"></div>-->
-<!--    </div>-->
-<!--    <div class="bonus_content"></div>-->
-
-
     <div class="pop" id="pop">
-        <div class="rules_content free_gifts" id="rules_content">
+        <div class="rules_content" id="rules_content">
             <h3>邀请规则</h3>
             <div class="rules_list" id="rules_list">
                 <p>
@@ -66,10 +57,11 @@
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/bonus/js/zepto.min.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/layer.js?<?php echo bonus_version(); ?>"></script>
 <script type="text/javascript">
+
     var isapp = <?php echo session_helper::isapp() ? 'true' : 'false'; ?>;
-    // if(!isapp) {
-    //     document.getElementsByClassName('bonus_content')[0].setAttribute('style','padding-bottom:120px');
-    // }
+    if(!isapp) {
+        document.getElementsByClassName('bonus_content')[0].setAttribute('style','padding-bottom:120px');
+    }
 
     window.addEventListener('pageshow', function () {
         if (window.sessionStorage.getItem('Already_received')) {
@@ -86,7 +78,6 @@
             e.preventDefault();
         };
         document.getElementById('rules').addEventListener('click',function(e){
-            console.log(22);
             document.getElementById('pop').style.display = 'block';
             window.addEventListener('touchmove',window_no_scroll);
         });
@@ -176,22 +167,22 @@
         imgUrl:img_url
     });
 
-    // document.querySelector('#share_btn').addEventListener('click',function(e)
-    // {
-    //     e.preventDefault();
-    //     var jsonobject = {
-    //         action:"share_page",
-    //         params: {
-    //             can_invite:true, //为兼容之前版本，保留
-    //             can_share:true,
-    //             title:title,
-    //             sub_title:sub_title,
-    //             img_url:img_url,
-    //             url:url
-    //         }
-    //     };
-    //     call_native_handler('on_native_click',JSON.stringify(jsonobject));
-    // });
+    document.querySelector('#share_btn').addEventListener('click',function(e)
+    {
+        e.preventDefault();
+        var jsonobject = {
+            action:"share_page",
+            params: {
+                can_invite:true, //为兼容之前版本，保留
+                can_share:true,
+                title:title,
+                sub_title:sub_title,
+                img_url:img_url,
+                url:url
+            }
+        };
+        call_native_handler('on_native_click',JSON.stringify(jsonobject));
+    });
 
     var jsInit = {
         action:"view_init",