diff --git a/Application/Admin/Controller/ApplyController.class.php b/Application/Admin/Controller/ApplyController.class.php index d95aa3643..717d5d89e 100644 --- a/Application/Admin/Controller/ApplyController.class.php +++ b/Application/Admin/Controller/ApplyController.class.php @@ -81,6 +81,8 @@ class ApplyController extends ThinkController } else { $map['app_version'] = 2; } + //为数据权限添加 + setPowerPromoteIds($map); $data = M('app_apply', 'tab_') -> where($map) -> order('apply_time desc') diff --git a/Application/Admin/Controller/PublicController.class.php b/Application/Admin/Controller/PublicController.class.php index 0b76890d8..7daf4f29a 100644 --- a/Application/Admin/Controller/PublicController.class.php +++ b/Application/Admin/Controller/PublicController.class.php @@ -177,6 +177,7 @@ class PublicController extends \Think\Controller session('user_auth_sign', null); session('user_auth_promote_ids', null); cookie('think_language', Null); + session('[destroy]'); // $this->success('退出成功!', U('login')); $this->ajaxReturn(array('status' => 1, 'msg' => '退出成功!')); } else { @@ -345,7 +346,7 @@ class PublicController extends \Think\Controller public function telsafecode($phone = '', $delay = 10, $flag = true) { $taskClient = new TaskClient(); - $result = $taskClient->sendSms($phone, get_client_ip()); + $result = $taskClient->sendSmsCode($phone, get_client_ip()); $data = []; if ($result['code'] == TaskClient::SUCCESS) { $data['status'] = 1; diff --git a/Application/Admin/Controller/SupportController.class.php b/Application/Admin/Controller/SupportController.class.php index dd07c96f3..73bcc9b55 100644 --- a/Application/Admin/Controller/SupportController.class.php +++ b/Application/Admin/Controller/SupportController.class.php @@ -27,6 +27,8 @@ class SupportController extends ThinkController { if(!empty(I('apply_status')) || I('apply_status')==='0'){ $map['apply_status']=I('apply_status'); } + //为数据权限添加 + setPowerPromoteIds($map); /* 获取频道列表 */ $list = M('test_resource','tab_') ->field('*') diff --git a/Application/Admin/Controller/TestResourceController.class.php b/Application/Admin/Controller/TestResourceController.class.php index 42ea32806..806f5d8e8 100644 --- a/Application/Admin/Controller/TestResourceController.class.php +++ b/Application/Admin/Controller/TestResourceController.class.php @@ -37,7 +37,8 @@ class TestResourceController extends ThinkController if(!empty(I('promote_name'))){ $map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%']; } - + //为数据权限添加 + setPowerPromoteIds($map, 'tab_test_resource.promote_id'); $data = M('test_resource','tab_') ->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,lock_status as check_status') ->join('left join tab_user as user on tab_test_resource.user_id = user.id') diff --git a/Application/Admin/View/Apply/and_lists.html b/Application/Admin/View/Apply/and_lists.html index 0f383af0d..b931fc872 100644 --- a/Application/Admin/View/Apply/and_lists.html +++ b/Application/Admin/View/Apply/and_lists.html @@ -144,11 +144,12 @@ - + + {:get_promote_account($data['promote_id'])} {:get_game_name($data['game_id'])} diff --git a/Application/Admin/View/Apply/app_lists.html b/Application/Admin/View/Apply/app_lists.html index 1218611a0..685943f36 100644 --- a/Application/Admin/View/Apply/app_lists.html +++ b/Application/Admin/View/Apply/app_lists.html @@ -119,11 +119,12 @@ - + + {:get_promote_account($data['promote_id'])} {$data.app_name}(安卓)(IOS) diff --git a/Application/Admin/View/Deposit/lists.html b/Application/Admin/View/Deposit/lists.html index 2f11a20f0..dc9b281a0 100644 --- a/Application/Admin/View/Deposit/lists.html +++ b/Application/Admin/View/Deposit/lists.html @@ -140,22 +140,23 @@ {:$data['pay_order_number']} - + + {$data.user_account} 官方渠道 - + + {$data.promote_account} {$data.pay_amount} diff --git a/Application/Admin/View/Member/edit.html b/Application/Admin/View/Member/edit.html index 01d3c5afe..8d51e0647 100644 --- a/Application/Admin/View/Member/edit.html +++ b/Application/Admin/View/Member/edit.html @@ -24,11 +24,13 @@ 玩家账号 - + + + 玩家登录账号,一经注册,全平台通用 diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html index 4c127dc38..682e815d6 100644 --- a/Application/Admin/View/Member/login_record.html +++ b/Application/Admin/View/Member/login_record.html @@ -144,11 +144,12 @@ - + + {$data.user_account} {$gamename}APP登录官网登录 diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index 130196ae5..e6d8076f7 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -245,19 +245,21 @@ {:get_registertype($data['register_type'])} - + + {$data.account} - + + {$data.account} @@ -265,11 +267,12 @@ 官方渠道 --- - + + {$data.promote_account} @@ -304,11 +307,12 @@ - + + {$data.device_number} diff --git a/Application/Admin/View/Mend/lists.html b/Application/Admin/View/Mend/lists.html index 1490abec9..c88c8263d 100644 --- a/Application/Admin/View/Mend/lists.html +++ b/Application/Admin/View/Mend/lists.html @@ -68,11 +68,12 @@ - + + {$data.account} {$data.register_time|date='Y-m-d H:i:s',###} {$data.login_time|date='Y-m-d H:i:s',###} @@ -81,18 +82,20 @@ {$data.login_time|date='Y-m-d H:i:s',###} - + + {$data['promote_account']|encryptStr}{:encryptStr(get_parent_promoteto($data['promote_id']))} - + + {:get_promote_name($data['promote_id'])} + diff --git a/Application/Admin/View/Promote/agent_list.html b/Application/Admin/View/Promote/agent_list.html index 8fd6d550e..2f491614f 100644 --- a/Application/Admin/View/Promote/agent_list.html +++ b/Application/Admin/View/Promote/agent_list.html @@ -111,11 +111,12 @@ {$data.promote_account} - + + {$data.user_account} {$data.game_name} {$data.amount} diff --git a/Application/Admin/View/Promote/belong.html b/Application/Admin/View/Promote/belong.html index 827046b5f..f76ae95e2 100644 --- a/Application/Admin/View/Promote/belong.html +++ b/Application/Admin/View/Promote/belong.html @@ -129,18 +129,20 @@ {$data.promote_id} - + + {$data.account} - + + {$data.mobile_phone} {:set_show_time($data['create_time'])} diff --git a/Application/Admin/View/Promote/ch_reg_list.html b/Application/Admin/View/Promote/ch_reg_list.html index cd71975eb..ce95c08ea 100644 --- a/Application/Admin/View/Promote/ch_reg_list.html +++ b/Application/Admin/View/Promote/ch_reg_list.html @@ -137,28 +137,31 @@ - + + {$data.account} ------{$data.fgame_name} - + + {:get_promote_name($data['promote_id'])} {$data.register_time|date='Y-m-d H:i:s',###} {$data.register_ip} - + + {:get_promote_parent_acc($data['promote_id'])} diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index 319ef2847..6300dc90f 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -7,6 +7,7 @@ +