Merge branch 'feature/market_percentage' of wmtx/platform into release

市场专员业绩提成bug修正

Application/Admin/Controller/MarketPercentageController.class.php

@@ -135,7 +135,6 @@ class MarketPercentageController extends ThinkController
                 ->field("tab_market_altogether.*,market_percentage")
                 ->join("left join sys_auth_group_access access on tab_market_altogether.admin_id = access.uid")
                 ->join("left join sys_auth_group auth on access.group_id=auth.id")
-                ->page($p, $row)
                 ->order("pay_time DESC")
                 ->select();
         } else {
@@ -143,6 +142,7 @@ class MarketPercentageController extends ThinkController
                 ->field("tab_market_altogether.*,market_percentage")
                 ->join("left join sys_auth_group_access access on tab_market_altogether.admin_id = access.uid")
                 ->join("left join sys_auth_group auth on access.group_id=auth.id")
+                ->page($p, $row)
                 ->order("pay_time DESC")
                 ->select();
         }
@@ -308,12 +308,12 @@ class MarketPercentageController extends ThinkController
                 'extend_commission' => '应发金额',
                 'wait_commission' => '待发金额'];
 
-            data2csv($data,'市场结算管理',$title);
+            data2csv($data,'市场业绩提成',$title);
         }
 
-        $arraypage = $p;
-        $size = $row;//每页显示的记录数
-        $data = array_slice($data, ($arraypage - 1) * $size, $size);
+//        $arraypage = $p;
+//        $size = $row;//每页显示的记录数
+//        $data = array_slice($data, ($arraypage - 1) * $size, $size);
 
         $this->assign("list_data",$data);
         $this->display("marketstaffsettle");
@@ -341,11 +341,11 @@ class MarketPercentageController extends ThinkController
 
         if ($_REQUEST['export']) {
             $data = $data
-                ->page($p, $row)
                 ->order("pay_time DESC")
                 ->select();
         } else {
             $data = $data
+//                ->page($p, $row)
                 ->order("pay_time DESC")
                 ->select();
         }
@@ -595,7 +595,7 @@ class MarketPercentageController extends ThinkController
                 'extend_commission' => '已发放总提成',
                 'wait_commission'=>'剩余未发放总提成'];
 
-            data2csv($data,'个人总提成列表',$title);
+            data2csv($data,'提成汇总结算单',$title);
         }
 
         $count = M("market_altogether","tab_")

Application/Admin/View/MarketPercentage/marketstaffsettle.html

@@ -33,7 +33,7 @@
     </style>
 
     <div class="cf main-place top_nav_list navtab_list">
-        <h3 class="page_title">市场结算管理</h3>
+        <h3 class="page_title">市场业绩提成</h3>
         <p class="description_text">说明：绩优流水计算管理</p>
     </div>