From 41291daa3f47671f2164a56fb3b24f1ebb2d75f0 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 10 Oct 2019 09:07:30 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/GameDivideController.class.php | 15 +++++++-------- .../Home/View/default/GameDivide/index.html | 6 +++++- .../Home/View/default/Public/promote_base.html | 14 +++++++------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Application/Home/Controller/GameDivideController.class.php b/Application/Home/Controller/GameDivideController.class.php index d0ef8b617..6db691700 100644 --- a/Application/Home/Controller/GameDivideController.class.php +++ b/Application/Home/Controller/GameDivideController.class.php @@ -15,15 +15,15 @@ class GameDivideController extends BaseController //首页 public function index() { - $parentId = getParentPromoteId(PID); + $parentId = getParentPromoteId(PID);//上级ID if ($parentId > 0) { $this->error('权限异常'); } - $securityCode = empty(session('game_divide_second_pwd')) ? '' : session('game_divide_second_pwd'); + $securityCode = empty(session('game_divide_second_pwd')) ? '' : session('game_divide_second_pwd');//安全密码 $model = new PromoteApi(); - $res = $model->verify_er_User(PID, $securityCode); - if (!empty($securityCode) && $res) { + $res = $model->verify_er_User(PID, $securityCode);//验证安全密码 + if ($res) { $map['tab_game.online_status'] = 1;//开发者游戏上线状态 $map['tab_game.down_port'] = 1;//游戏端口 第三方接口不能申请 $map['tab_game.game_status'] = 1;//游戏状态 @@ -83,6 +83,7 @@ class GameDivideController extends BaseController $this->display(); } + //验证安全密码 public function verifyPassword() { $password = I('post.password'); @@ -94,13 +95,11 @@ class GameDivideController extends BaseController $data['status'] = 1; $data['msg'] = '验证成功'; - - $this->ajaxReturn($data); } else { $data['status'] = 0; $data['msg'] = '安全密码不正确'; - - $this->ajaxReturn($data); } + + $this->ajaxReturn($data); } } \ No newline at end of file diff --git a/Application/Home/View/default/GameDivide/index.html b/Application/Home/View/default/GameDivide/index.html index 48db62b84..39bd2c94d 100644 --- a/Application/Home/View/default/GameDivide/index.html +++ b/Application/Home/View/default/GameDivide/index.html @@ -245,7 +245,7 @@ -
+
@@ -310,6 +310,10 @@ } }); }); + + $('.btn-security-close').on('click', function () { + window.location.href = "{:U('Promote/index')}"; + }); }); diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html index d8533d1b9..73b31b407 100644 --- a/Application/Home/View/default/Public/promote_base.html +++ b/Application/Home/View/default/Public/promote_base.html @@ -47,12 +47,12 @@ 推广员管理
- - - - - - +
数据管理
+
+ 每日概况 + 数据汇总 + 充值明细 + 注册明细 @@ -66,7 +66,7 @@ - +
游戏管理
From 73a604c815dd42a6f665ab5f3b72288d07a95fcb Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 10 Oct 2019 09:16:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/ApplyController.class.php | 4 ++-- Application/Home/View/default/Apply/index.html | 2 +- Application/Home/View/default/Apply/my_game.html | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php index f4ce0b712..ac8cacea8 100644 --- a/Application/Home/Controller/ApplyController.class.php +++ b/Application/Home/Controller/ApplyController.class.php @@ -194,9 +194,8 @@ class ApplyController extends BaseController $this->assign('type', $type); $this->assign('myGame', ($serverType == 1) ? 'specialMyGameList' : 'myGameList'); $this->assign('game', ($serverType == 1) ? 'gameSpecialList' : 'gameList'); - + $this->assign('position', ($serverType == 1) ? '专服管理' : '混服管理'); $this->meta_title = "申请游戏"; - $this->display('index'); } @@ -595,6 +594,7 @@ class ApplyController extends BaseController $this->assign('serverType', $serverType); $this->assign('myGame', ($serverType == 1) ? 'specialMyGameList' : 'myGameList'); $this->assign('game', ($serverType == 1) ? 'gameSpecialList' : 'gameList'); + $this->assign('position', ($serverType == 1) ? '专服管理' : '混服管理'); $this->meta_title = "我的游戏"; $this->display('my_game'); } diff --git a/Application/Home/View/default/Apply/index.html b/Application/Home/View/default/Apply/index.html index c540ffa72..8746e93da 100644 --- a/Application/Home/View/default/Apply/index.html +++ b/Application/Home/View/default/Apply/index.html @@ -108,7 +108,7 @@
-
当前位置：游戏管理>游戏列表
+
当前位置：游戏管理>{$position}
游戏列表
diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index deddc2f27..71be12117 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -92,9 +92,9 @@
-
当前位置：游戏管理>我的游戏
+
当前位置：游戏管理>{$position}
- 游戏列表 + 我的游戏
From 2ca1009b326656975306166982ddbfffe7292238 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 10 Oct 2019 09:44:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=20=E6=B8=B8=E6=88=8F=E6=B7=BB=E5=8A=A0=E6=B7=B7?= =?UTF-8?q?=E6=9C=8D=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/add.html | 14 ++++++++++++++ Application/Admin/View/Game/edit.html | 15 +++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/Application/Admin/View/Game/add.html b/Application/Admin/View/Game/add.html index 27196ce88..7e8ad8c7a 100644 --- a/Application/Admin/View/Game/add.html +++ b/Application/Admin/View/Game/add.html @@ -75,6 +75,20 @@ 显示该游戏所适用的平台，一般为安卓平台和苹果平台 + + 混服设置 + + + + + + + + 开放类型 diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 52f1d8d1f..32d70678b 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -74,6 +74,21 @@ 显示该游戏所适用的平台，一般为安卓平台和苹果平台 + + 混服设置 + + + + + + + 开放类型 From 622264a82061ee07b32e147064c168721fa7063a Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 10 Oct 2019 10:25:05 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/QueryController.class.php | 13 +++++++++++-- .../Home/View/default/Public/promote_base.html | 2 +- Application/Home/View/default/Query/recharge.html | 10 +++++----- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 3382bdd5b..5b06ee2a3 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -99,7 +99,7 @@ class QueryController extends BaseController $map['tab_spend.is_check'] = ['neq', 2]; $data = M('Spend', 'tab_') - ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.grand_id as pro_grand_id') + ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.grand_id as pro_grand_id,tab_promote.parent_id as pro_parent_id') ->join('tab_game on tab_spend.game_id = tab_game.id') ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id') ->where($map) @@ -114,6 +114,14 @@ class QueryController extends BaseController if (!empty($data)) { foreach ($data as &$list) { + if ($list['pro_grand_id'] > 0) { + $thisPromoteData = D('Promote') + ->field('account,real_name') + ->where(array('id' => $list['pro_parent_id'])) + ->find(); + $list['p_pro_account'] = $thisPromoteData['account']; + $list['p_pro_real_name'] = $thisPromoteData['real_name']; + } $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8); } } @@ -148,7 +156,7 @@ class QueryController extends BaseController $this->assign('pID', PID); $this->assign('ownId', I('own_id')); $this->assign('payWayData', QueryController::$payWay); - $this->meta_title = "充值明细"; + $this->meta_title = "订单查询"; $this->display(); } @@ -1880,6 +1888,7 @@ class QueryController extends BaseController } $this->assign('list_data', $spendData); + $this->meta_title = "订单详情"; $this->display('view_spend_detailed'); } } diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html index 73b31b407..fb122b97d 100644 --- a/Application/Home/View/default/Public/promote_base.html +++ b/Application/Home/View/default/Public/promote_base.html @@ -51,7 +51,7 @@
每日概况 数据汇总 - 充值明细 + 订单查询 注册明细 diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index 71370e406..3a1a1d508 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -55,11 +55,11 @@
-
当前位置：数据管理>充值明细
+
当前位置：数据管理>订单查询
- 充值明细 - 对所有渠道用户玩家产生的充值信息，进行记录的功能 + 订单数据 + 对所有渠道用户玩家产生的订单信息，进行记录的功能
@@ -207,9 +207,9 @@ {$vo.pro_account}({$vo.pro_real_name}) - + {$vo.pro_account}({$vo.pro_real_name}) - + {$vo.p_pro_account}({$vo.p_pro_real_name}) {$vo.pro_account}({$vo.pro_real_name}) From e95b78aa0363dc83102b35084865bafe22c963e3 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 10 Oct 2019 10:26:01 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Query/view_spend_detailed.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/View/default/Query/view_spend_detailed.html b/Application/Home/View/default/Query/view_spend_detailed.html index b44dd28bc..4cb678fc7 100644 --- a/Application/Home/View/default/Query/view_spend_detailed.html +++ b/Application/Home/View/default/Query/view_spend_detailed.html @@ -33,7 +33,7 @@
-
当前位置：数据管理>充值明细>查看详细
+
当前位置：数据管理>订单查询>查看详细
订单详情
From 906f3fd87076d09ed3999092e4e198ac967e9349 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Thu, 10 Oct 2019 10:27:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Query/recharge.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index 3a1a1d508..d9911f061 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -175,8 +175,8 @@ 玩家账号 游戏订单 - 订单金额 支付方式 + 订单金额 游戏名称 区服 角色名 @@ -199,8 +199,8 @@ {$vo.user_account} {$vo.order_number} - {$vo.pay_amount} {:get_pay_way($vo['pay_way'])} + {$vo.pay_amount} {$vo.game_name} {$vo.server_name} {$vo.game_player_name}