From b9bc2a716245d70e1ca461c48f40146d9213a876 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Mon, 25 Nov 2019 21:31:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/GameTypeController.class.php | 6 ++++++ Application/Admin/Controller/GiftbagController.class.php | 2 +- Application/Admin/Controller/PromoteController.class.php | 3 +++ Application/Admin/View/GameType/lists.html | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/GameTypeController.class.php b/Application/Admin/Controller/GameTypeController.class.php index 8094c4cc2..8b6a0f7ab 100644 --- a/Application/Admin/Controller/GameTypeController.class.php +++ b/Application/Admin/Controller/GameTypeController.class.php @@ -25,8 +25,12 @@ class GameTypeController extends ThinkController { if(isset($request['status_show'])){ if($request['status_show']!='all'){ $extend['status_show'] = $request['status_show']; + } else { + unset($extend['status_show']); } unset($request['status_show']); + } else { + unset($extend['status_show']); } $this->m_title = '游戏类型'; @@ -40,6 +44,8 @@ class GameTypeController extends ThinkController { if(isset($request['status_show'])){ if($request['status_show']!='all'){ $extend['status'] = $request['status_show']; + } else { + unset($extend['status']); } unset($request['status_show']); } diff --git a/Application/Admin/Controller/GiftbagController.class.php b/Application/Admin/Controller/GiftbagController.class.php index 47842dc2f..10f854751 100644 --- a/Application/Admin/Controller/GiftbagController.class.php +++ b/Application/Admin/Controller/GiftbagController.class.php @@ -88,7 +88,7 @@ class GiftbagController extends ThinkController { $map['sdk_version'] = $_REQUEST['sdk_version']; $game_ids = M('game','tab_')->field('id')->where($map)->select(); $game_ids = array_column($game_ids,'id'); - $extend['sdk_version'] = ['in',$game_ids]; + $extend['game_id'] = ['in',$game_ids]; unset($_REQUEST['sdk_version']); } } diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 6313e3da0..570c257a6 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -63,6 +63,9 @@ unset($_REQUEST['parent_id']); $map['ba_id']=$_REQUEST['admin_id']; } } + if (I('status') || I('status', -1) == 0) { + $map['status'] = I('status'); + } if (I("promote_level")) { $map['level'] = I("promote_level"); } diff --git a/Application/Admin/View/GameType/lists.html b/Application/Admin/View/GameType/lists.html index 09a1bb77b..311902c52 100644 --- a/Application/Admin/View/GameType/lists.html +++ b/Application/Admin/View/GameType/lists.html @@ -39,7 +39,7 @@