| 开放类型 |
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/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/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/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}
- 游戏列表
+ 我的游戏
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..fb122b97d 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 @@
-
+ 游戏管理
diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html
index 71370e406..d9911f061 100644
--- a/Application/Home/View/default/Query/recharge.html
+++ b/Application/Home/View/default/Query/recharge.html
@@ -55,11 +55,11 @@
- 当前位置：数据管理>充值明细
+ 当前位置：数据管理>订单查询
- 充值明细
- 对所有渠道用户玩家产生的充值信息，进行记录的功能
+ 订单数据
+ 对所有渠道用户玩家产生的订单信息，进行记录的功能
@@ -175,8 +175,8 @@
| 玩家账号 |
游戏订单 |
- 订单金额 |
支付方式 |
+ 订单金额 |
游戏名称 |
区服 |
角色名 |
@@ -199,17 +199,17 @@
| {$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} |
{$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}) |
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 @@
- 当前位置：数据管理>充值明细>查看详细
+ 当前位置：数据管理>订单查询>查看详细
|