From dcd9791f799e0f656dc151ae1aeda60ab228ca04 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Mon, 25 Nov 2019 20:09:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98oa=E5=85=B3?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteController.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 3c264ca95..041433688 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -71,6 +71,7 @@ unset($_REQUEST['parent_id']); if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} if(!empty(I('oa_associated'))) { + $map['oa_associated'] = I('oa_associated'); $oa_data = []; for($i = 1; $i > 0; $i++) { $arr['time'] = time(); @@ -127,7 +128,7 @@ unset($_REQUEST['parent_id']); } } } - $count = D(self::model_name)->count(); + $count = I('oa_associated') ? count($list_data) : D(self::model_name)->count(); $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} $this->assign('list_data', $list_data); From ee7bb128c0ce2f7204aea3d28163306aa1c53651 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Mon, 25 Nov 2019 20:13:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Model/GameModel.class.php | 4 ++-- Application/Admin/View/Deposit/lists.html | 12 +++++----- .../Admin/View/RechargeSum/summation.html | 22 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Application/Admin/Model/GameModel.class.php b/Application/Admin/Model/GameModel.class.php index 2b4c3d92a..a83665f45 100644 --- a/Application/Admin/Model/GameModel.class.php +++ b/Application/Admin/Model/GameModel.class.php @@ -38,8 +38,8 @@ class GameModel extends Model{ array('support_quota', '/^[0-9]*$/', '请输入正确的扶持额度', self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), array('game_score', '/^(\d(\.\d)?|10)$/', '游戏评分输入格式不正确', self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), array('recommend_level', '/^(\d(\.\d)?|10)$/', '推荐指数输入格式不正确', self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), - array('discount',[1,10],'代充折扣错误', self::MUST_VALIDATE, 'between', self::MODEL_BOTH), - array('bind_recharge_discount',[1,10],'绑币充值折扣错误',self::MUST_VALIDATE, 'between', self::MODEL_BOTH), + // array('discount',[1,10],'代充折扣错误', self::MUST_VALIDATE, 'between', self::MODEL_BOTH), + // array('bind_recharge_discount',[1,10],'绑币充值折扣错误',self::MUST_VALIDATE, 'between', self::MODEL_BOTH), array('dratio','/^(((\d|[1-9]\d)(\.\d{1,2})?)|100|100.0|100.00)$/','开发者分成比例错误',self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), array('support_ratio','/^100$|^(\d|[1-9]\d)$/','请输入正确的扶持比例',self::VALUE_VALIDATE, 'regex', self::MODEL_BOTH), diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html index 86eb58abe..d78d1c67c 100644 --- a/Application/Admin/View/Deposit/lists.html +++ b/Application/Admin/View/Deposit/lists.html @@ -328,12 +328,12 @@ $(document).ready(function () { function initSelect2WithSearch() { - $("#sel_order").select2({ - tags: true, - placeholder: '订单状态', - allowClear: false, //清空 - minimumResultsForSearch: Infinity, // 永久隐藏搜索框 - }); + // $("#sel_order").select2({ + // tags: true, + // placeholder: '订单状态', + // allowClear: false, //清空 + // minimumResultsForSearch: Infinity, // 永久隐藏搜索框 + // }); } diff --git a/Application/Admin/View/RechargeSum/summation.html b/Application/Admin/View/RechargeSum/summation.html index c86300fc8..9be1f5bfc 100644 --- a/Application/Admin/View/RechargeSum/summation.html +++ b/Application/Admin/View/RechargeSum/summation.html @@ -66,23 +66,23 @@ -->
- + + + +
- + + +
- +
From 4915ebc70cde1a1d561095f47deea074450948c4 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Mon, 25 Nov 2019 20:15:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98oa=E5=85=B3?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteController.class.php | 2 +- Application/Admin/View/Promote/lists.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 041433688..5eefc0632 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -70,7 +70,7 @@ unset($_REQUEST['parent_id']); $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find()); if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} - if(!empty(I('oa_associated'))) { + if(!empty(I('oa_associated')) || !is_null(I('oa_associated'))) { $map['oa_associated'] = I('oa_associated'); $oa_data = []; for($i = 1; $i > 0; $i++) { diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index 95b87420d..13cadf0aa 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -131,7 +131,7 @@
@@ -153,7 +153,7 @@ From 668e4d097c8a8f16cbb470044143794ca63be4db Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Mon, 25 Nov 2019 20:21:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98oa=E5=85=B3?= =?UTF-8?q?=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 5eefc0632..6313e3da0 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -128,7 +128,7 @@ unset($_REQUEST['parent_id']); } } } - $count = I('oa_associated') ? count($list_data) : D(self::model_name)->count(); + $count = (I('oa_associated') || !is_null(I('oa_associated') )) ? D(self::model_name)->where($map)->count() : D(self::model_name)->count(); $page = set_pagination($count,$row); if($page) {$this->assign('_page', $page);} $this->assign('list_data', $list_data);