diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 887d3f4f3..c578daf1a 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -714,15 +714,14 @@ class MemberController extends ThinkController unset($_REQUEST['server_name']); } // $map['type'] = 1; - $map['login_time'] = array('neq', 0); + // $map['login_time'] = ['exp', 'login_time<>0']; $extend = array(); $extend['map'] = $map; - $this->m_title = '登录记录'; - $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Member/login_record','status'=>1])->find()); - - + $this->m_title = '登录记录'; + $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Member/login_record','status'=>1])->find()); + parent::lists("UserLoginRecord", $p, $extend['map']); } diff --git a/Application/Admin/Controller/SpendController.class.php b/Application/Admin/Controller/SpendController.class.php index 4a4a84e8c..4b20ab95c 100644 --- a/Application/Admin/Controller/SpendController.class.php +++ b/Application/Admin/Controller/SpendController.class.php @@ -14,13 +14,16 @@ class SpendController extends ThinkController public function lists() { - $startDate = empty($_REQUEST['time-start']) ? date('Y-m-d', strtotime('-6 day', time())) : $_REQUEST['time-start']; - $endDate = empty($_REQUEST['time-end']) ? date('Y-m-d') : $_REQUEST['time-end']; + $startDate = empty($_REQUEST['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $_REQUEST['timestart']; + $endDate = empty($_REQUEST['timeend']) ? date('Y-m-d') : $_REQUEST['timeend']; + $startTime = strtotime($startDate); $endTime = strtotime($endDate) + 86399; $map['pay_time'] = array('BETWEEN', array($startTime, $endTime)); - unset($_REQUEST['time-start']); - unset($_REQUEST['time-end']); + + unset($_REQUEST['timestart']); + unset($_REQUEST['timeend']); + if (isset($_REQUEST['user_account'])) { $map['user_account'] = array('like', trim($_REQUEST['user_account'])); unset($_REQUEST['user_account']); @@ -37,6 +40,9 @@ class SpendController extends ThinkController unset($_REQUEST['game_name']); } } + if (isset($_REQUEST['game_type']) && $_REQUEST['game_type']) { + $map['sdk_version'] = $_REQUEST['game_type']; + } if (isset($_REQUEST['server_name'])) { $map['server_name'] = $_REQUEST['server_name']; unset($_REQUEST['server_name']); diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index bbe37a995..f6ca733ea 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -48,11 +48,11 @@