diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 42ad1b7fb..826499ff5 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -609,6 +609,12 @@ function encryptStr($str) { return substr_replace($str, $stars_str, 3, $length-6); } +/** + * 身份证加密 + * + * @param $str + * @return mixed + */ function encryptIdCard($str) { $length = strlen($str); $stars_str = ""; @@ -618,6 +624,21 @@ function encryptIdCard($str) { return substr_replace($str, $stars_str, $length-4, 4); } +/** + * 真实名字加密 + * + * @param $str + * @return mixed + */ +function encryptRealName($str) { + $length = strlen($str); + $stars_str = ""; + if($length>=4){ + $stars_str = "****"; + } + return substr_replace($str, "**", 3, $length); +} + //获取推广员资质审核状态 $type 1-获取数组 2-获取文本 function getPromoteVerStatus($status, $type = 1) { diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 70d672e6c..0bb097559 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -43,7 +43,7 @@ class BehaviorLogController extends ThinkController $map['create_time'] = array('BETWEEN', [$startTime, $endTime]); setPowerPromoteIds($map,'promote_id'); - + if (isset($params['promote_id'])) { $promoteId = $params['promote_id']; if ($promoteId == 0) { diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index b18773ce2..6e995b2c7 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -2703,7 +2703,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, diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 04f4aa7e3..dc4523968 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -349,6 +349,7 @@ class PromoteController extends ThinkController $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find()); $companys = M('promote_company', 'tab_')->where(['status' => 1])->select(); + $this->assign("is_admin",is_administrator()); $this->assign('companys', $companys); $this->display(); } diff --git a/Application/Admin/View/Promote/edit.html b/Application/Admin/View/Promote/edit.html index 3c78cf76d..0ec8cd257 100644 --- a/Application/Admin/View/Promote/edit.html +++ b/Application/Admin/View/Promote/edit.html @@ -84,13 +84,21 @@ 真实姓名： - + + + + + 手机号码： - + + + + + diff --git a/Application/Admin/View/Public/base.html b/Application/Admin/View/Public/base.html index 3e1e3ff9b..d46f412df 100644 --- a/Application/Admin/View/Public/base.html +++ b/Application/Admin/View/Public/base.html @@ -19,6 +19,11 @@ + diff --git a/Application/Admin/View/Query/settlement.html b/Application/Admin/View/Query/settlement.html index ef6c3a3af..12512b82d 100644 --- a/Application/Admin/View/Query/settlement.html +++ b/Application/Admin/View/Query/settlement.html @@ -336,7 +336,7 @@ {:get_promote_name($data['promote_id'])} - {:get_promote_name($data['promote_id'])|encryptStr} + {:encryptStr(get_promote_name($data['promote_id']))} {$data.starttime|date='Y-m-d',###}至{$data.endtime|date='Y-m-d',###} diff --git a/Application/Admin/View/Query/withdraw.html b/Application/Admin/View/Query/withdraw.html index 6e2a3d73f..4a3131a7e 100644 --- a/Application/Admin/View/Query/withdraw.html +++ b/Application/Admin/View/Query/withdraw.html @@ -139,7 +139,7 @@ {:get_promote_name($data['promote_id'])} - {:get_promote_name($data['promote_id'])|encryptStr} + {:encryptStr(get_promote_name($data['promote_id']))} {$data.create_time|date='Y-m-d H:i:s',###}--- diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 8bc96add4..608415871 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -865,12 +865,7 @@ class PromoteService { 'message' => '账号只能为数字，字母和下划线', ]; } - if ($mobile == '') { - return [ - 'status' => false, - 'message' => '请输入手机号', - ]; - } else { + if ($mobile != '') { if (!preg_match("/^1[3456789]{1}\d{9}$/", $mobile)) { return [ 'status' => false, @@ -878,12 +873,7 @@ class PromoteService { ]; } } - if ($idcard == '') { - return [ - 'status' => false, - 'message' => '请输入身份证号', - ]; - } else { + if ($idcard != '') { if (!IdCard::isIdcard($idcard)) { return [ 'status' => false, @@ -891,12 +881,7 @@ class PromoteService { ]; } } - if ($realName == '') { - return [ - 'status' => false, - 'message' => '请输入姓名', - ]; - } else { + if ($realName != '') { if (mb_strlen($realName) < 2 || mb_strlen($realName) > 4) { return [ 'status' => false, diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index 47a2e07f2..3cf12243a 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -74,26 +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) { - if(empty($v['extend'])) { - $v['extend'] = $v['order_id']; + 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(); + $rs[$key]['server_name'] = $serverInfo['server_name']; + }else { + $rs[$key]['server_name'] = ""; + $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']; + } - $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) diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 382a2ae9e..fc4d0eb42 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -45,47 +45,53 @@
+ + + -
style="height: 0" > -
+
+
- +
+ +
+
+ +
+
+
+ + +
- - -
- -
- - - - -
- -
- -
-