Merge branch 'bonus_manager' into bonus_rate

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

@@ -105,40 +105,84 @@ html {
     padding-bottom: 140px;
 }
 .top {
-    height: 464px;
-    background: url("../images/top_bg.png") no-repeat;
+    position: relative;
+    height: 552px;
+    background: url("../images/top_bg.jpg?v=1") no-repeat;
     background-size: 100%;
 }
+.top .label {
+    position: absolute;
+    width: 100%;
+    text-align: center;
+    font-size: 28px;
+    color: #000000;
+}
+.top .label_1 {
+    top: 353px;
+}
+.top .label_2 {
+    top: 395px;
+}
+.top .label_3 {
+    top: 434px;
+}
+.top .label_4 {
+    top: 475px;
+}
+.top .label .num {
+    color: #ec354e;
+}
+.rules span {
+    width: 60px;
+    display: block;
+    margin-right: 35px;
+}
 .bonus_content {
     width: 750px;
-    min-height: 1144px;
     margin: 0 auto;
-    background: url("../images/center_bg.jpg") center 0 #ec354e no-repeat;
-    padding-bottom: 20px;
+    background: url("../images/center_bg.jpg?v=1") center 0 #ffffff no-repeat;
 }
 .user_msg {
-    width: 681px;
-    height: 192px;
-    padding-top: 104px;
-    margin-left: 33px;
+    width: 718px;
+    height: 218px;
+    margin-left: 18px;
     text-align: center;
 }
 .user_msg .user {
     float: left;
     width: 239px;
-    height: 192px;
+    height: 196px;
+    margin-top: 12px;
+    margin-left: 13px;
 }
 .user_msg .user .user_img {
-    margin-top: 18px;
-    margin-bottom: 28px;
+    margin-top: 28px;
+    margin-bottom: 12px;
+}
+
+.user_msg .user .invite_user {
+    margin-top: 10px;
+    font-size: 18px;
+    display: -webkit-box;
+    -webkit-box-align: center;
+    -webkit-box-pack: center;
+}
+.user_msg .user .invite_img {
+    width: 26px;
+    height: 26px;
+    border-radius: 50px;
+    display: block;
+}
+.user_msg .user .label {
+    display: block;
 }
 .user_msg .user .user_img img {
-    width: 83px;
-    height: 83px;
+    width: 73px;
+    height: 73px;
     border-radius: 50px;
 }
 .user_msg .user .user_name {
-    font-size: 31px;
+    font-size: 30px;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
@@ -146,14 +190,15 @@ html {
 .user_msg .get_bonus {
     position: relative;
     float: left;
-    width: 442px;
-    height: 192px;
-    padding-top: 29px;
+    width: 453px;
+    height: 196px;
     box-sizing: border-box;
+    margin-top: 12px;
 }
 .total {
     font-size: 36px;
-    margin-bottom: 18px;
+    margin-top: 60px;
+    margin-bottom: 37px;
     color: #f7dd92;
 }
 .total .price {
@@ -167,8 +212,6 @@ html {
 .bonus_label {
     font-size: 25px;
     box-sizing: content-box;
-    padding-right: 22px;
-    margin: 23px 73px 13px 0;
 }
 .more_btn {
     box-sizing: content-box;
@@ -190,7 +233,7 @@ html {
     min-height: 500px;
     margin: 110px auto 0 auto;
     box-sizing: border-box;
-    background: #f48897;
+    background: #ef5368;
     border-radius: 8px;
     padding: 7px 37px 30px 24px;
     position: relative;
@@ -200,15 +243,22 @@ html {
     width: 226px;
     height: 55px;
     line-height: 55px;
-    color: #ec354e;
+    color: #ffffff;
     text-align: center;
-    background: #fff;
-    top: -55px;
+    background: #ef5368;
+    top: -54px;
     left: 15px;
     font-size: 30px;
     border-top-left-radius:10px;
     border-top-right-radius:10px;
 }
+.invite_null {
+    font-size: 30px;
+    width: 100%;
+    text-align: center;
+    position: absolute;
+    top: 50px;
+}
 .item {
     position: relative;
     height: 113px;
@@ -269,11 +319,18 @@ html {
     top: 4px;
 }
 .rules {
+    display: -webkit-box;
+    -webkit-box-align: center;
+    -webkit-box-pack: center;
     position: absolute;
-    font-size: 25px;
-    right: 3px;
-    top: -52px;
-    padding: 10px;
+    width: 152px;
+    height: 152px;
+    font-size: 29px;
+    right: -63px;
+    top: 332px;
+    background: url("../images/rules_bg.png") no-repeat;
+    background-size: 100%;
+    z-index: 99;
 }
 .pop {
     position: fixed;
@@ -283,6 +340,7 @@ html {
     height: 100%;
     background: rgba(0,0,0,.6);
     display: none;
+    z-index: 1000;
 }
 .rules_content {
     background: #fff;

mobile/control/control.php

@@ -300,7 +300,7 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2017111002";
+    return "v=20171114";
 }
 function shop_version()
 {

mobile/control/invite_friend.php

@@ -79,7 +79,7 @@ class tpl_invite_friend
     {
         if($user <= 0) return false;
         $mod_member = Model('member');
-        $items = $mod_member->getMemberList(['member_id|inviter_id' => ['_multi' => true,$user,$user]],'*', 0, 'reward_amount desc');
+        $items = $mod_member->getMemberList(['member_id|inviter_id' => ['_multi' => true,$user,$user]]);
 
         $cur_user = session_helper::memberid();
 
@@ -117,10 +117,11 @@ class tpl_invite_friend
                     <div class=\"user\">
                         <div class=\"user_img\"><img src=\"{$minfo->avatar()}\"></div>
                         <div class=\"user_name\">{$minfo->nickname()}</div>
+                        <div class=\"invite_user\"><span class=\"label\">邀请者：</span><img src=\"{$minfo->nickname()}\" class=\"invite_img\"></div>
                     </div>
                     <div class=\"get_bonus\">
-                        <div class=\"bonus_label\">邀请累计收益</div>
                         <div class=\"total\"><span class=\"bag_icon\"></span><span class=\"price\">{$minfo->reward_amount()}</span>元</div>
+                        <div class=\"bonus_label\">累计获得100%红包</div>
                     </div>
                 </div>";
         echo $str;
@@ -136,12 +137,15 @@ class tpl_invite_friend
     private function show_invitees()
     {
         echo "<div class=\"bonus_list\">";
-        echo "<div class=\"bonus_pro\">已邀请{$this->mUserInfo->invitees()}人</div>
-              <span class=\"rules\" id=\"rules\">查看规则>></span>";
-
-        $this->show_invitee($this->mMineInfo);
-        foreach ($this->mInvitees as $minfo) {
-            $this->show_invitee($minfo);
+        echo "<div class=\"bonus_pro\">已邀请{$this->mUserInfo->invitees()}人</div>";
+        if(empty($this->mMineInfo)){
+            echo '<span class=\"invite_null\">抱歉,你暂时没有邀请好友！</span>';
+        }
+        else {
+            $this->show_invitee($this->mMineInfo);
+            foreach ($this->mInvitees as $minfo) {
+                $this->show_invitee($minfo);
+            }
         }
         echo "</div>";
     }

mobile/templates/default/invite_friend/invite.php

@@ -10,7 +10,15 @@
 
 <body>
 <div class="container">
-    <div class="top"></div>
+    <div class="top">
+        <div class="rules" id="rules">
+            <span>查看规则</span>
+        </div>
+        <span class="label label_1">邀请好友得<span class="num">5</span>元红包</span>
+        <span class="label label_2">好友下单得<span class="num">3</span>元红包</span>
+        <span class="label label_3">好友的好友下单你也得红包</span>
+        <span class="label label_4">以此类推，多邀多赚</span>
+    </div>
     <div class="bonus_content">
         <?php $output['tpl']->show(); ?>
     </div>