From 5d01cb1ff56f4fc37c815b5bd085963c8a0726bf Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Fri, 13 Dec 2019 11:13:34 +0800 Subject: [PATCH 01/33] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=A2=84=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/BehaviorLogController.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 7ed604212..fbc566287 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -51,6 +51,12 @@ class BehaviorLogController extends ThinkController } } $data = M('pay_info', 'tab_')->where($map)->order('id DESC')->page($p, $row)->select(); + + foreach($data as $k => $v) { + if(empty($v['extend'])) { + $data[$k]['extend'] = $v['order_id']; + } + } $count = M('pay_info', 'tab_')->where($map)->count(); $page = set_pagination($count, $row); if ($page) { From dd536f955635ee978d041bcfb0e14979121936fb Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Fri, 13 Dec 2019 14:51:28 +0800 Subject: [PATCH 02/33] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/default/Query/userRecharges.html | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index c2429deb3..5fedd4150 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -21,6 +21,9 @@ .trunk-search .select-time .txt { width: 100px; } + .title-cursor-pointer { + cursor: pointer; + } @@ -95,13 +98,13 @@
- - - - - - - + + + + + + - - - - - - - + + From cbf74bca5de95465ba306ffd1b7389a05d426c9f Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Fri, 13 Dec 2019 16:36:15 +0800 Subject: [PATCH 03/33] =?UTF-8?q?=E8=8B=B9=E6=9E=9C=E5=86=85=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Data/update.sql b/Data/update.sql index a2e574e6b..292053b26 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -686,7 +686,7 @@ CREATE TABLE `tab_server_union` ( KEY `create_time` (`create_time`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='合服游戏区服表'; --- 用户行为 +-- 用户行为 tping ALTER TABLE `tab_pay_info` ADD COLUMN `user_account` varchar(30) DEFAULT NULL COMMENT '用户账号'; ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_name` varchar(30) DEFAULT '' COMMENT '游戏玩家昵称'; ALTER TABLE `tab_pay_info` ADD COLUMN `game_name` varchar(30) DEFAULT '' COMMENT '游戏名称'; @@ -703,6 +703,11 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `ip` varchar(255) NOT NULL DEFAULT '0' AFTER `promote_account`, ADD COLUMN `pay_way` int NOT NULL DEFAULT 0 AFTER `ip`; +-- 苹果内购 tping +ALTER TABLE `tab_spend_distinction` +MODIFY COLUMN `extend` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '通知游戏方扩展(一般是游戏方透传)' AFTER `game_name`; + + -- 菜单(游戏充值预下单) INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1); From 8a241cceb80af9997f94db23735c101f734bdfc7 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Fri, 13 Dec 2019 17:01:21 +0800 Subject: [PATCH 04/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8A=A0=E5=AF=86=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 6 ++++++ Application/Admin/View/Member/edit.html | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index bcb506d46..af1e31127 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -596,4 +596,10 @@ function encryptStr($str) { $stars_str = $stars_str."*"; } return substr_replace($str, $stars_str, 3, $length-6); +} + +function encryptIdCard($str) { + $length = strlen($str); + $stars_str = "****"; + return substr_replace($str, $stars_str, $length-4, 4); } \ No newline at end of file diff --git a/Application/Admin/View/Member/edit.html b/Application/Admin/View/Member/edit.html index d919416fe..50f4cca3e 100644 --- a/Application/Admin/View/Member/edit.html +++ b/Application/Admin/View/Member/edit.html @@ -113,7 +113,7 @@ From 732ba257ec3cb005776c93eab82fb6488ebfabaf Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Fri, 13 Dec 2019 17:10:21 +0800 Subject: [PATCH 05/33] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E5=8A=A0=E5=AF=86=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index af1e31127..c76087014 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -600,6 +600,9 @@ function encryptStr($str) { function encryptIdCard($str) { $length = strlen($str); - $stars_str = "****"; + $stars_str = ""; + if($length>=4){ + $stars_str = "****"; + } return substr_replace($str, $stars_str, $length-4, 4); } \ No newline at end of file From fb4a4f3caeff8df4d319173d51aeb0933741bd57 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Fri, 13 Dec 2019 17:22:42 +0800 Subject: [PATCH 06/33] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 66a4fa08b..cb6ed2018 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1901,7 +1901,6 @@ class QueryController extends BaseController $list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account']; } } - $games = get_promote_serach_game(); $this->assign('games', $games); From 65e1ddbd93f502b80c9136dfc79497c24ad67b93 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Fri, 13 Dec 2019 17:25:25 +0800 Subject: [PATCH 07/33] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=A2=84=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/BehaviorLogController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index fbc566287..20f0213f4 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -17,7 +17,7 @@ class BehaviorLogController extends ThinkController $map['extend'] = $params['extend']; } if (isset($params['game_name'])) { - $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')]; + $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['sdk_version']), 'id')]; $map['game_id'] = $game_id; } if (isset($params['server_name'])) { From 95f7acd6ff1ded0c5c55ea89479b4a9ad76da173 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Fri, 13 Dec 2019 18:01:41 +0800 Subject: [PATCH 08/33] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=A2=84=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/BehaviorLogController.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 20f0213f4..a4afb0d70 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -17,11 +17,13 @@ class BehaviorLogController extends ThinkController $map['extend'] = $params['extend']; } if (isset($params['game_name'])) { - $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['sdk_version']), 'id')]; + $game_id = ['in', array_column(getGameByName($params['game_name'], $params['sdk_version']), 'id')]; $map['game_id'] = $game_id; } if (isset($params['server_name'])) { - $map['server_name'] = $params['server_name']; + $game_id = M('game', 'tab_')->where(['relation_game_name' => $params['game_name'],'sdk_version' => $params['sdk_version']])->getField('id'); + $server_id = M('server', 'tab_')->where(['server_name' => $params['server_name'], 'game_id' => $game_id])->getField('server_num'); + $map['server_id'] = $server_id; } if (isset($params['user_nickname'])) { $map['user_nickname'] = $params['user_nickname']; From 597db40ddce52a42ae383edecb02a112fd46293d Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 13 Dec 2019 18:07:57 +0800 Subject: [PATCH 09/33] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index b9b47fe62..54642724d 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -52,7 +52,7 @@
- +
@@ -74,7 +74,7 @@ ">
- +
+ + + + + + + + @@ -60,10 +61,11 @@ +
+ {$channel.sort} +
+ + - +
玩家账号游戏名称平台游戏区服角色名等级充值总额 + 玩家账号游戏名称平台游戏区服角色名等级充值总额 @@ -112,7 +115,7 @@ 充值次数 + 充值次数 @@ -123,7 +126,7 @@ 昨日充值 + 昨日充值 @@ -134,7 +137,7 @@ 未登录天数 + 未登录天数 @@ -145,7 +148,7 @@ 游戏累计登录天数 + 游戏累计登录天数 @@ -156,7 +159,7 @@ 注册时间 + 注册时间 @@ -167,8 +170,8 @@ 最后登录时间推广员账号最后登录时间推广员账号

暂无数据

身份证号 - + 点击修改
游戏隐藏 + + 针对游戏id隐藏,多个用,隔开 +
状态 + + + +
菜单图标 diff --git a/Application/Admin/View/SdkMenu/lists.html b/Application/Admin/View/SdkMenu/lists.html index cc7003278..7d9fca365 100644 --- a/Application/Admin/View/SdkMenu/lists.html +++ b/Application/Admin/View/SdkMenu/lists.html @@ -42,6 +42,7 @@ 跳转目标 IOS链接 排序状态 操作
{$channel.act} {$channel.ios_url} -
- {$channel.sort} -
- 		{$channel.status} 编辑 删除 @@ -71,7 +73,7 @@
aOh! 暂时还没有内容!aOh! 暂时还没有内容!
From a15e62988be8df9d837ea69f596edbc26443371b Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Mon, 16 Dec 2019 14:11:33 +0800 Subject: [PATCH 19/33] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E9=A2=84=E5=85=85?= =?UTF-8?q?=E5=80=BC-=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ExportController.class.php | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 2e6b1472d..332414b6b 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -1818,31 +1818,34 @@ class ExportController extends Controller $map = []; if (isset($params['user_account'])) { - $map['user_account'] = $params['user_account']; + $map['tab_pay_info.user_account'] = $params['user_account']; } if (isset($params['extend'])) { - $map['extend'] = $params['extend']; + $map['tab_pay_info.extend'] = $params['extend']; } if (isset($params['game_name'])) { - $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')]; - $map['game_id'] = $game_id; + $game_id = ['in', array_column(getGameByName($params['game_name'], $params['sdk_version']), 'id')]; + $map['tab_pay_info.game_id'] = $game_id; } if (isset($params['server_name'])) { - $map['server_name'] = $params['server_name']; + $game_id = M('game', 'tab_')->where(['relation_game_name' => $params['game_name'],'sdk_version' => $params['sdk_version']])->getField('id'); + $server_id = M('server', 'tab_')->where(['server_name' => $params['server_name'], 'game_id' => $game_id])->getField('server_num'); + $map['tab_pay_info.server_id'] = $server_id; } - if (isset($params['user_nickname'])) { - $map['user_nickname'] = $params['user_nickname']; + if (isset($params['game_player_name'])) { + $map['tab_pay_info.game_player_name'] = $params['game_player_name']; } if (isset($params['game_player_id'])) { - $map['game_player_id'] = $params['game_player_id']; + $map['tab_pay_info.game_player_id'] = $params['game_player_id']; } $startDate = empty($params['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $params['timestart']; $endDate = empty($params['timeend']) ? date('Y-m-d') : $params['timeend']; $startTime = strtotime($startDate); $endTime = strtotime($endDate) + 86399; - $map['create_time'] = array('BETWEEN', [$startTime, $endTime]); - if ($promoteId = I('promote_id')) { + $map['tab_pay_info.create_time'] = array('BETWEEN', [$startTime, $endTime]); + if (isset($params['promote_id'])) { + $promoteId = $params['promote_id']; if ($promoteId == 0) { $map['promote_id'] = 0; } else { @@ -1852,10 +1855,14 @@ class ExportController extends Controller $map['promote_id'] = ['in', $promoteIds]; } } - $xlsData = M('pay_info', 'tab_')->where($map)->order('id DESC')->select(); - foreach($xlsData as $k => $v) { - $xlsData[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); + $data = M('pay_info', 'tab_')->field('tab_pay_info.id,tab_pay_info.user_account,extend,tab_pay_info.create_time,tab_pay_info.game_name,tab_pay_info.server_name,tab_pay_info.promote_account,tab_pay_info.order_id,tab_pay_info.game_player_id,tab_pay_info.game_player_name,price,tab_server.server_name')->join('tab_server on tab_pay_info.server_id = tab_server.server_num AND tab_pay_info.game_id = tab_server.game_id')->where($map)->order('tab_pay_info.id DESC')->select(); + foreach($data as $k => $v) { + $data[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); + if(empty($v['extend'])) { + $data[$k]['extend'] = $v['order_id']; + } } + $xlsData = $data; break; default: From bec8203d47968cb911d3201141d813a1aeaacab5 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 15:42:36 +0800 Subject: [PATCH 20/33] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=B8=B8=E6=88=8F--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Apply/my_game.html | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 2fae01956..a709f5dd2 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -876,9 +876,20 @@ fontname: 'Ubuntu', fontcolor: '#ff9818', }; - var logo = $(linkTag).parents('.game-li').eq(0).find('.img-box').children('img')[0] - $('#game_link_ercode').empty().qrcode(options); - $("#game_link_ercode canvas")[0].getContext('2d').drawImage(logo, (qrcodeWidth - logoWidth) / 2, (qrcodeHeight - logoHeight) / 2, logoWidth, logoHeight); + + var logo = null; + var logoSrc = $(linkTag).parents('.game-li').eq(0).find('.img-box').children('img').attr('src'); + console.log(isImg(logoSrc)); + if (isImg(logoSrc)) { + logo = $(linkTag).parents('.game-li').eq(0).find('.img-box').children('img')[0] + } else { + var img = document.createElement('img'); + img.src = '__IMG__/game_icon.png'; + logo = img; + } + + $('#game_link_ercode').empty().qrcode(options); + $("#game_link_ercode canvas")[0].getContext('2d').drawImage(logo, (qrcodeWidth - logoWidth) / 2, (qrcodeHeight - logoHeight) / 2, logoWidth, logoHeight); $('#clipboard-btn').attr('data-text', response.data.url) $('#clipboard-btn').click() @@ -896,6 +907,15 @@ }); }); + function isImg(src) { + var img = new Image(); + img.src = src; + if (img.width > 0 || img.height > 0) { + return true; + } + return false; + } + var clipboard = new ClipboardJS('#clipboard-btn', { text: function(trigger) { return trigger.getAttribute('data-text'); From f4effc746d543b13e2cef8a2c208138d1f619e1b Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Mon, 16 Dec 2019 16:04:35 +0800 Subject: [PATCH 21/33] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index 292053b26..bf24fab5d 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -702,6 +702,16 @@ MODIFY COLUMN `game_player_id` varchar(255) NULL DEFAULT '0' COMMENT '玩家游 ALTER TABLE `tab_pay_info` ADD COLUMN `ip` varchar(255) NOT NULL DEFAULT '0' AFTER `promote_account`, ADD COLUMN `pay_way` int NOT NULL DEFAULT 0 AFTER `ip`; +-- 默认值处理 tping +ALTER TABLE `tab_pay_info` +MODIFY COLUMN `user_account` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '用户账号' AFTER `txn_time`, +MODIFY COLUMN `game_player_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '游戏玩家昵称' AFTER `user_account`, +MODIFY COLUMN `game_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '游戏名称' AFTER `game_player_name`, +MODIFY COLUMN `server_id` int(11) NOT NULL DEFAULT 0 COMMENT '区服id' AFTER `game_name`, +MODIFY COLUMN `server_name` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '区服名称' AFTER `server_id`, +MODIFY COLUMN `game_player_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '玩家游戏内id' AFTER `promote_id`, +MODIFY COLUMN `sdk_version` tinyint(2) NOT NULL DEFAULT 1 COMMENT '区别sdk版本1安卓 2苹果 ' AFTER `game_player_id`, +MODIFY COLUMN `promote_account` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '推广员账号' AFTER `sdk_version`; -- 苹果内购 tping ALTER TABLE `tab_spend_distinction` From f0a09050ae089b5e66932bb6f43011e8008edc0d Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 16:45:35 +0800 Subject: [PATCH 22/33] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E6=A3=80=E7=B4=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 8f8e65c35..dcdf36f6b 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -211,6 +211,7 @@ class QueryController extends BaseController $parameter['level_promote_3'] = $levelPromote[1]; $parameter['level_promote_4'] = $levelPromote[2]; !isset($_REQUEST['pay_way']) || $parameter['pay_way'] = I('pay_way'); + !isset($_REQUEST['pay_status']) || $parameter['pay_status'] = I('pay_status', -1); $serverData = $this->getServer(I('relation_game_id'), I('sdk_version')); $page = set_pagination($count, $row, $parameter); From 9c9396351b0ebad03e1d5b03d2971d9229f1ed33 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 16:51:05 +0800 Subject: [PATCH 23/33] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=E6=A3=80=E7=B4=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 31add93cd..dcdf36f6b 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -211,6 +211,7 @@ class QueryController extends BaseController $parameter['level_promote_3'] = $levelPromote[1]; $parameter['level_promote_4'] = $levelPromote[2]; !isset($_REQUEST['pay_way']) || $parameter['pay_way'] = I('pay_way'); + !isset($_REQUEST['pay_status']) || $parameter['pay_status'] = I('pay_status', -1); $serverData = $this->getServer(I('relation_game_id'), I('sdk_version')); $page = set_pagination($count, $row, $parameter); @@ -1857,7 +1858,7 @@ class QueryController extends BaseController } $map['uc.create_time'] = ['between', [$begTime, $endTime - 1]]; - $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today"; + $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id"; $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time"; $loginRecordMap['lr.create_time'] = $map['uc.create_time']; @@ -1869,22 +1870,25 @@ class QueryController extends BaseController $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count'; $subQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($field) - ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') + ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.role_id = uc.role_id') ->where($map) - ->group('uc.role_id,uc.server_id,uc.game_id') + ->group('uc.role_id,uc.game_id,uc.user_id,uc.id') ->buildSql(); $query = M()->alias('record') ->table($subQuery) ->order($orderBy); $total = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) - ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') ->where($map) ->find(); list($records, $pagination, $count) = $this->paginate($query); foreach ($records as &$list) { + if (empty($list['user_account']) ) { + $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account'); + $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']); + } $list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']); $list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name']; $list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']); @@ -1897,7 +1901,6 @@ class QueryController extends BaseController $list['promote_account'] = empty($list['promote_account']) ? '--' : $list['promote_account']; } } - $games = get_promote_serach_game(); $this->assign('games', $games); From 03edc87f4fb68298eb5bd304d0cb573e4acb6e44 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 17:33:17 +0800 Subject: [PATCH 24/33] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=A3=80=E7=B4=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index dcdf36f6b..06e4a4e6c 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1879,6 +1879,7 @@ class QueryController extends BaseController ->order($orderBy); $total = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) + ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.role_id = uc.role_id') ->where($map) ->find(); From cb89467f6b3d0cbff7a1c86a45d1580b9edee172 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 16 Dec 2019 17:36:32 +0800 Subject: [PATCH 25/33] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 7 ++++--- Application/Home/Controller/PlayersController.class.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 1b4ba9afa..468fbd5f1 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1196,13 +1196,14 @@ class DownloadController extends BaseController { empty(I('extend')) || $map['tab_pay_info.extend'] = I('extend'); empty(I('user_id')) || $map['tab_pay_info.game_player_id'] = I('user_id'); if (!empty($begTime) && !empty($endTime)) { - $map['tab_pay_info.create_time'] = ['between', [strtotime($begTime), strtotime($endTime) - 1]]; + $map['tab_pay_info.create_time'] = ['between', [strtotime($begTime), strtotime($endTime) +24*3600- 1]]; }else if (empty($begTime) && !empty($endTime)) { - $map['tab_pay_info.create_time'] = ['elt',strtotime($endTime)]; + $map['tab_pay_info.create_time'] = ['elt',strtotime($endTime) + 24*3600]; }else if (!empty($begTime) && empty($endTime)) { - $map['tab_pay_info.create_time'] = ['EGT',strtotime($begTime)]; + $map['tab_pay_info.create_time'] = ['EGT',strtotime($begTime) + 24*3600]; } + $conditions = json_encode($map,TRUE); $addtime = time(); $data = [ diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index b9172645d..742c5b773 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -22,7 +22,7 @@ class PlayersController extends BaseController { $userId = trim(I('user_id', '')); $extend = trim(I('extend', '')); //cp订单号 $begTime = strtotime(I('begtime')); - $endTime = strtotime(I('endtime')); + $endTime = strtotime(I('endtime')) + 24*3600; $levelPromote = $this->getLevelPromote(); $queryPromote = $this->getQueryPromote($levelPromote); // $loginPromote = $this->getLoginPromote(); From dc2c4ee6529e20603a926fedb51bf7723411dcdd Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 16 Dec 2019 17:50:20 +0800 Subject: [PATCH 26/33] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=A3=80=E7=B4=A2bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 06e4a4e6c..9af3fa9a9 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1877,14 +1877,20 @@ class QueryController extends BaseController $query = M()->alias('record') ->table($subQuery) ->order($orderBy); - $total = M('user_play_data_count', 'tab_')->alias('uc') + + list($records, $pagination, $count) = $this->paginate($query); + + $totalQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) - ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.role_id = uc.role_id') + ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id') + ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id,uc.id') ->where($map) + ->buildSql(); + $total = M()->alias('totals') + ->table($totalQuery) + ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today') ->find(); - list($records, $pagination, $count) = $this->paginate($query); - foreach ($records as &$list) { if (empty($list['user_account']) ) { $list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account'); From 9233d1568f789667c793c42f8f32fd90c8736f56 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 16 Dec 2019 18:10:40 +0800 Subject: [PATCH 27/33] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Promote/mychlid.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Promote/mychlid.html b/Application/Home/View/default/Promote/mychlid.html index e7addedbb..51378a3aa 100644 --- a/Application/Home/View/default/Promote/mychlid.html +++ b/Application/Home/View/default/Promote/mychlid.html @@ -94,7 +94,7 @@ 取消渠道迁移 - + 玩家迁移 From 3ce289a194e9763eb200ba05d9f28028bd3f1770 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 16 Dec 2019 18:11:41 +0800 Subject: [PATCH 28/33] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Promote/children.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Promote/children.html b/Application/Home/View/default/Promote/children.html index 3637f855b..25894b64b 100644 --- a/Application/Home/View/default/Promote/children.html +++ b/Application/Home/View/default/Promote/children.html @@ -109,7 +109,7 @@ - + 玩家迁移 From fa5a47ea75089d56073579f73e95de81777d5397 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 16 Dec 2019 18:25:02 +0800 Subject: [PATCH 29/33] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/DownloadController.class.php | 5 ++++- .../Home/Controller/PlayersController.class.php | 16 ++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 468fbd5f1..7fb7f3c61 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1897,13 +1897,16 @@ class DownloadController extends BaseController { foreach($data as $key => $v) { $v['create_time'] = date('Y-m-d H:i:s',$v['create_time']); $promoteInfo = M('promote','tab_')->field("nickname")->where(['id' => intval($v['promote_id'])])->find(); + $serverId = $v['server_id']; + $gameId = $v['game_id']; + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find(); $v['promote_id']= $promoteInfo['nickname']; $csvData['extend'] = $this->encryption($v['extend']); $csvData['create_time'] = $v['create_time']; $csvData['user_account'] = $v['user_account']; $csvData['game_name'] = $v['game_name']; $csvData['promote_id'] = $v['promote_id']; - $csvData['server_name'] = $v['server_name']; + $csvData['server_name'] = $serverInfo['server_name']; $csvData['user_id'] = $v['game_player_id']; $csvData['game_player_name'] = $v['game_player_name']; $csvData['price'] = $v['price']; diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index 742c5b773..f067ef786 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -22,7 +22,7 @@ class PlayersController extends BaseController { $userId = trim(I('user_id', '')); $extend = trim(I('extend', '')); //cp订单号 $begTime = strtotime(I('begtime')); - $endTime = strtotime(I('endtime')) + 24*3600; + $endTime = strtotime(I('endtime')); $levelPromote = $this->getLevelPromote(); $queryPromote = $this->getQueryPromote($levelPromote); // $loginPromote = $this->getLoginPromote(); @@ -60,11 +60,11 @@ class PlayersController extends BaseController { $map['tab_pay_info.game_player_id'] = $userId; } if (!empty($begTime) && !empty($endTime)) { - $map['tab_pay_info.create_time'] = ['between', [$begTime, $endTime - 1]]; + $map['tab_pay_info.create_time'] = ['between', [$begTime, $endTime + 24*3600 - 1]]; }else if (empty($begTime) && !empty($endTime)) { - $map['tab_pay_info.create_time'] = ['elt',$endTime]; + $map['tab_pay_info.create_time'] = ['elt',$endTime + 24*3600]; }else if (!empty($begTime) && empty($endTime)) { - $map['tab_pay_info.create_time'] = ['EGT',$begTime]; + $map['tab_pay_info.create_time'] = ['EGT',$begTime + 24*3600]; } $page = intval(I('get.p', 1)); $page = $page ? $page : 1; //默认显示第一页数据arraypage @@ -73,8 +73,12 @@ class PlayersController extends BaseController { foreach($rs as $key => $v) { $rs[$key]['extend'] = encryption($v['extend']); $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); - $promoteInfo = M('promote','tab_')->field("nickname")->where(['id' => intval($v['promote_id'])])->find(); - $rs[$key]['promote_id']= $promoteInfo['nickname']; + $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find(); + $serverId = $v['server_id']; + $gameId = $v['game_id']; + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find(); + $rs[$key]['server_name'] = $serverInfo['server_name']; + $rs[$key]['promote_id']= $promoteInfo['account']; } $count = M('pay_info', 'tab_') ->field('tab_pay_info.id') From 0e0f603d13296f21fe5e13ccde47aad6700aef35 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Mon, 16 Dec 2019 18:38:26 +0800 Subject: [PATCH 30/33] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E9=A2=84=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/BehaviorLog/index.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html index 97b53ae2f..29461a493 100644 --- a/Application/Admin/View/BehaviorLog/index.html +++ b/Application/Admin/View/BehaviorLog/index.html @@ -217,7 +217,14 @@ layer.msg('时间间隔不能超过31天，请重新选择日期'); return false; } - + var game_name = $("#game_name").val(); + var sdk_version = $("#sdk_version").val(); + var server_name = $("#server_name").val(); + console.log(server_name) + if(game_name != '' && server_name == '') { + layer.msg('请选择区服'); + return false; + } var url = $(this).attr('url'); var query = $('.jssearch').find('input').serialize(); query += "&" + $('.jssearch').find('select').serialize(); From 24d47089dd78f6addd6f157b67847a612b462d5f Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Mon, 16 Dec 2019 19:20:31 +0800 Subject: [PATCH 31/33] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E9=A2=84=E5=85=85?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/AjaxController.class.php | 11 +++++++ Application/Admin/View/BehaviorLog/index.html | 33 ++++++++++++++++--- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php index 4604dce71..4dbe626e8 100644 --- a/Application/Admin/Controller/AjaxController.class.php +++ b/Application/Admin/Controller/AjaxController.class.php @@ -96,6 +96,17 @@ class AjaxController extends ThinkController{ $this->AjaxReturn($data); } + public function getGameVersion($game_name="") + { + if ($game_name) { + $map['relation_game_name'] = $game_name; + }else { + $this->AjaxReturn([]); + } + $data = M('Game','tab_')->field('sdk_version')->where($map)->select(); + $this->AjaxReturn($data); + } + /** * 获取游戏折扣 * @param $game_id diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html index 97b53ae2f..5ef1b52a3 100644 --- a/Application/Admin/View/BehaviorLog/index.html +++ b/Application/Admin/View/BehaviorLog/index.html @@ -68,8 +68,6 @@
@@ -217,7 +215,14 @@ layer.msg('时间间隔不能超过31天，请重新选择日期'); return false; } - + var game_name = $("#game_name").val(); + var sdk_version = $("#sdk_version").val(); + var server_name = $("#server_name").val(); + console.log(server_name) + if(game_name != '' && server_name == '') { + layer.msg('请选择区服'); + return false; + } var url = $(this).attr('url'); var query = $('.jssearch').find('input').serialize(); query += "&" + $('.jssearch').find('select').serialize(); @@ -430,7 +435,27 @@ }); $("#promote_level").change(); - var game_server = "{:I('server_name')}"; + + var game_server = "{:I('game_version')}"; + var sdk_version = "{:I('sdk_version')}"; + $("#game_name").change(function(){ + $.ajax({ + url:"{:U('Ajax/getGameVersion')}", + type:"post", + data:{game_name:$("#game_name option:selected").val()}, + dataType:'json', + success:function(data){ + str = ""; + for (var i in data){ + var version_name = data[i].sdk_version == "1" ? '安卓' : '苹果' + str += "" + } + $("#sdk_version").empty(); + $("#sdk_version").append(str); + $("#sdk_version").select2(); + } + }) + }); $("#sdk_version").change(function(){ $.ajax({ url:"{:U('Ajax/getGmeServer')}", From 8f75d0f450c9433d588e83c15c6009d711b14d2e Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Mon, 16 Dec 2019 19:28:36 +0800 Subject: [PATCH 32/33] =?UTF-8?q?=E6=B8=B8=E6=88=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 7 ++++++- Application/Admin/View/BehaviorLog/index.html | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index c76087014..190eb19c6 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -553,7 +553,12 @@ function getGameByName($game_name=null, $sdk_version=null) $map['sdk_version'] = $sdk_version; } $result = D("Game")->where($map)->select(); - return $result; + if(empty($result)) + { + return [['id' => -1]]; + }else{ + return $result; + } } function getTopPromote($promote_id) diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html index 29461a493..9178333a7 100644 --- a/Application/Admin/View/BehaviorLog/index.html +++ b/Application/Admin/View/BehaviorLog/index.html @@ -217,14 +217,6 @@ layer.msg('时间间隔不能超过31天，请重新选择日期'); return false; } - var game_name = $("#game_name").val(); - var sdk_version = $("#sdk_version").val(); - var server_name = $("#server_name").val(); - console.log(server_name) - if(game_name != '' && server_name == '') { - layer.msg('请选择区服'); - return false; - } var url = $(this).attr('url'); var query = $('.jssearch').find('input').serialize(); query += "&" + $('.jssearch').find('select').serialize(); From 6ddf42181c6a4d3035af7fea174c1cde102d07a4 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Mon, 16 Dec 2019 19:32:26 +0800 Subject: [PATCH 33/33] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index c76087014..1b51e7fd5 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -552,8 +552,13 @@ function getGameByName($game_name=null, $sdk_version=null) if ($sdk_version) { $map['sdk_version'] = $sdk_version; } - $result = D("Game")->where($map)->select(); - return $result; + $result = D("Game")->field('id')->where($map)->select(); + if(empty($result)) { + return [['id' => -1]]; + }else + { + return $result; + } } function getTopPromote($promote_id)