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

跳转汇总结算单默认事件添加

Application/Admin/Controller/MarketPercentageController.class.php

@@ -774,6 +774,11 @@ class MarketPercentageController extends ThinkController
 
     public function showBonusList($row = 10, $p = 1) {
 
+        //排序
+        if(!array_key_exists("time_start",$_REQUEST)){
+            $this->redirect(ACTION_NAME, array('time_start' => date('Y-m',strtotime('-1 month')),"time_end"=>date('Y-m',strtotime('-1 month'))));
+        }
+
         $map = [];
 
         $_REQUEST['pay_time']?$map['pay_time'] = $_REQUEST['pay_time']:'';
@@ -896,7 +901,7 @@ class MarketPercentageController extends ThinkController
         $sum['extend_commission'] = number_format($sum['extend_commission'], 2, '.', '');;
         $sum['wait_commission'] = number_format($sum['wait_commission'], 2, '.', '');;
 
-        $_REQUEST['time_start']?($start_time = date("Y-m-1",strtotime($_REQUEST['time_start']))):'';
+        $_REQUEST['time_start']?($start_time = date("Y-m-1",strtotime($_REQUEST['time_start']))):$start_time = date("Y-m-1",strtotime(''));
         $_REQUEST['time_end']?($end_time = date("Y-m-t",strtotime($_REQUEST['time_end']))):'';
         $this->assign('start_time',$start_time);
         $this->assign('end_time',$end_time);