From d176d51c5ce357a1e00a43ae9b741fd096f7b3bb Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Mon, 25 Nov 2019 10:20:07 +0800 Subject: [PATCH 01/68] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=86=99=E5=88=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ToolController.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 6f177429b..449d853ef 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -339,6 +339,13 @@ class ToolController extends ThinkController { $data[$name] = $config; $configs=array_merge($configs,$data); $result = file_put_contents($config_file, "where([ + 'name' => 'age' + ])->save([ + 'config' => $ageConfigJson + ]); } public function ios_game(){ From da794baa96a27c90a44ebb5eae5d16e609f0f782 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Mon, 25 Nov 2019 10:22:16 +0800 Subject: [PATCH 02/68] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=86=99=E5=88=B0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ToolController.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 449d853ef..8620da5a9 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -344,7 +344,9 @@ class ToolController extends ThinkController { M('tool', 'tab_')->where([ 'name' => 'age' ])->save([ - 'config' => $ageConfigJson + 'config' => $ageConfigJson, + 'type' => 1, + 'status' => $config['status'] ]); } From 3cb2f2b47921de915f9efc6c9a9de0a7dc069c8c Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 25 Nov 2019 10:46:14 +0800 Subject: [PATCH 03/68] =?UTF-8?q?arpu=E5=90=8D=E8=AF=8D=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Query/arpu.html | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Application/Home/View/default/Query/arpu.html b/Application/Home/View/default/Query/arpu.html index 8a7c9619f..a3aa103aa 100644 --- a/Application/Home/View/default/Query/arpu.html +++ b/Application/Home/View/default/Query/arpu.html @@ -159,22 +159,22 @@ 游戏名称 - 付费游戏数 + 付费游戏数 所属渠道 - 活跃用户 - 新增用户 - 付费用户 - 新增付费用户 - 付费总额 - 付费率 - 新增付费额 - 累计付费用户 + 活跃用户 + 新增用户 + 付费用户 + 新增付费用户 + 付费总额 + 付费率 + 新增付费额 + 累计付费用户 - ARPU - ARPPU + ARPU + ARPPU 详情 From 704dd789eb005adf0ee7ed5ae2d456e9a191ec90 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Mon, 25 Nov 2019 10:50:02 +0800 Subject: [PATCH 04/68] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=98=B2=E6=B2=89?= =?UTF-8?q?=E8=BF=B7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ToolController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 8620da5a9..ee888c619 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -342,11 +342,11 @@ class ToolController extends ThinkController { $ageConfigJson = json_encode($config); M('tool', 'tab_')->where([ - 'name' => 'age' + 'name' => $name ])->save([ 'config' => $ageConfigJson, 'type' => 1, - 'status' => $config['status'] + 'status' => $config['status'] ? $config['status'] : $config['bat']; ]); } From 8bb10aea61a2d31bffd71ace4039ed7210800071 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Mon, 25 Nov 2019 10:52:10 +0800 Subject: [PATCH 05/68] =?UTF-8?q?[bug]=E7=8E=A9=E5=AE=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/MemberController.class.php | 11 +++++++---- Application/Admin/View/Member/user_info.html | 5 +++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 01c9b978d..0d6029bf6 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -219,9 +219,11 @@ class MemberController extends ThinkController ->group('tab_user.id') ->where($hav) ->having($havs)->select(false); + + $allcountsql = str_replace("tab_user.promote_id","ss.promote_id",$sql); //获取总额 - $allcount = M()->field('count(a.id) as count,sum(a.recharge_total) recharge_total')->table('(' . $sql . ') as a')->select(); - $this->assign('history_count', $allcount[0]['recharge_total']); + $allcount = M()->field('count(a.id) as count,sum(a.recharge_total) recharge_total')->table('(' . $allcountsql . ') as a')->select(); + $this->assign('history_count', $allcount[0]['recharge_total']?:0); //替换为新表 if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){ @@ -236,9 +238,10 @@ class MemberController extends ThinkController } $jcount = M('User', 'tab_')->field('count(a.id) as count,sum(a.recharge_total) recharge_total')->table('(' . $sql . ') as a')->select(); - $count = $jcount[0]['count']; + $count = $jcount[0]['count'] ?:0 ; + $this->assign('user_count', $count); // var_dump($jcount);die(); - $this->assign('now_count', $jcount[0]['recharge_total']); + $this->assign('now_count', $jcount[0]['recharge_total']?:0); $model = M('Model')->getByName('user'); diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index 3111dcb7f..3faaa8021 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -310,7 +310,8 @@ 当前用户累计充值：{$now_count} 　　 - 历史累计充值:{$history_count} + 历史累计充值:{$history_count}　　 + 用户数:{$user_count} 当前用户累计充值:　当前属于该推广员的用户的充值累计（不含用户换绑前记录）　　/　　 @@ -318,7 +319,7 @@ - 当前用户累计充值：{$now_count} + 当前用户累计充值：{$now_count}　　用户数:{$user_count} From f9307ee710e18df6a3e652a4f4e7a5ceac03a36b Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Mon, 25 Nov 2019 10:54:00 +0800 Subject: [PATCH 06/68] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=98=B2=E6=B2=89?= =?UTF-8?q?=E8=BF=B7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ToolController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index ee888c619..58cb75272 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -346,7 +346,7 @@ class ToolController extends ThinkController { ])->save([ 'config' => $ageConfigJson, 'type' => 1, - 'status' => $config['status'] ? $config['status'] : $config['bat']; + 'status' => $config['status'] ? $config['status'] : $config['bat'] ]); } From a0ab440e1a2c8db749c5f283a9f1ff87dc977ad2 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Mon, 25 Nov 2019 11:11:38 +0800 Subject: [PATCH 07/68] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=98=B2=E6=B2=89?= =?UTF-8?q?=E8=BF=B7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ToolController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 58cb75272..5d36aab97 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -346,7 +346,7 @@ class ToolController extends ThinkController { ])->save([ 'config' => $ageConfigJson, 'type' => 1, - 'status' => $config['status'] ? $config['status'] : $config['bat'] + 'status' => isset($config['status']) ? $config['status'] : $config['bat'] ]); } From 090d1e2f69bee761b4f1fdd100e4ca35200132c2 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Mon, 25 Nov 2019 11:22:12 +0800 Subject: [PATCH 08/68] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/MemberController.class.php | 23 ++++++------------- .../Admin/Controller/access_data_foldline.txt | 2 +- .../Admin/View/Member/device_bans_edit.html | 3 +++ .../Admin/View/Member/device_bans_list.html | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 01c9b978d..32d5d8532 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -123,14 +123,13 @@ class MemberController extends ThinkController unset($_REQUEST['status']); } - $game_map = ""; - if (isset($_REQUEST['game_name'])) { - $game_map .= " and tab_user_play.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")"; - } - $game_play_map = ''; + // if (isset($_REQUEST['game_name'])) { + // //$game_map .= " and tab_user_play.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")"; + // } + $spendprom = " and ss.game_id in (".implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')).")"; if (isset($_REQUEST['server_name'])) { - $game_play_map .= " and tab_user_play_info.server_name = '{$_REQUEST['server_name']}' "; + $map['server_name'] = ['like', "{$_REQUEST['server_name']}%"]; } if (isset($_REQUEST['viplevel'])) { @@ -189,8 +188,6 @@ class MemberController extends ThinkController if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){ $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status') ->join('left join tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1'.$spendprom) - ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false) - ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = a.id $game_play_map" : false) ->page($page, $row) ->having($havs) ->group('a.id') @@ -200,8 +197,6 @@ class MemberController extends ThinkController }else{ $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status') ->join('left join tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1') - ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false) - ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = a.id $game_play_map" : false) ->page($page, $row) ->having($havs) ->group('a.id') @@ -212,9 +207,7 @@ class MemberController extends ThinkController //计数 $sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total') - ->join('left join tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1') - ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false) - ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false) + ->join('left join tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1'.$spendprom) ->where($map) ->group('tab_user.id') ->where($hav) @@ -227,8 +220,6 @@ class MemberController extends ThinkController if($_REQUEST['promote_id'] && $_REQUEST['promote_id'] > -1){ $sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total') ->join('left join tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1'.$spendprom) - ->join($game_map ? "tab_user_play on tab_user_play.user_id = tab_user.id $game_map" : false) - ->join($game_play_map ? "tab_user_play_info on tab_user_play_info.user_id = tab_user.id $game_play_map" : false) ->where($map) ->group('tab_user.id') ->where($hav) @@ -237,7 +228,7 @@ class MemberController extends ThinkController $jcount = M('User', 'tab_')->field('count(a.id) as count,sum(a.recharge_total) recharge_total')->table('(' . $sql . ') as a')->select(); $count = $jcount[0]['count']; - // var_dump($jcount);die(); + //var_dump($jcount);die(); $this->assign('now_count', $jcount[0]['recharge_total']); $model = M('Model')->getByName('user'); diff --git a/Application/Admin/Controller/access_data_foldline.txt b/Application/Admin/Controller/access_data_foldline.txt index bc484849f..248024757 100644 --- a/Application/Admin/Controller/access_data_foldline.txt +++ b/Application/Admin/Controller/access_data_foldline.txt @@ -1 +1 @@ -{"news":[{"time":"0:00","count":1},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":1},{"time":"11:00","count":1},{"time":"12:00","count":1},{"time":"13:00","count":1},{"time":"14:00","count":12},{"time":"15:00","count":1},{"time":"16:00","count":3},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":2},{"time":"20:00","count":6},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"sum":{"news":29,"active":49,"player":7,"money":13.17},"active":[{"time":"0:00","count":2},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":1},{"time":"9:00","count":4},{"time":"10:00","count":7},{"time":"11:00","count":1},{"time":"12:00","count":4},{"time":"13:00","count":2},{"time":"14:00","count":12},{"time":"15:00","count":3},{"time":"16:00","count":5},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":2},{"time":"20:00","count":6},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"player":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":1},{"time":"14:00","count":2},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":1},{"time":"20:00","count":2},{"time":"21:00","count":1},{"time":"22:00","count":0},{"time":"23:00","count":0}],"money":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":"6.01"},{"time":"14:00","count":"3.08"},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":"4.02"},{"time":"20:00","count":"0.05"},{"time":"21:00","count":"0.01"},{"time":"22:00","count":0},{"time":"23:00","count":0}]} \ No newline at end of file +{"news":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":2},{"time":"20:00","count":1},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"sum":{"news":3,"active":4,"player":0,"money":0},"active":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":3},{"time":"20:00","count":1},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"player":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"money":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}]} \ No newline at end of file diff --git a/Application/Admin/View/Member/device_bans_edit.html b/Application/Admin/View/Member/device_bans_edit.html index fcb6e2572..275ac0adc 100644 --- a/Application/Admin/View/Member/device_bans_edit.html +++ b/Application/Admin/View/Member/device_bans_edit.html @@ -33,4 +33,7 @@ + \ No newline at end of file diff --git a/Application/Admin/View/Member/device_bans_list.html b/Application/Admin/View/Member/device_bans_list.html index 81ccea278..e3549e2bf 100644 --- a/Application/Admin/View/Member/device_bans_list.html +++ b/Application/Admin/View/Member/device_bans_list.html @@ -139,7 +139,7 @@ \ No newline at end of file diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index b760808bc..9e7f9172f 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -35,25 +35,25 @@
- - +
- -
-
-
+
+ +
@@ -224,19 +224,21 @@ $(function(){ }); var gameId = $('#game-select').val(); + var sdkVersion = $('#sdk_version').val(); var defaultServerId = $('#server-select').attr('data-server'); - getGameServers(gameId, defaultServerId) - $('#game-select').on({ + getGameServers(gameId, sdkVersion, defaultServerId) + $('#game-select,#sdk_version').on({ change: function name() { - gameId = $('#game-select').val() - getGameServers(gameId, 0) + gameId = $('#game-select').val(); + sdkVersion = $('#sdk_version').val(); + getGameServers(gameId, sdkVersion, 0); } - }) - function getGameServers(gameId, defaultServerId) { + }); + function getGameServers(gameId, sdkVersion, defaultServerId) { $.ajax({ url: "{:U('Query/getGameServers')}", dataType: 'json', - data: {game_id: gameId}, + data: {game_id: gameId, sdk_version: sdkVersion}, success: function(response) { var options = '' for (var i in response.data.servers) { diff --git a/Application/Home/View/default/Query/userRoles.html b/Application/Home/View/default/Query/userRoles.html index 81e70c274..51b221cec 100644 --- a/Application/Home/View/default/Query/userRoles.html +++ b/Application/Home/View/default/Query/userRoles.html @@ -24,25 +24,25 @@
- - +
- -
-
-
+
+ +
@@ -140,35 +140,37 @@ $(function() { defaultDate: defaultDate, }) $('.select_gallery').select2() - var gameId = $('#game-select').val(); - var defaultServerId = $('#server-select').attr('data-server'); - getGameServers(gameId, defaultServerId) - $('#game-select').on({ - change: function name() { - gameId = $('#game-select').val() - getGameServers(gameId, 0) - } - }) - function getGameServers(gameId, defaultServerId) { - $.ajax({ - url: "{:U('Query/getGameServers')}", - dataType: 'json', - data: {game_id: gameId}, - success: function(response) { - var options = '' - for (var i in response.data.servers) { - var server = response.data.servers[i] - var selected = '' - if (defaultServerId > 0 && server.id==defaultServerId) { - selected = 'selected' - } - options += '' + var gameId = $('#game-select').val(); + var sdkVersion = $('#sdk_version').val(); + var defaultServerId = $('#server-select').attr('data-server'); + getGameServers(gameId, sdkVersion, defaultServerId) + $('#game-select,#sdk_version').on({ + change: function name() { + gameId = $('#game-select').val(); + sdkVersion = $('#sdk_version').val(); + getGameServers(gameId, sdkVersion, 0); } - $('#server-select').html(options) - $("#server-select").val(defaultServerId).trigger("change") - } - }) - } + }); + function getGameServers(gameId, sdkVersion, defaultServerId) { + $.ajax({ + url: "{:U('Query/getGameServers')}", + dataType: 'json', + data: {game_id: gameId, sdk_version: sdkVersion}, + success: function(response) { + var options = '' + for (var i in response.data.servers) { + var server = response.data.servers[i] + var selected = '' + if (defaultServerId > 0 && server.id==defaultServerId) { + selected = 'selected' + } + options += '' + } + $('#server-select').html(options) + $("#server-select").val(defaultServerId).trigger("change") + } + }) + } var promoteUrl = "{:U('Query/getSubPromotes')}" initPromoteSelect(promoteUrl) From 8d7640d152faac0f3a22e22cc566cb18dd0cef96 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 25 Nov 2019 16:31:37 +0800 Subject: [PATCH 21/68] =?UTF-8?q?=E5=85=85=E5=80=BC=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index a88cc4292..c5b458b2a 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -2889,6 +2889,11 @@ class DownloadController extends BaseController { foreach ($records as $key1 => $value1) { $value1['user_account'] = $this->encryption($value1['user_account']); $value1['play_time'] = date('Y-m-d H:i:s',$value1['play_time']); + if($value1['sdk_version'] == 1) { + $value1['sdk_version'] == "Android"; + }else { + $value1['sdk_version'] == "ios"; + } $xlsData[] = $value1; } $this->exportExcel($xlsName, $xlsCell, $xlsData,$id); From 0879762b70b733ac48246d2bfc90f7280c45f3e7 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 25 Nov 2019 16:34:20 +0800 Subject: [PATCH 22/68] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index c5b458b2a..d687cc151 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -2890,9 +2890,9 @@ class DownloadController extends BaseController { $value1['user_account'] = $this->encryption($value1['user_account']); $value1['play_time'] = date('Y-m-d H:i:s',$value1['play_time']); if($value1['sdk_version'] == 1) { - $value1['sdk_version'] == "Android"; + $value1['sdk_version'] = "Android"; }else { - $value1['sdk_version'] == "ios"; + $value1['sdk_version'] = "ios"; } $xlsData[] = $value1; } From 1d2ce277365bd3d084184f7669a0cd213a58f777 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 25 Nov 2019 16:42:56 +0800 Subject: [PATCH 23/68] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E4=B8=8B=E7=BA=BF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/MemberController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 7d0a4cb7e..95186d306 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -780,6 +780,7 @@ class MemberController extends ThinkController } // $map['type'] = 1; // $map['login_time'] = ['exp', 'login_time<>0']; + $map['login_time'] = ['gt',0]; $extend = array(); $extend['map'] = $map; From 9374e66840d4736c66edf8100ff22d9b3cea4243 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 25 Nov 2019 16:51:44 +0800 Subject: [PATCH 24/68] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=AE=A1=E7=90=86->=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AF=A6=E6=83=85--=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Home/View/default/Apply/index.html b/Application/Home/View/default/Apply/index.html index 2a243b9a2..bb3e08a80 100644 --- a/Application/Home/View/default/Apply/index.html +++ b/Application/Home/View/default/Apply/index.html @@ -340,7 +340,7 @@

游戏截图

-
    +
@@ -836,6 +836,7 @@ }); $('.game-slide-li').html(html); + $('.game-slide-li').css('left', '0px'); } $('.detail-body').show(); From bad1165ffa1d864618dac8aba8d7e52faa035783 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 25 Nov 2019 16:52:33 +0800 Subject: [PATCH 25/68] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=AE=A1=E7=90=86->=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AF=A6=E6=83=85--=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Apply/index.html b/Application/Home/View/default/Apply/index.html index bb3e08a80..7e22e4ad5 100644 --- a/Application/Home/View/default/Apply/index.html +++ b/Application/Home/View/default/Apply/index.html @@ -340,7 +340,7 @@

游戏截图

-
    +
From 840dc085a4f871022c6b4a3e32e4b4b1c50f1c12 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 25 Nov 2019 17:01:58 +0800 Subject: [PATCH 26/68] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=AE=A1=E7=90=86->=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=AF=A6=E6=83=85--=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/index.html | 2 +- Application/Home/View/default/Apply/my_game.html | 2 +- Public/Home/css/game_detailed.css | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Apply/index.html b/Application/Home/View/default/Apply/index.html index 7e22e4ad5..ffa6b5fb4 100644 --- a/Application/Home/View/default/Apply/index.html +++ b/Application/Home/View/default/Apply/index.html @@ -4,7 +4,7 @@ - +