From 2defa249e839e19c77a3653d1f655604f9115ba5 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 12 Feb 2020 17:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86>=E6=8E=A8=E5=B9=BF=E5=91=98?= =?UTF-8?q?=E6=8C=87=E6=A0=87--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 4 +-- .../Home/Controller/QueryController.class.php | 4 +-- .../Home/View/default/Query/promoteQuota.html | 36 +++++++++++++++---- .../Home/View/default/Query/quotaDtl.html | 2 +- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index fcb203a58..e08f08cdb 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -232,7 +232,7 @@ class PromoteController extends BaseController $this->assign("rules", $rules); $this->assign("rules_count", count($rules)); - /* $redis = new \Org\RedisSDK\Redis(['host'=>'127.0.0.1','port'=>6379],[]); + $redis = new \Org\RedisSDK\Redis(['host'=>'127.0.0.1','port'=>6379],[]); $cacheKey = "pop:rule:set"; if (!$redis->sIsMember($cacheKey, get_pid())) { $currentTime = strtotime(date('Y-m-d')); @@ -245,7 +245,7 @@ class PromoteController extends BaseController ->select(); } else { $match_rules = []; - } */ + } $this->assign("match_rules_id", $match_rules ? json_encode(array_column($match_rules, 'id')) : 'null'); diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 0a2c369dd..d39edcb99 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1957,7 +1957,7 @@ class QueryController extends BaseController $map['sdk_version'] = $sdkVersion; } $gameIds = M('game', 'tab_')->where($map)->getField('id', true); - $servers = M('server', 'tab_')->field(['id', 'server_id', 'server_name'])->where(['game_id' => ['in', $gameIds]])->order('server_id asc')->select(); + $servers = M('server', 'tab_')->field(['id', 'server_id', 'server_name'])->where(['game_id' => ['in', $gameIds]])->group('server_id')->order('server_id asc')->select(); } $this->ajaxReturn([ 'status' => 1, @@ -2223,7 +2223,7 @@ class QueryController extends BaseController $sdkVersion = I('sdk_version', 0); $relationGameId = I('relation_game_id', 0); $serverId = I('server_id', 0); - $parentId = I('parent_id', 0); + $parentId = I('get.parent_id', 0); $promoteId = I('promote_id', 0); $levelBegin = I('level_begin', ''); $levelEnd = I('level_end', ''); diff --git a/Application/Home/View/default/Query/promoteQuota.html b/Application/Home/View/default/Query/promoteQuota.html index f98ada7c1..f4472d115 100644 --- a/Application/Home/View/default/Query/promoteQuota.html +++ b/Application/Home/View/default/Query/promoteQuota.html @@ -26,10 +26,10 @@ {$meta_title}
-
-
- +
+
+
- +
0):?>
- 返回上级 + 返回上级
- +
@@ -102,7 +102,7 @@
{$record.role_num} - 查看下级 + 查看下级 查看详情 @@ -184,6 +184,28 @@ } }) } + + $('#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; + + }); + + $('.search-children, .search-parent').click(function (e) { + var parentId = $(this).attr('parent-id'); + $('#parent_id').val(parentId); + $('#submit').click(); + }); }) \ No newline at end of file diff --git a/Application/Home/View/default/Query/quotaDtl.html b/Application/Home/View/default/Query/quotaDtl.html index 3182ec4e7..2b59ff305 100644 --- a/Application/Home/View/default/Query/quotaDtl.html +++ b/Application/Home/View/default/Query/quotaDtl.html @@ -93,7 +93,7 @@ $(function() { setValue('row', '{:I("get.row",10)}'); $('.back-btn').on('click', function () { - location.href = "{:U('Query/promoteQuota', ['parent_id' => I('parent_id'), 'time' => $time])}"; + window.history.go(-1); }); })