Merge branch 'hotfix/change_cp_time' of wmtx/platform into master

优化检索

Application/Admin/Controller/CompanyGameRatioController.class.php

@@ -143,7 +143,7 @@ class CompanyGameRatioController extends AdminController
                 ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")")
                 ->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }
@@ -317,7 +317,7 @@ class CompanyGameRatioController extends AdminController
                 ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")")
                 ->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/CompanyRelationController.class.php

@@ -107,7 +107,7 @@ class CompanyRelationController extends AdminController
 
         $count = $this->DBModel->field("count(id) count")->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }
@@ -223,7 +223,7 @@ class CompanyRelationController extends AdminController
 
         $count = $this->DBlogModel->field("count(id) count")->where($where)->find()['count'];
         $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/CompanyStatementController.class.php

@@ -178,9 +178,9 @@ class CompanyStatementController extends ThinkController
         }
         $count =  M("company_statement","tab_")->field("count(id) count,IFNULL(SUM(CASE WHEN withdraw_type < 2 THEN platform_amount ELSE 0 END),0) as platform_amount,SUM(statement_money) as statement_money")->where($map)->find();
         // dd($count);
-        $parameter['p'] = $page;
-        $parameter['row'] = $row;
-        $page = set_pagination($count['count'], $row, $parameter);
+        $params['p'] = $page;
+        $params['row'] = $row;
+        $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/CompanyStatementLackController.class.php

@@ -83,9 +83,9 @@ class CompanyStatementLackController extends ThinkController
         
         $count =  $this->DBModel->field("count(id) count,sum(statement_money) statement_money")->where($map)->find();
         // dd($count);
-        $parameter['p'] = $page;
-        $parameter['row'] = $row;
-        $page = set_pagination($count['count'], $row, $parameter);
+        $params['p'] = $page;
+        $params['row'] = $row;
+        $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -165,9 +165,9 @@ class CompanyStatementPoolController extends ThinkController
         }
         $count =  $this->DBModel->field("count(id) count,SUM(statement_money) as statement_money")->where($map)->find();
         // dd($count);
-        $parameter['p'] = $page;
-        $parameter['row'] = $row;
-        $page = set_pagination($count['count'], $row, $parameter);
+        $params['p'] = $page;
+        $params['row'] = $row;
+        $page = set_pagination($count['count'], $row, $params);
         if ($page) {
             $this->assign('_page', $page);
         }

Application/Admin/Controller/GameRatioMouldController.class.php

@@ -81,7 +81,7 @@ class GameRatioMouldController extends AdminController
 
        $count = $this->DBModel->alias('m')->field("count(id) count")->join("INNER JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id")->where($where)->find()['count'];
        $this->assign('data', $dbres);
-        $page = set_pagination($count, $row);
+        $page = set_pagination($count, $row,$params);
         if($page) {
             $this->assign('_page', $page);
         }

Application/Admin/View/CompanyStatement/lists.html

@@ -252,9 +252,6 @@
 
     </div>
     <div class="page">
-        <if condition="$role_export_check eq true ">
-            <!-- <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a> -->
-        </if>
         {$_page|default=''}
     </div>
     <div style="width: 100vw;height: 100vh;padding: 0;position: absolute;top: 0;z-index: 9999;display: none;" id="creat_msg">