From 3a7c4c9bad1e19e9712d370d59f0fa9969257dbe Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Thu, 26 Dec 2019 10:09:09 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1--=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/SuperStatisticalController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Admin/Controller/SuperStatisticalController.class.php b/Application/Admin/Controller/SuperStatisticalController.class.php index cd7366a57..7e1484ed8 100644 --- a/Application/Admin/Controller/SuperStatisticalController.class.php +++ b/Application/Admin/Controller/SuperStatisticalController.class.php @@ -151,6 +151,8 @@ class SuperStatisticalController extends ThinkController $data = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time,tab_game_supersign.pay_price')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->page($page,$row)->order('id DESC')->select(); $count = M('game_supersign', 'tab_')->field('tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->count(); + $pay_price = M('game_supersign', 'tab_')->field('sum(pay_price) as pay_price')->where($map)->select(); + $super_money_all = $pay_price[0]['pay_price'] == '' ? 0 : $pay_price[0]['pay_price']; $page = set_pagination($count, $row); $this->assign('_page', $page); $this->assign('data', $data); From f8092fa9e5fa920352bb759572ee412e8240b2d8 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 11:31:43 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AE=A2=E5=8D=95bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PayChannelController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index c0a53ccf6..dfcd2939e 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -463,6 +463,7 @@ class PayChannelController extends ThinkController // var_dump($spendData);die(); $coinMap['pay_status'] = 1; $coinMap['pay_source'] = 2; + $coinMap['extend'] = ''; $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account, From 79f74dfbd44631d8379726dffeda5f7c70bc09f0 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 13:45:43 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BAbug?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PayChannelController.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index dfcd2939e..5396be178 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -638,6 +638,9 @@ class PayChannelController extends ThinkController ->select(false); // var_dump($spendData);die(); $coinMap['pay_status'] = 1; + $coinMap['pay_source'] = 2; + $coinMap['extend'] = ''; + $coinData = M('pay_info','tab_') ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number") ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account, From e8313dd92ba580acdd5992d1a01ea3614a148430 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 13:49:29 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=8E=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Finance/payTypeStatistics.html | 4 ++-- Application/Admin/View/PayChannel/gameDetail.html | 4 ++-- Application/Admin/View/PayChannel/index.html | 4 ++-- Application/Admin/View/PayChannel/testDetail.html | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Application/Admin/View/Finance/payTypeStatistics.html b/Application/Admin/View/Finance/payTypeStatistics.html index 3c1f1eaf0..2a15991a3 100644 --- a/Application/Admin/View/Finance/payTypeStatistics.html +++ b/Application/Admin/View/Finance/payTypeStatistics.html @@ -86,11 +86,11 @@
+ placeholder="开始时间" autocomplete="off"/> -
+ placeholder="结束时间" autocomplete="off"/>
diff --git a/Application/Admin/View/PayChannel/gameDetail.html b/Application/Admin/View/PayChannel/gameDetail.html index 8b049486f..1f7a8750f 100644 --- a/Application/Admin/View/PayChannel/gameDetail.html +++ b/Application/Admin/View/PayChannel/gameDetail.html @@ -62,11 +62,11 @@
+ placeholder="开始时间" autocomplete="off"/> -
+ placeholder="结束时间" autocomplete="off"/>
diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index c87a2767e..3fde629f7 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -107,10 +107,10 @@
- + -
- +
diff --git a/Application/Admin/View/PayChannel/testDetail.html b/Application/Admin/View/PayChannel/testDetail.html index 543864127..57ea61fc1 100644 --- a/Application/Admin/View/PayChannel/testDetail.html +++ b/Application/Admin/View/PayChannel/testDetail.html @@ -67,11 +67,11 @@
+ placeholder="开始时间" autocomplete="off"/> -
+ placeholder="结束时间" autocomplete="off"/>
From c1e16ed8d49d7d554c371e3caa14fa2cb36f3c53 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Dec 2019 14:15:08 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=85=85?= =?UTF-8?q?=E5=80=BC=E7=BB=9F=E8=AE=A1=E6=B1=87=E6=80=BB=E4=B8=BA=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=80=BB=E9=A2=9D=EF=BC=8C?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E7=9A=84?= =?UTF-8?q?=E6=80=BB=E5=92=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PlatformController.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/PlatformController.class.php b/Application/Admin/Controller/PlatformController.class.php index 0ccf54ea5..64efba111 100644 --- a/Application/Admin/Controller/PlatformController.class.php +++ b/Application/Admin/Controller/PlatformController.class.php @@ -513,7 +513,7 @@ class PlatformController extends ThinkController setPowerPromoteIds($map); $promote_map2 = array(); setPowerPromoteIds($promote_map2, 'id'); - $promote = M("promote","tab_")->field("id,account")->page($page,$row)->where($promote_map)->where($promote_map2)->select(); + $promote = M("promote","tab_")->field("id,account")->where($promote_map)->where($promote_map2)->select(); $pcount = M("promote","tab_")->field("count(*) acount")->where($promote_map)->where($promote_map2)->find()['acount']; // var_dump( $promote); @@ -584,10 +584,11 @@ class PlatformController extends ThinkController $this->assign('userarpu_order_type', $data_order_type); } - $page = set_pagination($pcount, $row); + $page = set_pagination($count, $row); if ($page) { $this->assign('_page', $page); } + $data = array_slice($data, ($arraypage - 1) * $row, $row); $data = my_sort($data, $data_order_type, (int)$data_order); From fe06fded2abb418040e5b66b3168f64626e04e6f Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 26 Dec 2019 15:05:38 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=BA=E6=9C=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E9=9A=90=E8=97=8F=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9Eid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ServerController.class.php | 23 +++++++--- Application/Admin/View/Server/lists.html | 44 ++++++++++--------- 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/Application/Admin/Controller/ServerController.class.php b/Application/Admin/Controller/ServerController.class.php index bfdd48ea1..0af4e3057 100644 --- a/Application/Admin/Controller/ServerController.class.php +++ b/Application/Admin/Controller/ServerController.class.php @@ -10,7 +10,12 @@ use Admin\Event\BatchImportExcelEvent; class ServerController extends ThinkController { const model_name = 'Server'; - public function lists(){ + public function lists($p=0){ + $page = intval($p); + $page = $page ? $page : 1; //默认显示第一页数据 + $arraypage = $page; //默认显示第一页数据 + if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;} + if(isset($_REQUEST['show_status'])){ $extend['show_status']=$_REQUEST['show_status']; unset($_REQUEST['show_status']); @@ -50,11 +55,19 @@ class ServerController extends ThinkController { $this->assign('show_status',1); } - $this->m_title = '区服列表'; - $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Server/lists','status'=>1])->find()); - + $this->m_title = '区服列表'; + $this->assign('commonset',M('Kuaijieicon')->where(['url'=>'Server/lists','status'=>1])->find()); - parent::order_lists(self::model_name,$_GET["p"],$extend); + $data = M("Server","tab_")->field("id,game_name,server_name,server_id,show_status,start_time,server_version,developers")->where($extend)->page($page,$row)->select(); + foreach($data as $k=>&$v){ + $v["start_time"] = set_show_time($v["start_time"]); + $v["server_version"] = get_systems_name($v["server_version"]); + } + $count = M("Server","tab_")->where($extend)->count("id"); + $this->assign('list_data', $data); + $page = set_pagination($count,$row); + if($page) {$this->assign('_page', $page);} + $this->display(); } public function add(){ diff --git a/Application/Admin/View/Server/lists.html b/Application/Admin/View/Server/lists.html index a7ae99cff..8eaf145c6 100644 --- a/Application/Admin/View/Server/lists.html +++ b/Application/Admin/View/Server/lists.html @@ -45,14 +45,14 @@
- -
+ +
@@ -126,10 +126,11 @@ 游戏名称 区服名称 + 区服ID 运营平台 显示状态 开服时间 - 操作 + @@ -143,27 +144,28 @@ {$data.game_name} {$data.server_name} - {:get_systems_name($data['server_version'])} + {$data.server_id} + {$data['server_version']}
- - - - 已开启 - - - - 已关闭 - - - -
+ + + + 已开启 + + + + 已关闭 + + + +
- {:set_show_time($data['start_time'])} - + {$data['start_time']} + @@ -258,7 +260,7 @@ $(".select_gallery").select2();