From 490197a490e30fd7c32d53b238e61dd3e89db517 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 30 Jun 2020 12:15:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=90=88=E4=BD=9C?= =?UTF-8?q?=E6=96=B9=E5=90=88=E5=90=8C=E6=97=B6=E9=97=B4=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Partner/add.html | 2 -- Application/Admin/View/Partner/edit.html | 2 -- 2 files changed, 4 deletions(-) diff --git a/Application/Admin/View/Partner/add.html b/Application/Admin/View/Partner/add.html index 07f41bc20..7165e195e 100644 --- a/Application/Admin/View/Partner/add.html +++ b/Application/Admin/View/Partner/add.html @@ -259,7 +259,6 @@ format: 'yyyy-mm-dd', language:"zh-CN", minView: "month", - startDate:new Date(), autoclose:true }).change(function(){ var start = new Date($(this).val()).getTime(); @@ -276,7 +275,6 @@ format: 'yyyy-mm-dd', language:"zh-CN", minView: "month", - startDate:new Date(), autoclose:true }).change(function(){ var end = new Date($(this).val()).getTime(); diff --git a/Application/Admin/View/Partner/edit.html b/Application/Admin/View/Partner/edit.html index b408186df..b5bed76b9 100644 --- a/Application/Admin/View/Partner/edit.html +++ b/Application/Admin/View/Partner/edit.html @@ -261,7 +261,6 @@ format: 'yyyy-mm-dd', language:"zh-CN", minView: "month", - startDate:new Date(), autoclose:true }).change(function(){ var start = new Date($(this).val()).getTime(); @@ -278,7 +277,6 @@ format: 'yyyy-mm-dd', language:"zh-CN", minView: "month", - startDate:new Date(), autoclose:true }).change(function(){ var end = new Date($(this).val()).getTime(); From 587d7913cacf1b5898004cce39b6eea79336f4f6 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 1 Jul 2020 12:20:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 4 ++-- .../Admin/Controller/CompanyRelationController.class.php | 4 ++-- .../Admin/Controller/CompanyStatementController.class.php | 2 +- .../Controller/CompanyStatementLackController.class.php | 6 +++--- .../Controller/CompanyStatementPoolController.class.php | 6 +++--- Application/Admin/View/CompanyStatement/lists.html | 3 --- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index 096dc1c88..12b7dc362 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/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); } diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index ea53aec9e..ae08d1d68 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/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); } diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index d52539bf1..9dba96891 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -180,7 +180,7 @@ class CompanyStatementController extends ThinkController // dd($count); $parameter['p'] = $page; $parameter['row'] = $row; - $page = set_pagination($count['count'], $row, $parameter); + $page = set_pagination($count['count'], $row, $params); if ($page) { $this->assign('_page', $page); } diff --git a/Application/Admin/Controller/CompanyStatementLackController.class.php b/Application/Admin/Controller/CompanyStatementLackController.class.php index ecc86fd4b..6e5d63cc3 100644 --- a/Application/Admin/Controller/CompanyStatementLackController.class.php +++ b/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); } diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 3444a8998..8882d4205 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/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); } diff --git a/Application/Admin/View/CompanyStatement/lists.html b/Application/Admin/View/CompanyStatement/lists.html index 8ac880843..1aaafbdae 100644 --- a/Application/Admin/View/CompanyStatement/lists.html +++ b/Application/Admin/View/CompanyStatement/lists.html @@ -252,9 +252,6 @@
- - - {$_page|default=''}