From 8ccb78e7af639fb5ae219c4343a094bfdc623397 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Thu, 19 Dec 2019 14:42:25 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E8=A1=8C=E4=B8=BA?= =?UTF-8?q?=E6=97=A5=E5=BF=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 18 +++++++++--- .../Controller/PlayersController.class.php | 29 +++++++++++++------ 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 1f632a097..276ed56b0 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1909,16 +1909,26 @@ 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("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(); + if($v['server_id'] != 0) { + $serverId1 = $v['server_id']; + $gameId = $v['game_id']; + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); + $servername = $serverInfo['server_name']; + }else { + $servername = ""; + $v['game_player_id'] = ""; + $v['game_player_name'] = ""; + } $v['promote_id']= $promoteInfo['account']; + if(empty($v['extend'])) { + $v['extend'] = $v['order_id']; + } $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'] = $serverInfo['server_name']; + $csvData['server_name'] = $servername; $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 53af22fda..b9ebfd106 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -74,15 +74,26 @@ class PlayersController extends BaseController { $rs = M('pay_info','tab_')->where($map)->order('tab_pay_info.create_time desc') ->page($page, $row)->select(); 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("account")->where(['id' => intval($v['promote_id'])])->find(); - $serverId1 = $v['server_id']; - $gameId = $v['game_id']; - $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); - $rs[$key]['server_name'] = $serverInfo['server_name']; - $rs[$key]['promote_id']= $promoteInfo['account']; - } + if(empty($v['extend'])) { + $v['extend'] = $v['order_id']; + } + $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("account")->where(['id' => intval($v['promote_id'])])->find(); + if($v['server_id'] != 0) { + $serverId1 = $v['server_id']; + $gameId = $v['game_id']; + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); + $rs[$key]['server_name'] = $serverInfo['server_name']; + }else { + $rs[$key]['server_name'] = ""; + $rs[$key]['game_player_id'] = ""; + $rs[$key]['game_player_name'] = ""; + } + + $rs[$key]['promote_id']= $promoteInfo['account']; + + } $count = M('pay_info', 'tab_') ->field('tab_pay_info.id') ->where($map) From eaa50663240725950151698a9492c13943ad455e Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 19 Dec 2019 15:01:10 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BehaviorLogController.class.php | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 3a754e5a0..071a1e19f 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -11,25 +11,25 @@ class BehaviorLogController extends ThinkController $map = []; if (isset($params['user_account'])) { - $map['tab_pay_info.user_account'] = $params['user_account']; + $map['user_account'] = $params['user_account']; } if (isset($params['extend'])) { - $map['tab_pay_info.extend'] = $params['extend']; + $map['_string'] = 'extend = "'.$params["extend"]. '" or order_id = "'.$params["extend"] . '"'; } if (isset($params['game_name'])) { $game_id = ['in', array_column(getGameByName($params['game_name'], $params['sdk_version']), 'id')]; - $map['tab_pay_info.game_id'] = $game_id; + $map['game_id'] = $game_id; } if (isset($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; + $map['server_id'] = $server_id; } if (isset($params['game_player_name'])) { - $map['tab_pay_info.game_player_name'] = $params['game_player_name']; + $map['game_player_name'] = $params['game_player_name']; } if (isset($params['game_player_id'])) { - $map['tab_pay_info.game_player_id'] = $params['game_player_id']; + $map['game_player_id'] = $params['game_player_id']; } @@ -40,7 +40,7 @@ class BehaviorLogController extends ThinkController $endDate = empty($params['timeend']) ? date('Y-m-d') : $params['timeend']; $startTime = strtotime($startDate); $endTime = strtotime($endDate) + 86399; - $map['tab_pay_info.create_time'] = array('BETWEEN', [$startTime, $endTime]); + $map['create_time'] = array('BETWEEN', [$startTime, $endTime]); if (isset($params['promote_id'])) { $promoteId = $params['promote_id']; if ($promoteId == 0) { @@ -52,13 +52,17 @@ class BehaviorLogController extends ThinkController $map['promote_id'] = ['in', $promoteIds]; } } - $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')->page($p, $row)->select(); + // $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('LEFT JOIN tab_server on tab_pay_info.server_id = tab_server.server_num AND tab_pay_info.game_id = tab_server.game_id AND tab_pay_info.server_id <> 0')->where($map)->order('tab_pay_info.id DESC')->page($p, $row)->select(); + $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']; } + if ($v['server_id'] > 0){ + $data[$k]['server_name'] = M('server', 'tab_')->where(['game_id' => $v['game_id'],'server_num' =>$v['server_id']])->getField('server_name'); + } } - $count = M('pay_info', 'tab_')->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)->count(); + $count = M('pay_info', 'tab_')->where($map)->count(); $page = set_pagination($count, $row); if ($page) { $this->assign('_page', $page); From f3a80b73b877620a699e4c861dd7f404ee43b146 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 19 Dec 2019 15:51:53 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/BehaviorLogController.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 071a1e19f..5720a6f55 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -58,8 +58,13 @@ class BehaviorLogController extends ThinkController if(empty($v['extend'])) { $data[$k]['extend'] = $v['order_id']; } - if ($v['server_id'] > 0){ + if ($v['server_id'] > 0 && !empty($v['extend'])){ $data[$k]['server_name'] = M('server', 'tab_')->where(['game_id' => $v['game_id'],'server_num' =>$v['server_id']])->getField('server_name'); + } else { + $data[$k]['server_name'] = ''; + $data[$k]['game_player_name'] = ''; + $data[$k]['game_player_id'] = ''; + } } $count = M('pay_info', 'tab_')->where($map)->count(); From 25ae12a72c4a368a6be410f6b5808800620e7eb2 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Thu, 19 Dec 2019 16:17:15 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E5=A2=9E=E5=8A=A0extend=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/DownloadController.class.php | 2 +- .../Home/Controller/PlayersController.class.php | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 276ed56b0..d1a6986e1 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1909,7 +1909,7 @@ 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("account")->where(['id' => intval($v['promote_id'])])->find(); - if($v['server_id'] != 0) { + if($v['server_id'] != 0 && !empty($v['extend'])) { $serverId1 = $v['server_id']; $gameId = $v['game_id']; $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index b9ebfd106..3cf12243a 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -74,13 +74,7 @@ class PlayersController extends BaseController { $rs = M('pay_info','tab_')->where($map)->order('tab_pay_info.create_time desc') ->page($page, $row)->select(); foreach($rs as $key => $v) { - if(empty($v['extend'])) { - $v['extend'] = $v['order_id']; - } - $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("account")->where(['id' => intval($v['promote_id'])])->find(); - if($v['server_id'] != 0) { + if($v['server_id'] != 0 && !empty($v['extend'])) { $serverId1 = $v['server_id']; $gameId = $v['game_id']; $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); @@ -90,6 +84,12 @@ class PlayersController extends BaseController { $rs[$key]['game_player_id'] = ""; $rs[$key]['game_player_name'] = ""; } + if(empty($v['extend'])) { + $v['extend'] = $v['order_id']; + } + $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("account")->where(['id' => intval($v['promote_id'])])->find(); $rs[$key]['promote_id']= $promoteInfo['account']; From d0eb964808188aadbb47f7033ffbfdda7310b30c Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 20 Dec 2019 15:53:05 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Home/css/index2.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 3a43af57a..a2d40a9c9 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -189,7 +189,7 @@ .slide-item >img{ width: 100%; height: 7.82rem; - pointer-events: none; + /*pointer-events: none;*/ } /*隐藏掉滚动条*/ .slide-box::-webkit-scrollbar { From 794480bebdb237a388ef42009e31e6e7caa4f47f Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 20 Dec 2019 15:55:15 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 382a2ae9e..057a1683a 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -133,11 +133,11 @@
    - -
  • - -
    • -     + + + + +
From c6588a4c35d79b2535bb289bb242464a00c8fb1e Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 20 Dec 2019 15:56:23 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Home/css/index2.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index a2d40a9c9..3a43af57a 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -189,7 +189,7 @@ .slide-item >img{ width: 100%; height: 7.82rem; - /*pointer-events: none;*/ + pointer-events: none; } /*隐藏掉滚动条*/ .slide-box::-webkit-scrollbar { From 50bea19cd28b4c15b7f49d8c35b95253416b56ee Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 20 Dec 2019 16:01:16 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Home/css/index2.css | 1 + 1 file changed, 1 insertion(+) diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 3a43af57a..8ea12b6f6 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -5,6 +5,7 @@ } .home-box{ padding: 0.5rem 0.37rem 0 0.31rem; + overflow-y: scroll; } .home-fiexd{ height: 4.22rem; From 1c047c80a6e6d44c760e4e6650b31049095cd311 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 20 Dec 2019 16:02:35 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 057a1683a..98630ceb2 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -130,16 +130,16 @@ -
-
    + + -
-
+ +
简介
From 656c1a9bbb7fbe3fe1d34d720dcdc75eb5122238 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 20 Dec 2019 16:09:09 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Home/css/index2.css | 1 + 1 file changed, 1 insertion(+) diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 8ea12b6f6..375c5e5ca 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -18,6 +18,7 @@ top: 0; left: 0; z-index: 999; + -webkit-overflow-scroll:touch } .home-video{ width: 100%; From 5bebb747f7dd7a9ed90fb7c1f0ccd04e9daf1473 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 20 Dec 2019 16:12:26 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage.html | 20 +++++++++---------- Public/Home/css/index2.css | 2 -- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 98630ceb2..382a2ae9e 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -130,16 +130,16 @@
- - - - - - - - - - +
+
    + + +
  • + +
    • +     +
+
简介
diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 375c5e5ca..3a43af57a 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -5,7 +5,6 @@ } .home-box{ padding: 0.5rem 0.37rem 0 0.31rem; - overflow-y: scroll; } .home-fiexd{ height: 4.22rem; @@ -18,7 +17,6 @@ top: 0; left: 0; z-index: 999; - -webkit-overflow-scroll:touch } .home-video{ width: 100%; From 3b23c0c5cf86e3377e92876c347ec0903feab3b6 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 20 Dec 2019 16:24:48 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E3=80=8B=E7=BB=9F=E8=AE=A1-=E3=80=8B=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=91=98=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=9C=89=E5=AE=98=E6=96=B9=E6=B8=A0?= =?UTF-8?q?=E9=81=93=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ExportController.class.php | 3 ++- Application/Admin/Controller/PlatformController.class.php | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 7d104feaa..fe36f71ab 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2561,7 +2561,8 @@ class ExportController extends Controller unset($map['tp1.chain']); $map['promote_id'] = 0; //如果有官方渠道权限 - if (in_array('0', explode(",", session('user_auth_promote_ids')))) { + $user_auth_promote_ids = session('user_auth_promote_ids'); + if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) { //官方渠道数据添加 $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(id) as count, diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 2bc2b1867..8c2cc9281 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -414,8 +414,10 @@ class PlatformController extends ThinkController unset($map['tp1.chain']); $map['promote_id'] = 0; $authorityData['count'] = 0; + //如果有官方渠道权限 - if (in_array('0', explode(",", session('user_auth_promote_ids')))) { + $user_auth_promote_ids = session('user_auth_promote_ids'); + if ($user_auth_promote_ids == 'all' || in_array('0', explode(",", $user_auth_promote_ids))) { //官方渠道数据添加 $authorityData = M('user', 'tab_')->field('date_format(FROM_UNIXTIME(register_time),"%Y-%m-%d") AS time, count(id) as count, From b608f8587ba884cfb213f369c154851eca364e8d Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 20 Dec 2019 16:30:11 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Home/landingPage.html | 8 ++++---- Public/Home/css/index2.css | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 382a2ae9e..6dfc51aba 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -77,7 +77,7 @@
-