From f91c0f0965fc6d7ab0f1151758a5718061f85ad8 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 16 Oct 2019 11:14:55 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E6=9D=A1=E6=95=B0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Apply/index.html | 27 +++++++++++--- .../Home/View/default/Apply/my_game.html | 27 +++++++++++--- .../Home/View/default/GameDivide/index.html | 27 ++++++++++---- .../View/default/PromoteCoin/coinRecord.html | 35 +++++++++++++++---- .../Home/View/default/PromoteCoin/myCoin.html | 29 +++++++++++---- .../Home/View/default/Query/recharge.html | 28 ++++++++++----- .../Home/View/default/Query/register.html | 25 +++++++++---- .../Home/View/default/Query/view_role.html | 28 +++++++++------ 8 files changed, 173 insertions(+), 53 deletions(-) diff --git a/Application/Home/View/default/Apply/index.html b/Application/Home/View/default/Apply/index.html index 8746e93da..6b99364ce 100644 --- a/Application/Home/View/default/Apply/index.html +++ b/Application/Home/View/default/Apply/index.html @@ -105,7 +105,7 @@ -
+
当前位置：游戏管理>{$position}
@@ -180,10 +180,11 @@
-
+ +
- +
-
+
@@ -869,5 +870,21 @@ $('#promote_id').on('change', function () { newPromoteId = $(this).val(); }); + + $('#submit').click(function () { + var url = $(this).attr('url'); + console.log(url); + var query = $('.jssearch').find('input').serialize(); + query += "&" + $('.jssearch').find('select').serialize(); + query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, ''); + query = query.replace(/^&/g, ''); + if (url.indexOf('?') > 0) { + url += '&' + query; + } else { + url += '?' + query; + } + window.location.href = url; + + }); diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 71be12117..599867866 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -89,7 +89,7 @@ -
+
当前位置：游戏管理>{$position}
@@ -156,10 +156,11 @@ -
+ +
- +
-
+
@@ -1031,5 +1032,21 @@ clipboard.on('error', function(e) { // console.log(e); }); + + $('#submit').click(function () { + var url = $(this).attr('url'); + console.log(url); + var query = $('.jssearch').find('input').serialize(); + query += "&" + $('.jssearch').find('select').serialize(); + query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, ''); + query = query.replace(/^&/g, ''); + if (url.indexOf('?') > 0) { + url += '&' + query; + } else { + url += '?' + query; + } + window.location.href = url; + + }); diff --git a/Application/Home/View/default/GameDivide/index.html b/Application/Home/View/default/GameDivide/index.html index 39bd2c94d..718080fed 100644 --- a/Application/Home/View/default/GameDivide/index.html +++ b/Application/Home/View/default/GameDivide/index.html @@ -135,7 +135,7 @@ -
+
当前位置：游戏管理>分成比例
@@ -150,8 +150,8 @@
-
+ +
-
- +
- +
@@ -314,6 +313,22 @@ $('.btn-security-close').on('click', function () { window.location.href = "{:U('Promote/index')}"; }); + + $('#submit').click(function () { + var url = $(this).attr('url'); + console.log(url); + var query = $('.jssearch').find('input').serialize(); + query += "&" + $('.jssearch').find('select').serialize(); + query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, ''); + query = query.replace(/^&/g, ''); + if (url.indexOf('?') > 0) { + url += '&' + query; + } else { + url += '?' + query; + } + window.location.href = url; + + }); }); diff --git a/Application/Home/View/default/PromoteCoin/coinRecord.html b/Application/Home/View/default/PromoteCoin/coinRecord.html index 9fe3e5f41..ecd5f6863 100644 --- a/Application/Home/View/default/PromoteCoin/coinRecord.html +++ b/Application/Home/View/default/PromoteCoin/coinRecord.html @@ -107,7 +107,7 @@ -
+
返回
@@ -119,10 +119,11 @@
-
+ +
- +
@@ -161,7 +162,7 @@
-
+
@@ -204,7 +205,7 @@
- 导出 + {$_page}
@@ -254,6 +255,28 @@ $('.back-btn').on('click', function () { history.back(-1); }); + + $('#submit').click(function () { + var sdate = $('#start_time').val(); + var edate = $('#end_time').val(); + if (Date.parse(sdate) > Date.parse(edate)) { + layer.msg('开始时间必须小于等于结束时间'); + return false; + } + var url = $(this).attr('url'); + console.log(url); + var query = $('.jssearch').find('input').serialize(); + query += "&" + $('.jssearch').find('select').serialize(); + query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, ''); + query = query.replace(/^&/g, ''); + if (url.indexOf('?') > 0) { + url += '&' + query; + } else { + url += '?' + query; + } + window.location.href = url; + + }); }); diff --git a/Application/Home/View/default/PromoteCoin/myCoin.html b/Application/Home/View/default/PromoteCoin/myCoin.html index 6064bab12..cdb210be1 100644 --- a/Application/Home/View/default/PromoteCoin/myCoin.html +++ b/Application/Home/View/default/PromoteCoin/myCoin.html @@ -103,7 +103,7 @@ -
+
当前位置：平台币管理>我的平台币
@@ -112,10 +112,11 @@
-
+ +
- +
@@ -151,7 +152,7 @@
-
+
@@ -191,7 +192,7 @@
- 导出 + {$_page}
@@ -206,6 +207,22 @@ $(document).ready(function () { $(".select_gallery").select2(); + + $('#submit').click(function () { + var url = $(this).attr('url'); + console.log(url); + var query = $('.jssearch').find('input').serialize(); + query += "&" + $('.jssearch').find('select').serialize(); + query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, ''); + query = query.replace(/^&/g, ''); + if (url.indexOf('?') > 0) { + url += '&' + query; + } else { + url += '?' + query; + } + window.location.href = url; + + }); }); diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index 5a3fa6638..ca694215b 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -52,7 +52,7 @@ right: 10px; } -
+
当前位置：数据管理>订单查询
@@ -63,8 +63,8 @@
-
I("get.row")])}" method="post" enctype="multipart/form-data" class="normal_form"> + +
+
@@ -164,7 +165,7 @@
-
+
@@ -342,16 +343,25 @@ $('#submit').click(function () { var sdate = $('#sdate').val(); var edate = $('#edate').val(); - // if(sdate =='' || edate==''){ - // layer.msg('请完整时间搜索框'); - // return false; - // } if (Date.parse(sdate) > Date.parse(edate)) { layer.msg('开始时间必须小于等于结束时间'); return false; } + var url = $(this).attr('url'); + console.log(url); + var query = $('.jssearch').find('input').serialize(); + query += "&" + $('.jssearch').find('select').serialize(); + query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, ''); + query = query.replace(/^&/g, ''); + if (url.indexOf('?') > 0) { + url += '&' + query; + } else { + url += '?' + query; + } + window.location.href = url; }); + $(".select_gallery").select2(); }); diff --git a/Application/Home/View/default/Query/register.html b/Application/Home/View/default/Query/register.html index 0a8b727c8..668855eff 100644 --- a/Application/Home/View/default/Query/register.html +++ b/Application/Home/View/default/Query/register.html @@ -24,7 +24,7 @@ -
+
当前位置：数据管理>注册明细
@@ -35,7 +35,7 @@
-
+
+
@@ -89,7 +90,7 @@
- +
@@ -204,14 +205,26 @@ }); $(".select_gallery").select2(); - $('.submit').click(function () { + $('#submit').click(function () { var sdate = $('#sdate').val(); var edate = $('#edate').val(); - if (Date.parse(sdate) > Date.parse(edate)) { layer.msg('开始时间必须小于等于结束时间'); return false; } + var url = $(this).attr('url'); + console.log(url); + var query = $('.jssearch').find('input').serialize(); + query += "&" + $('.jssearch').find('select').serialize(); + query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, ''); + query = query.replace(/^&/g, ''); + if (url.indexOf('?') > 0) { + url += '&' + query; + } else { + url += '?' + query; + } + window.location.href = url; + }); }); diff --git a/Application/Home/View/default/Query/view_role.html b/Application/Home/View/default/Query/view_role.html index 2f7ed5939..b696aec37 100644 --- a/Application/Home/View/default/Query/view_role.html +++ b/Application/Home/View/default/Query/view_role.html @@ -7,7 +7,7 @@ -
+
返回
@@ -20,7 +20,7 @@
-
+
+
-
+
@@ -203,18 +204,25 @@ }); $(".select_gallery").select2(); - $('.submit').click(function () { - + $('#submit').click(function () { var sdate = $('#sdate').val(); var edate = $('#edate').val(); - // if(sdate =='' || edate==''){ - // layer.msg('请完整时间搜索框'); - // return false; - // } if (Date.parse(sdate) > Date.parse(edate)) { layer.msg('开始时间必须小于等于结束时间'); return false; } + var url = $(this).attr('url'); + console.log(url); + var query = $('.jssearch').find('input').serialize(); + query += "&" + $('.jssearch').find('select').serialize(); + query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, ''); + query = query.replace(/^&/g, ''); + if (url.indexOf('?') > 0) { + url += '&' + query; + } else { + url += '?' + query; + } + window.location.href = url; }); }); From c8f7014fb2584a4268809ff16110930070eb25a0 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 16 Oct 2019 11:38:37 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E->=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E7=AE=A1=E7=90=86->=E5=88=86=E6=88=90=E6=AF=94=E4=BE=8B|?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/GameDivide/index.html | 4 +++- Application/Home/View/default/Public/promote_base.html | 7 ++++++- Application/Home/View/default/Query/view_role.html | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Application/Home/View/default/GameDivide/index.html b/Application/Home/View/default/GameDivide/index.html index 718080fed..03ff2e4ba 100644 --- a/Application/Home/View/default/GameDivide/index.html +++ b/Application/Home/View/default/GameDivide/index.html @@ -201,7 +201,9 @@
-
+
+
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html index fb5093735..9c9380ebf 100644 --- a/Application/Home/View/default/Public/promote_base.html +++ b/Application/Home/View/default/Public/promote_base.html @@ -71,7 +71,12 @@
游戏管理
- 专服管理 + 专服管理 + 混服管理 + + 分成比例 + 设置 + 资料专区
diff --git a/Application/Home/View/default/Query/view_role.html b/Application/Home/View/default/Query/view_role.html index b696aec37..17e93e732 100644 --- a/Application/Home/View/default/Query/view_role.html +++ b/Application/Home/View/default/Query/view_role.html @@ -96,7 +96,7 @@ {$vo.user_account} {$vo.game_name} - Phone + -- {:getSDKTypeName($vo['sdk_version'])} {$vo.play_time|date='Y-m-d H:i:s',###} {$vo.server_name} From a01c8f04b870a1380593d0047cb9c702c4610428 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 16 Oct 2019 11:51:58 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86->?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2->=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=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 733bca8e6..7faaa3bc0 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -146,6 +146,7 @@ class QueryController extends BaseController empty(I('own_id')) || $parameter['own_id'] = I('own_id'); empty(I('begtime')) || $parameter['begtime'] = I('begtime'); empty(I('endtime')) || $parameter['endtime'] = I('endtime'); + !isset($_REQUEST['pay_way']) || $parameter['pay_way'] = I('pay_way'); $serverData = $this->getServer(I('relation_game_id'), I('sdk_version')); From 307146cd3c80b2f45c1b7f4907ddd8d1b4fd1251 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 16 Oct 2019 15:29:27 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=A6=82=E5=86=B5?= =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB=E3=80=81=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E3=80=81=E6=B3=A8=E5=86=8C=E6=98=8E?= =?UTF-8?q?=E7=BB=86=20=E7=BB=84=E9=95=BF=E6=A3=80=E7=B4=A2bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Common/function.php | 12 +- .../Home/Controller/QueryController.class.php | 119 ++++++++++++------ .../Home/View/default/Query/dailySummary.html | 37 +++++- .../Home/View/default/Query/recharge.html | 37 +++++- .../Home/View/default/Query/register.html | 71 ++++++++--- .../Home/View/default/Query/summary.html | 37 +++++- 6 files changed, 248 insertions(+), 65 deletions(-) diff --git a/Application/Home/Common/function.php b/Application/Home/Common/function.php index 1bf7886f3..a6007b121 100644 --- a/Application/Home/Common/function.php +++ b/Application/Home/Common/function.php @@ -831,24 +831,24 @@ function isParentPromote($parentId, $promoteId) } //获取所有该类型的渠道 $promoteId-渠道ID $promoteType-1:本账号 2:组长 3:推广员 -function getAllPromoteListByType($promoteType = 1, $retOne = false) +function getAllPromoteListByType($promoteType = 1, $retOne = false, $promoteId = PID) { $childPromoteData = array(); switch ($promoteType) { case 1: - $map['id'] = PID; + $map['id'] = $promoteId; break; case 2: case 3: - $promoteData = D('Promote')->where(array('id' => PID))->find(); + $promoteData = D('Promote')->where(array('id' => $promoteId))->find(); if ($promoteData['grand_id'] > 0) { return []; } elseif ($promoteData['parent_id'] > 0) { $promoteType--; } - $childPromoteIds = getAllPromoteIdsByType((string)PID, $promoteType); + $childPromoteIds = getAllPromoteIdsByType((string)$promoteId, $promoteType); break; } @@ -901,10 +901,10 @@ function getAllPromoteIdsByType($promoteIds, $level = 3, $nowLevel = 1) } //获取所有子渠道列表 $type 1-返回数组 2-返回id数组 3-返回id字符串 -function getAllChildPromoteList($type = 1) +function getAllChildPromoteList($type = 1, $promoteId = PID) { $childPromoteData = array(); - $childPromoteIds = getAllChildPromoteIds((string)PID); + $childPromoteIds = getAllChildPromoteIds((string)$promoteId); if (!empty($childPromoteIds)) { $map['id'] = ['in', $childPromoteIds]; diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 7faaa3bc0..902e809bb 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -44,14 +44,21 @@ class QueryController extends BaseController $map['tab_spend.promote_id'] = ['in', $childPromoteIds]; } - $teamLeaderId = I('team_leader_id');//组长账号 + $teamLeaderId = intval(I('team_leader_id'));//组长账号 if (!empty($teamLeaderId)) { $hasTeamLeaderPermission = hasPromotePermission(PID, $teamLeaderId); if ($hasTeamLeaderPermission === false) { $this->error('组长权限异常'); } - $map['tab_spend.promote_id'] = $teamLeaderId; + $childPromoteIds = getAllChildPromoteList(3, $teamLeaderId); + if (empty($childPromoteIds)) { + $map['tab_spend.promote_id'] = $teamLeaderId; + } else { + $childPromoteIds = $teamLeaderId . ',' . $childPromoteIds; + + $map['tab_spend.promote_id'] = ['in', $childPromoteIds]; + } } $promoteId = I('promote_id');//推广员账号 @@ -164,6 +171,9 @@ class QueryController extends BaseController $this->assign('pID', PID); $this->assign('ownId', I('own_id')); $this->assign('payWayData', QueryController::$payWay); + if (!empty(I('team_leader_id'))) { + $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id')))); + } $this->meta_title = "订单查询"; $this->display(); } @@ -186,14 +196,21 @@ class QueryController extends BaseController $map['tab_user.promote_id'] = ['in', $childPromoteIds]; } - $teamLeaderId = I('team_leader_id');//组长账号 + $teamLeaderId = intval(I('team_leader_id'));//组长账号 if (!empty($teamLeaderId)) { $hasTeamLeaderPermission = hasPromotePermission(PID, $teamLeaderId); if ($hasTeamLeaderPermission === false) { $this->error('组长权限异常'); } - $map['tab_user.promote_id'] = $teamLeaderId; + $childPromoteIds = getAllChildPromoteList(3, $teamLeaderId); + if (empty($childPromoteIds)) { + $map['tab_user.promote_id'] = $teamLeaderId; + } else { + $childPromoteIds = $teamLeaderId . ',' . $childPromoteIds; + + $map['tab_user.promote_id'] = ['in', $childPromoteIds]; + } } $promoteId = I('promote_id');//推广员账号 @@ -277,6 +294,9 @@ class QueryController extends BaseController $this->assign('thisParentPromoteId', $thisParentPromoteId); $this->assign('pID', PID); $this->assign('ownId', I('own_id')); + if (!empty(I('team_leader_id'))) { + $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id')))); + } $this->meta_title = '注册明细'; $this->display(); } @@ -965,16 +985,25 @@ class QueryController extends BaseController $spendWhere['tab_spend.promote_id'] = ['in', $childPromoteIds]; } - $teamLeaderId = I('team_leader_id');//组长账号 + $teamLeaderId = intval(I('team_leader_id'));//组长账号 if (!empty($teamLeaderId)) { $hasTeamLeaderPermission = hasPromotePermission(PID, $teamLeaderId); if ($hasTeamLeaderPermission === false) { $this->error('组长权限异常'); } - $userPlayInfoWhere['tab_user_play_info.promote_id'] = $teamLeaderId; - $userGameLoginWhere['tab_user_game_login_record.promote_id'] = $teamLeaderId; - $spendWhere['tab_spend.promote_id'] = $teamLeaderId; + $childPromoteIds = getAllChildPromoteList(3, $teamLeaderId); + if (empty($childPromoteIds)) { + $userPlayInfoWhere['tab_user_play_info.promote_id'] = $teamLeaderId; + $userGameLoginWhere['tab_user_game_login_record.promote_id'] = $teamLeaderId; + $spendWhere['tab_spend.promote_id'] = $teamLeaderId; + } else { + $childPromoteIds = $teamLeaderId . ',' . $childPromoteIds; + + $userPlayInfoWhere['tab_user_play_info.promote_id'] = ['in', $childPromoteIds]; + $userGameLoginWhere['tab_user_game_login_record.promote_id'] = ['in', $childPromoteIds]; + $spendWhere['tab_spend.promote_id'] = ['in', $childPromoteIds]; + } } $promoteId = I('promote_id');//推广员账号 @@ -984,24 +1013,12 @@ class QueryController extends BaseController $this->error('推广员权限异常'); } - if (!empty($userPlayInfoWhere['tab_apply.promote_id'])) { - $userPlayInfoWhere['_string'] = 'tab_user_play_info.promote_id = ' . $promoteId; - $userGameLoginWhere['_string'] = 'tab_user_game_login_record.promote_id = ' . $promoteId; - $spendWhere['_string'] = 'tab_spend.promote_id = ' . $promoteId; - } else { - $userPlayInfoWhere['tab_user_play_info.promote_id'] = $promoteId; - $userGameLoginWhere['tab_user_game_login_record.promote_id'] = $promoteId; - $spendWhere['tab_spend.promote_id'] = $promoteId; - } + $userPlayInfoWhere['tab_user_play_info.promote_id'] = $promoteId; + $userGameLoginWhere['tab_user_game_login_record.promote_id'] = $promoteId; + $spendWhere['tab_spend.promote_id'] = $promoteId; } if (!empty(I('own_id'))) { - if (!empty($userPlayInfoWhere['_string'])) { - unset($userPlayInfoWhere['_string']); - unset($userGameLoginWhere['_string']); - unset($spendWhere['_string']); - } - $userPlayInfoWhere['tab_user_play_info.promote_id'] = I('own_id'); $userGameLoginWhere['tab_user_game_login_record.promote_id'] = I('own_id'); $spendWhere['tab_spend.promote_id'] = I('own_id'); @@ -1189,6 +1206,9 @@ class QueryController extends BaseController $this->assign('serverData', $serverData['data']); $this->assign('thisParentPromoteId', $thisParentPromoteId); $this->assign('pID', PID); + if (!empty(I('team_leader_id'))) { + $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id')))); + } $this->display(); } @@ -1223,10 +1243,20 @@ class QueryController extends BaseController $this->error('组长权限异常'); } - $map['tab_apply.promote_id'] = $teamLeaderId; - $userPlayInfoMap['tab_user_play_info.promote_id'] = $teamLeaderId; - $userGameLoginMap['tab_user_game_login_record.promote_id'] = $teamLeaderId; - $spendMap['tab_spend.promote_id'] = $teamLeaderId; + $childPromoteIds = getAllChildPromoteList(3, $teamLeaderId); + if (empty($childPromoteIds)) { + $map['tab_apply.promote_id'] = $teamLeaderId; + $userPlayInfoMap['tab_user_play_info.promote_id'] = $teamLeaderId; + $userGameLoginMap['tab_user_game_login_record.promote_id'] = $teamLeaderId; + $spendMap['tab_spend.promote_id'] = $teamLeaderId; + } else { + $childPromoteIds = $teamLeaderId . ',' . $childPromoteIds; + + $map['tab_apply.promote_id'] = ['in', $childPromoteIds]; + $userPlayInfoMap['tab_user_play_info.promote_id'] = ['in', $childPromoteIds]; + $userGameLoginMap['tab_user_game_login_record.promote_id'] = ['in', $childPromoteIds]; + $spendMap['tab_spend.promote_id'] = ['in', $childPromoteIds]; + } } $promoteId = intval(I('promote_id'));//推广员账号 @@ -1236,21 +1266,14 @@ class QueryController extends BaseController $this->error('推广员权限异常'); } - $map['_string'] = 'tab_apply.promote_id = ' . $promoteId; - $userPlayInfoMap['_string'] = 'tab_user_play_info.promote_id = ' . $promoteId; - $userGameLoginMap['_string'] = 'tab_user_game_login_record.promote_id = ' . $promoteId; - $spendMap['_string'] = 'tab_spend.promote_id = ' . $promoteId; + $map['tab_apply.promote_id'] = $promoteId; + $userPlayInfoMap['tab_user_play_info.promote_id'] = $promoteId; + $userGameLoginMap['tab_user_game_login_record.promote_id'] = $promoteId; + $spendMap['tab_spend.promote_id'] = $promoteId; } $ownId = intval(I('own_id'));//本账号 if (!empty($ownId)) { - if (!empty($map['_string'])) { - unset($map['_string']); - unset($userPlayInfoMap['_string']); - unset($userGameLoginMap['_string']); - unset($spendMap['_string']); - } - $map['tab_apply.promote_id'] = $ownId; $userPlayInfoMap['tab_user_play_info.promote_id'] = $ownId; $userGameLoginMap['tab_user_game_login_record.promote_id'] = $ownId; @@ -1443,6 +1466,9 @@ class QueryController extends BaseController $this->assign('serverData', $serverData['data']); $this->assign('thisParentPromoteId', $thisParentPromoteId); $this->assign('pID', PID); + if (!empty(I('team_leader_id'))) { + $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id')))); + } $this->display(); } @@ -2113,4 +2139,21 @@ class QueryController extends BaseController $this->assign('count', $count); $this->display(); } + + public function getChildPromoteList() + { + $promoteId = I('post.promote_id', 0); + if ($promoteId == 0) { + $data['status'] = 0; + $data['msg'] = '数据异常'; + + $this->ajaxReturn($data); + } + + $promoteList = getAllPromoteListByType(3, false, $promoteId); + $data['status'] = 1; + $data['data'] = $promoteList; + + $this->ajaxReturn($data); + } } diff --git a/Application/Home/View/default/Query/dailySummary.html b/Application/Home/View/default/Query/dailySummary.html index 035a716d2..54ff2d148 100644 --- a/Application/Home/View/default/Query/dailySummary.html +++ b/Application/Home/View/default/Query/dailySummary.html @@ -89,7 +89,12 @@
@@ -447,6 +452,36 @@ setValue('server_id', {$Think.request.server_id |default = '""'}); setValue('row', '{:I("get.row",10)}'); + $('#team_leader_id').change(function () { + var promoteId = parseInt($(this).val()); + var promoteValue = $(this).find("option:selected").text(); + + $.ajax({ + url: "{:U('getChildPromoteList')}", + type: "post", + data: {promote_id:promoteId}, + dataType: 'json', + success: function (data) { + var html = ""; + html += ""; + + if (data.status == 1) { + var promoteData = data.data; + + if (promoteData.length > 0) { + for (var i in promoteData) { + html += ""; + } + } + } + + $("#promote_id").empty(); + $('#promote_id').html(html); + $("#promote_id").select2(); + } + }); + }); + $('#own').on('click', function () { var ownId = $('#own_id').val(); var checkBox = $(this).children('i'); diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index ca694215b..df8f19978 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -117,7 +117,12 @@
@@ -273,6 +278,36 @@ endDate: date }); + $('#team_leader_id').change(function () { + var promoteId = parseInt($(this).val()); + var promoteValue = $(this).find("option:selected").text(); + + $.ajax({ + url: "{:U('getChildPromoteList')}", + type: "post", + data: {promote_id:promoteId}, + dataType: 'json', + success: function (data) { + var html = ""; + html += ""; + + if (data.status == 1) { + var promoteData = data.data; + + if (promoteData.length > 0) { + for (var i in promoteData) { + html += ""; + } + } + } + + $("#promote_id").empty(); + $('#promote_id').html(html); + $("#promote_id").select2(); + } + }); + }); + $('#own').on('click',function () { var ownId = $('#own_id').val(); var checkBox = $(this).children('i'); diff --git a/Application/Home/View/default/Query/register.html b/Application/Home/View/default/Query/register.html index 668855eff..41e8643b2 100644 --- a/Application/Home/View/default/Query/register.html +++ b/Application/Home/View/default/Query/register.html @@ -36,27 +36,32 @@
- -
- -
- + +
+ +
+ - -
- + + + - -
- + + + + + +
+
" + promoteValue + ""; + + if (data.status == 1) { + var promoteData = data.data; + + if (promoteData.length > 0) { + for (var i in promoteData) { + html += ""; + } + } + } + + $("#promote_id").empty(); + $('#promote_id').html(html); + $("#promote_id").select2(); + } + }); + }); + $('#own').on('click',function () { var ownId = $('#own_id').val(); var checkBox = $(this).children('i'); diff --git a/Application/Home/View/default/Query/summary.html b/Application/Home/View/default/Query/summary.html index 15c191cf8..2ee6d53d6 100644 --- a/Application/Home/View/default/Query/summary.html +++ b/Application/Home/View/default/Query/summary.html @@ -79,7 +79,12 @@
@@ -234,6 +239,36 @@ setValue('server_id', {$Think.request.server_id |default = '""'}); setValue('row', '{:I("get.row",10)}'); + $('#team_leader_id').change(function () { + var promoteId = parseInt($(this).val()); + var promoteValue = $(this).find("option:selected").text(); + + $.ajax({ + url: "{:U('getChildPromoteList')}", + type: "post", + data: {promote_id:promoteId}, + dataType: 'json', + success: function (data) { + var html = ""; + html += ""; + + if (data.status == 1) { + var promoteData = data.data; + + if (promoteData.length > 0) { + for (var i in promoteData) { + html += ""; + } + } + } + + $("#promote_id").empty(); + $('#promote_id').html(html); + $("#promote_id").select2(); + } + }); + }); + $('#own').on('click',function () { var ownId = $('#own_id').val(); var checkBox = $(this).children('i'); From 6947802527564503461449f76fc4405282644c90 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 16 Oct 2019 15:41:33 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2->?= =?UTF-8?q?=E7=BB=84=E9=95=BF=E3=80=81=E6=8E=A8=E5=B9=BF=E5=91=98=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E6=A1=86=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Query/recharge.html | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index df8f19978..a058c0b95 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -65,6 +65,33 @@
+ +
+ +
+ + + +
+ +
+ +
- - - - - -
- - - -
- -
- -
From 94e7594f40d512d40e556711bb892c08772700d0 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Wed, 16 Oct 2019 17:03:04 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=88=A0=E9=99=A4id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Apply/feature.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Apply/feature.html b/Application/Home/View/default/Apply/feature.html index a5815a975..86e5dd89c 100644 --- a/Application/Home/View/default/Apply/feature.html +++ b/Application/Home/View/default/Apply/feature.html @@ -215,7 +215,7 @@
- 查看详情{$vo.id} + 查看详情
From 57c9c7419af7babd84a90474d68002aa3aae97b4 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 16 Oct 2019 18:10:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E3=80=81=E6=B3=A8=E5=86=8C=E6=98=8E=E7=BB=86->=E7=BB=84?= =?UTF-8?q?=E9=95=BF=E4=B8=8E=E6=8E=A8=E5=B9=BF=E5=91=98=E7=BB=84=E5=90=88?= =?UTF-8?q?=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 | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 902e809bb..cc38aeb0c 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -68,18 +68,10 @@ class QueryController extends BaseController $this->error('推广员权限异常'); } - if (!empty($map['tab_spend.promote_id'])) { - $map['_string'] = 'tab_spend.promote_id = ' . $promoteId; - } else { - $map['tab_spend.promote_id'] = $promoteId; - } + $map['tab_spend.promote_id'] = $promoteId; } if (!empty(I('own_id'))) { - if (!empty($map['_string'])) { - unset($map['_string']); - } - $map['tab_spend.promote_id'] = I('own_id');//本账号 } @@ -220,18 +212,10 @@ class QueryController extends BaseController $this->error('推广员权限异常'); } - if (!empty($map['tab_user.promote_id'])) { - $map['_string'] = 'tab_user.promote_id = ' . $promoteId; - } else { - $map['tab_user.promote_id'] = $promoteId; - } + $map['tab_user.promote_id'] = $promoteId; } if (!empty(I('own_id'))) { - if (!empty($map['_string'])) { - unset($map['_string']); - } - $map['tab_user.promote_id'] = I('own_id');//本账号 }