Merge branch 'master' of ssh://123.56.124.1:3022/houdong/cof_vip

app/Lib/Action/Vip/PkTopAction.class.php

@@ -703,12 +703,10 @@ class PkTopAction extends IdentityAction
         //查看前n名
         $uids = [];
         if ($order == 1) {
-            $phb = $this->getPhb(1, 1, 'lastweekup');
+            $phb = $this->getPhb(1, 50, 'zongup');
             $uids = array_column($phb[0], 'uid');
         }
-
         $phb = D('User')->getWtList($gInfo, $p, $pageSize, $uids);
-
         $wtList = $phb[0];
         //取最新价
         $stockHq = [];
@@ -728,11 +726,10 @@ class PkTopAction extends IdentityAction
                 $e['now_price'] = $nowPrice;
                 $e['zd'] = formatPrice(($nowPrice - $e['cj_price']) / $e['cj_price'] * 100, 2) . '%';
             }
-
         }
         $nick_name_arry = getUser(array_column($wtList, 'CD'), 'nick');
         $tids = array_column($wtList, 'userid');
-        $tInfo = M("userinfo", " ", C('DB_CONFIG_MNCG3'))->where(['uid' => ['in', $tids]])->cache(true, 60)->getField('uid,new_phb,zongup');
+        $tInfo = M("userinfo", " ", C('DB_CONFIG_MNCG3'))->where(['uid' => ['in', $tids]])->cache(true, 60)->getField('uid,new_phb,zongup,lastweekup');
 
         foreach ($wtList as &$n) {
             $nick_name = $nick_name_arry[$n['CD']];
@@ -744,6 +741,7 @@ class PkTopAction extends IdentityAction
             //大赛排名和总盈利率
             $n['phb'] = $tInfo[$n['userid']]['new_phb'];
             $n['zongup'] = $tInfo[$n['userid']]['zongup'];
+            $n['lastweekup'] = $tInfo[$n['userid']]['lastweekup'];
             //点击用户名和股票名跳转需要的参数
             $n['goTradeInfo'] = $this->setGoTrade($gInfo, $n['CD'], $nick_name, 2);
             $n['StockTrade'] = json_encode(['name' => $n['stock_name'], 'code' => $n['stock_code'], 'market' => $n['stock_type'], 'zqlb' => $n['zqlb']]);

app/Tpl/Vip/PkTop/itemTrade.html

-
-
-    <notempty name="wtList">
+<notempty name="wtList">
     <foreach name="wtList" key='key' item="vo">
         <div class="member-des-item" uid="{$vo.userid}">
             <p class="item-b1">
                 <span class="out username" goTradeInfo='{$vo.goTradeInfo}'>{$vo.username}</span>
                 <eq name="vo.entrust_bs" value="r">买入<else/>卖出</eq>股票
-<!--                    <span class="out stock_name" goStockDetails='{$vo.StockTrade}'>{$vo.stock_name}</span>-->
                 <span class="item-b1-time">{$vo.cj_time}</span>
             </p>
             <table cellspacing="0" cellpadding="0">
                 <tr>
-<!--                        <td><eq name="vo.entrust_bs" value="r">买入<else/>卖出</eq>价：<span class="num">{$vo.cj_price|default='-'}</span></td>-->
                     <td><eq name="vo.entrust_bs" value="r">买入<else/>卖出</eq>数量：<span class="num">{$vo.amount|default='-'}</span></td>
                     <td>当前获利：<span class="<egt name='vo.zd' value='0'>red<else/>green</egt> ">{$vo.zd|default='-'}</span></td>
                 </tr>
-<!--                    <tr>-->
-<!--                        <lt name="vo.zd" value="0"><td>当前价：<span class="green">{$vo.now_price|default='-'}（{$vo.zd|default='-'}）</span></td></lt>-->
-<!--                        <gt name="vo.zd" value="0"><td>当前价：<span class="red">{$vo.now_price|default='-'}（{$vo.zd|default='-'}）</span></td></gt>-->
-<!--                        <eq name="vo.zd" value="0"><td>当前价：<span>{$vo.now_price|default='-'}（0.00%）</span></td></eq>-->
-
-<!--                        <td>当前价：<span class="<egt name='vo.zd' value='0'>red<else/>green</egt> ">{$vo.now_price|default='-'}（{$vo.zd|default='-'}）</span></td>-->
-
-<!--                        <td>成交价：<span class="num">{$vo.cj_price}</span></td>-->
-<!--                    </tr>-->
             </table>
             <span class="list-check-btn username" goTradeInfo='{$vo.goTradeInfo}'>查看</span>
             <div class="team-no">
                 <span class="team-no-span">排名：<span class="c3">{$vo.phb|default='--'}</span></span>
-<!--                    <lt name="vo.zongup" value="0"><span>总盈利率：<span class="green">{$vo.zongup|default='-'}%</span></span></lt>-->
-<!--                    <gt name="vo.zongup" value="0"><span>总盈利率：<span class="red">{$vo.zongup|default='-'}%</span></span></gt>-->
-<!--                    <eq name="vo.zongup" value="0"><span>总盈利率：<span>0.00%</span></span></eq>-->
-
-                    <span>总盈利率：<span class="<egt name='vo.zongup' value='0'>red<else/>green</egt> ">{$vo.zongup|default='--'}%</span></span>
-
+                <span>周收益率：<span class="<egt name='vo.lastweekup' value='0'>red<else/>green</egt> ">{$vo.lastweekup|default='--'}%</span></span>
             </div>
         </div>
-
     </foreach>
-        <else/>
-
-
-    </notempty>
-
-
+</notempty>
 <script>
     $(".username").unbind();
     $(".username").click(function () {

app/Tpl/Vip/PkTop/phbTrade.html

@@ -60,7 +60,7 @@
             <div class="award-tab-panel">
                 <div class="item-filter">
                     <span class="<eq name="order" value="0">active</eq>"><a href="/PkTop/phbTrade?order=0">全部</a></span>
-                    <span class="<eq name="order" value="1">active</eq>"><a href="/PkTop/phbTrade?order=1">只看前100名</a></span>
+                    <span class="<eq name="order" value="1">active</eq>"><a href="/PkTop/phbTrade?order=1">只看前50名</a></span>
                 </div>
                 <div class="panel-item" id="container" >
                     <include file="itemTrade"/>