diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 6136fe8dd..840ee9872 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -29,8 +29,15 @@ class QueryController extends BaseController public function recharge($p = 0) { - $page = intval($p); - $page = $page ? $page : 1; //默认显示第一页数据arraypage + $page = intval(I('p', 1)); + $row = intval(I('row', 10)); + $ownId = intval(I('own_id'), 0);//本账号 + $relationGameId = intval(I('relation_game_id', 0)); + $sdkVersion = intval(I('sdk_version', 0)); + $serverId = trim(I('server_id', '')); + $gamePlayerName = trim(I('game_player_name', '')); + $userAccount = trim(I('user_account', '')); + $orderNumber = trim(I('order_number', '')); $nowTime = date('Y-m-d'); $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime'); @@ -39,52 +46,38 @@ class QueryController extends BaseController $begTime = strtotime($initBegTime); $endTime = strtotime($initEndTime); $endTime += 3600 * 24; + $levelPromote = $this->getLevelPromote(); + $queryPromote = $this->getQueryPromote($levelPromote); + $loginPromote = $this->getLoginPromote(); - if (isset($_REQUEST['row'])) { - $row = $_REQUEST['row']; + $map = []; + if ($ownId) { + $map['tab_spend.promote_id'] = $queryPromote['id']; } else { - $row = 10; - } + $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%']; + $ids = M('promote', 'tab_')->where($map)->getField('id', true); + $ids[] = $queryPromote['id']; - $map1['chain'] = ['like', '%' . PID . '/' . '%']; - $rs = M('promote', 'tab_')->where($map1)->field('id,account,nickname')->select(); - $childPromoteIds = ''; - if (empty($rs)) { - $map['tab_spend.promote_id'] = PID; - } else { - foreach ($rs as $rsKey => $rsValue) { - $id = $rsValue['id']; - $childPromoteIds .= $id . ','; - } - $childPromoteIds = rtrim($childPromoteIds, ','); - $childPromoteIds .= ',' . PID; - $map['tab_spend.promote_id'] = ['in', $childPromoteIds]; + $map = []; + $map['tab_spend.promote_id'] = ['in', $ids]; } - - $levelPromote = $this->getLevelPromote(); - $queryPromote = $this->getQueryPromote($levelPromote); - $map2[] = [ - '_logic' => 'or', - 'id' => $queryPromote['id'], - 'chain' => ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%'] - ]; - $ids = M('promote', 'tab_')->where($map2)->getField('id', true); - if (empty($ids)) { - $ids = array(); + if (!empty($relationGameId)) { + $map['tab_game.relation_game_id'] = $relationGameId; } - if (empty($levelPromote)) { - array_push($ids, PID); - + if (!empty($sdkVersion)) { + $map['tab_game.sdk_version'] = $sdkVersion; } - array_push($ids, $queryPromote['id']); - if (!empty($ids)) { - $map['tab_spend.promote_id'] = ['in', $ids]; - - } else { - $map['_string'] = '1<>1'; + if (!empty($serverId)) { + $map['tab_spend.server_id'] = $serverId; + } + if (!empty($gamePlayerName)) { + $map['tab_spend.game_player_name'] = $gamePlayerName; + } + if (!empty($userAccount)) { + $map['tab_spend.user_account'] = $userAccount; } - if (!empty(I('own_id'))) { - $map['tab_spend.promote_id'] = $queryPromote['id'];//本账号 + if (!empty($orderNumber)) { + $map['tab_spend.order_number'] = $orderNumber; } if (isset($_REQUEST['pay_way']) && $_REQUEST['pay_way'] !== '') { $payWay = intval(I('pay_way')); @@ -97,13 +90,6 @@ class QueryController extends BaseController } } } - - empty(I('relation_game_id')) || $map['tab_game.relation_game_id'] = I('relation_game_id'); - empty(I('sdk_version')) || $map['tab_game.sdk_version'] = I('sdk_version'); - empty(I('server_id')) || $map['tab_spend.server_id'] = I('server_id'); - empty(I('game_player_name')) || $map['tab_spend.game_player_name'] = ['like', '%' . I('game_player_name') . '%']; - empty(I('user_account')) || $map['tab_spend.user_account'] = I('user_account'); - empty(I('order_number')) || $map['tab_spend.order_number'] = I('order_number'); $map['tab_spend.pay_time'] = ['between', [$begTime, $endTime - 1]]; $map['tab_spend.pay_status'] = 1; $map['tab_spend.is_check'] = ['neq', 2]; @@ -173,52 +159,46 @@ class QueryController extends BaseController } //分页 - $parameter['p'] = I('get.p', 1); - $parameter['row'] = I('get.row'); + $parameter['p'] = $page; + $parameter['row'] = $row; $parameter['begtime'] = $initBegTime; $parameter['endtime'] = $initEndTime; - empty(I('relation_game_id')) || $parameter['relation_game_id'] = I('relation_game_id'); - empty(I('sdk_version')) || $parameter['sdk_version'] = I('sdk_version'); - empty(I('server_id')) || $parameter['server_id'] = I('server_id'); - empty(I('game_player_name')) || $parameter['game_player_name'] = I('game_player_name'); - empty(I('user_account')) || $parameter['user_account'] = I('user_account'); - empty(I('team_leader_id')) || $parameter['team_leader_id'] = I('team_leader_id'); - empty(I('promote_id')) || $parameter['promote_id'] = I('promote_id'); - empty(I('own_id')) || $parameter['own_id'] = I('own_id'); - empty(I('level_promote_2')) || $parameter['level_promote_2'] = I('level_promote_2'); - empty(I('level_promote_3')) || $parameter['level_promote_3'] = I('level_promote_3'); - empty(I('level_promote_4')) || $parameter['level_promote_4'] = I('level_promote_4'); + $parameter['relation_game_id'] = $relationGameId; + $parameter['sdk_version'] = $sdkVersion; + $parameter['server_id'] = $serverId; + $parameter['game_player_name'] = $gamePlayerName; + $parameter['user_account'] = $userAccount; + $parameter['order_number'] = $orderNumber; + $parameter['own_id'] = $ownId; + $parameter['level_promote_2'] = intval(I('level_promote_2', 0)); + $parameter['level_promote_3'] = intval(I('level_promote_3', 0)); + $parameter['level_promote_4'] = intval(I('level_promote_4', 0)); !isset($_REQUEST['pay_way']) || $parameter['pay_way'] = I('pay_way'); $serverData = $this->getServer(I('relation_game_id'), I('sdk_version')); - - $thisParentPromoteId = getParentPromoteId(PID);//本账号上级渠道ID $page = set_pagination($count, $row, $parameter); if ($page) { $this->assign('_page', $page); } - $this->assign('listData', $data); $this->assign('count', $count); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('setdate', date("Y-m-d")); $this->assign('serverData', $serverData['data']); - $this->assign('thisParentPromoteId', $thisParentPromoteId); - $this->assign('pID', PID); - $this->assign('ownId', I('own_id')); + $this->assign('ownId', $ownId); $this->assign('payWayData', QueryController::$payWay); - if (!empty(I('team_leader_id'))) { - $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id')))); - } $this->meta_title = "订单查询"; $this->display(); } public function register($p = 0) { - $page = intval($p); - $page = $page ? $page : 1; //默认显示第一页数据arraypage + $page = intval(I('p', 1)); + $row = intval(I('row', 10)); + $ownId = intval(I('own_id'), 0);//本账号 + $account = trim(I('account', '')); + $id = intval(I('id', 0)); $nowTime = date('Y-m-d'); $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); $initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime'); @@ -227,59 +207,28 @@ class QueryController extends BaseController $begTime = strtotime($initBegTime); $endTime = strtotime($initEndTime); $endTime += 3600 * 24; - - if (isset($_REQUEST['row'])) { - $row = $_REQUEST['row']; - } else { - $row = 10; - } - - $map1['chain'] = ['like', '%' . PID . '/' . '%']; - $rs = M('promote', 'tab_')->where($map1)->field('id,account,nickname')->select(); - $childPromoteIds = ''; - if (empty($rs)) { - $map['tab_user.promote_id'] = PID; - } else { - foreach ($rs as $rsKey => $rsValue) { - $id = $rsValue['id']; - $childPromoteIds .= $id . ','; - } - $childPromoteIds = rtrim($childPromoteIds, ','); - $childPromoteIds .= ',' . PID; - $map['tab_user.promote_id'] = ['in', $childPromoteIds]; - } - - $promote = $this->getLoginPromote(); $levelPromote = $this->getLevelPromote(); $queryPromote = $this->getQueryPromote($levelPromote); - $map2[] = [ - '_logic' => 'or', - 'id' => $queryPromote['id'], - 'chain' => ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%'] - ]; - $ids = M('promote', 'tab_')->where($map2)->getField('id', true); - if (empty($ids)) { - $ids = array(); - } - if (empty($levelPromote)) { - array_push($ids, PID); - - } - array_push($ids, $queryPromote['id']); - if (!empty($ids)) { - $map['tab_user.promote_id'] = ['in', $ids]; + $loginPromote = $this->getLoginPromote(); + $map = []; + if ($ownId) { + $map['tab_user.promote_id'] = $queryPromote['id']; } else { - $map['_string'] = '1<>1'; - } + $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%']; + $ids = M('promote', 'tab_')->where($map)->getField('id', true); + $ids[] = $queryPromote['id']; - if (!empty(I('own_id'))) { - $map['tab_user.promote_id'] = $queryPromote['id'];//本账号 + $map = []; + $map['tab_user.promote_id'] = ['in', $ids]; + } + if (!empty($account)) { + $map['tab_user.account'] = $account; + } + if (!empty($id)) { + $map['tab_user.id'] = $id; } - $map['tab_user.register_time'] = ['between', [$begTime, $endTime - 1]]; - empty(I('account')) || $map['tab_user.account'] = I('account'); - empty(I('id')) || $map['tab_user.id'] = intval(I('id')); $data = []; $count = 0; @@ -317,14 +266,12 @@ class QueryController extends BaseController $parameter['row'] = I('get.row'); $parameter['begtime'] = $initBegTime; $parameter['endtime'] = $initEndTime; - empty(I('team_leader_id')) || $parameter['team_leader_id'] = I('team_leader_id'); - empty(I('promote_id')) || $parameter['promote_id'] = I('promote_id'); - empty(I('own_id')) || $parameter['own_id'] = I('own_id'); - empty(I('account')) || $parameter['account'] = I('account'); - empty(I('level_promote_2')) || $parameter['level_promote_2'] = I('level_promote_2'); - empty(I('level_promote_3')) || $parameter['level_promote_3'] = I('level_promote_3'); - empty(I('level_promote_4')) || $parameter['level_promote_4'] = I('level_promote_4'); - $thisParentPromoteId = getParentPromoteId(PID);//本账号上级渠道ID + $parameter['account'] = $account; + empty($id) || $parameter['id'] = $id; + $parameter['own_id'] = $ownId; + $parameter['level_promote_2'] = intval(I('level_promote_2', 0)); + $parameter['level_promote_3'] = intval(I('level_promote_3', 0)); + $parameter['level_promote_4'] = intval(I('level_promote_4', 0)); $page = set_pagination($count, $row, $parameter); if ($page) { $this->assign('_page', $page); @@ -335,12 +282,7 @@ class QueryController extends BaseController $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('setdate', date("Y-m-d")); - $this->assign('thisParentPromoteId', $thisParentPromoteId); - $this->assign('pID', PID); - $this->assign('ownId', I('own_id')); - if (!empty(I('team_leader_id'))) { - $this->assign('teamLeaderData', getAllPromoteListByType(1, false, intval(I('team_leader_id')))); - } + $this->assign('ownId', $ownId); $this->meta_title = '注册明细'; $this->display(); } @@ -1964,6 +1906,11 @@ class QueryController extends BaseController public function achievement() { $time = I('time', date('Y-m-d')); + if(!empty($time)) { + $defaultTime = $time ; + }else { + $defaultTime = date('Y-m-d',time()); + } $sdkVersion = I('sdk_version', 0); $gameId = I('game_id', 0); $serverId = I('server_id', 0); @@ -2053,7 +2000,7 @@ class QueryController extends BaseController $rechargeCountList = $promoteRepository->getRechargeCountByIds($ids, $params); $rechargeUserCountList = $promoteRepository->getRechargeUserCountByIds($ids, $params); $rechargeAmountList = $promoteRepository->getRechargeAmountByIds($ids, $params); - + if (I('p', 1) == 1) { $selfParams = $params; $selfParams['isContainSubs'] = false; @@ -2123,6 +2070,7 @@ class QueryController extends BaseController $this->assign('parentid', $parentId); $this->assign('count', $count); $this->assign('timeout', $timeout); + $this->assign('time',$defaultTime); $this->display(); } diff --git a/Application/Home/Controller/SafeController.class.php b/Application/Home/Controller/SafeController.class.php index 2b21a142c..288e53af0 100644 --- a/Application/Home/Controller/SafeController.class.php +++ b/Application/Home/Controller/SafeController.class.php @@ -319,28 +319,8 @@ class SafeController extends BaseController{ $addressArr = explode(',', json_decode($address)[0]); $promoteInfo['addressdata'] = $addressArr; $this->assign('addr',json_decode($address)[1]); - }else { - $this->assign('addr','未填写地址'); } $promoteInfo['address'] = json_decode($address); - if(empty($promoteInfo['bank_card'])) { - $promoteInfo['bank_card'] = " "; - } - if(empty($promoteInfo['email'])) { - $promoteInfo['email'] = " "; - } - if(empty($promoteInfo['real_name'])) { - $promoteInfo['real_name'] = " "; - } - if(empty($promoteInfo['mobile_phone'])) { - $promoteInfo['mobile_phone'] = " "; - } - if(empty($promoteInfo['bank_name'])) { - $promoteInfo['bank_name'] = " "; - } - if(empty($promoteInfo['idcard'])) { - $promoteInfo['idcard'] = " "; - } $this->assign("ver_status",$promoteInfo['ver_status']); $this->assign('promoteinfo', $promoteInfo); @@ -377,6 +357,42 @@ class SafeController extends BaseController{ $account_type = $_REQUEST["account_type"]; $bank = $_REQUEST["bank"]; $agreementpic = $_REQUEST["agreementpic"]; + if(empty($tel)) { + $this->error("手机号码不能为空"); + return false; + } + $pattern = "/^1[3|5|7|8]\\d{9}$/i"; + if(!preg_match($pattern, $tel)) { + $this->error("手机号码格式不合法"); + return false; + } + + if(empty($address1)) { + $this->error("地址不能为空"); + return false; + } + if(empty($email)) { + $this->error("邮箱不能为空"); + return false; + } + $patternemail = "/^([0-9A-Za-z\\-_\\.]+)@([0-9a-z]+\\.[a-z]{2,3}(\\.[a-z]{2})?)$/i"; + if (!preg_match($patternemail, $email)) { + $this->error('邮箱地址错误'); + return false; + } + if(empty($bank)) { + $this->error("卡号不能为空"); + return false; + } + $bank_card_pattern = "/^\d{10,19}$/u"; + if (!preg_match($bank_card_pattern, $bank)) { + $this->error('卡号格式错误'); + return false; + } + if(empty($agreementpic)) { + $this->error("补充协议不能为空"); + return false; + } $Res = M("promote","tab_")->field('address')->where(['id'=>$id])->find(); $address = json_decode($Res['address'],false); $address[1] = $address1; diff --git a/Application/Home/View/default/Query/achievement.html b/Application/Home/View/default/Query/achievement.html index b295ed228..b2c1a9bb4 100644 --- a/Application/Home/View/default/Query/achievement.html +++ b/Application/Home/View/default/Query/achievement.html @@ -61,14 +61,14 @@
- +
0):?>
- 返回上级 + 返回上级
diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index fefbeb432..d7a658ae1 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -80,7 +80,7 @@
- + @@ -152,7 +152,8 @@
@@ -235,8 +236,6 @@ setValue('relation_game_id', {$Think.request.relation_game_id |default = '""'}); setValue('sdk_version', {$Think.request.sdk_version |default = '""'}); setValue('server_id', {$Think.request.server_id |default = '""'}); - setValue('team_leader_id', {$Think.request.team_leader_id |default = '""'}); - setValue('promote_id', {$Think.request.promote_id |default = 0}); setValue('row', '{:I("get.row",10)}'); var date = "{$setdate}"; @@ -263,36 +262,6 @@ endDate: date }); - $('#team_leader_id').change(function () { - var promoteId = parseInt($(this).val()); - var promoteValue = $(this).find("option:selected").text(); - var html = ""; - - if (promoteId > 0) { - html += ""; - - $.ajax({ - url: "{:U('getChildPromoteList')}", - type: "post", - data: {promote_id:promoteId}, - dataType: 'json', - success: function (data) { - var promoteData = data.data; - - if (promoteData.length > 0) { - for (var i in promoteData) { - html += ""; - } - } - - showPromoteSelect(html); - } - }); - } else { - showPromoteSelect(html); - } - }); - function showPromoteSelect(html) { $("#promote_id").empty(); @@ -301,21 +270,21 @@ } $('#own').on('click',function () { - var ownId = $('#own_id').val(); + var own = $('#own_id'); var checkBox = $(this).children('i'); - if (ownId > 0) { + if (own.is(':checked')) { checkBox.removeClass('iconfangxingxuanzhongfill'); checkBox.removeClass('selected-color'); checkBox.addClass('iconfangxingweixuanzhong'); - $('#own_id').val(0); + own.prop('checked', false); } else { checkBox.removeClass('iconfangxingweixuanzhong'); checkBox.addClass('iconfangxingxuanzhongfill'); checkBox.addClass('selected-color'); - $('#own_id').val({$pID}); + own.prop('checked', true); } }); diff --git a/Application/Home/View/default/Query/register.html b/Application/Home/View/default/Query/register.html index 8232a5ffe..8943277f3 100644 --- a/Application/Home/View/default/Query/register.html +++ b/Application/Home/View/default/Query/register.html @@ -79,7 +79,8 @@
@@ -147,8 +148,6 @@ var promoteUrl = "{:U('Query/getSubPromotes')}" initPromoteSelect(promoteUrl) $().ready(function () { - setValue('team_leader_id', {$Think.request.team_leader_id |default = '""'}); - setValue('promote_id', {$Think.request.promote_id |default = 0}); setValue('row', '{:I("get.row",10)}'); var date = "{$setdate}"; @@ -175,59 +174,22 @@ endDate: date }); - $('#team_leader_id').change(function () { - var promoteId = parseInt($(this).val()); - var promoteValue = $(this).find("option:selected").text(); - var html = ""; - - if (promoteId > 0) { - html += ""; - - $.ajax({ - url: "{:U('getChildPromoteList')}", - type: "post", - data: {promote_id:promoteId}, - dataType: 'json', - success: function (data) { - var promoteData = data.data; - - if (promoteData.length > 0) { - for (var i in promoteData) { - html += ""; - } - } - - showPromoteSelect(html); - } - }); - } else { - showPromoteSelect(html); - } - }); - - function showPromoteSelect(html) - { - $("#promote_id").empty(); - $('#promote_id').html(html); - $("#promote_id").select2(); - } - $('#own').on('click',function () { - var ownId = $('#own_id').val(); + var own = $('#own_id'); var checkBox = $(this).children('i'); - if (ownId > 0) { + if (own.is(':checked')) { checkBox.removeClass('iconfangxingxuanzhongfill'); checkBox.removeClass('selected-color'); checkBox.addClass('iconfangxingweixuanzhong'); - $('#own_id').val(0); + own.prop('checked', false); } else { checkBox.removeClass('iconfangxingweixuanzhong'); checkBox.addClass('iconfangxingxuanzhongfill'); checkBox.addClass('selected-color'); - $('#own_id').val({$pID}); + own.prop('checked', true); } }); diff --git a/Application/Home/View/default/Safe/modifyBaseInfo.html b/Application/Home/View/default/Safe/modifyBaseInfo.html index 1ace1661e..e645fd7a8 100644 --- a/Application/Home/View/default/Safe/modifyBaseInfo.html +++ b/Application/Home/View/default/Safe/modifyBaseInfo.html @@ -84,23 +84,21 @@ *真实姓名： - - - - - - + + + + + *身份证号码： - - - - - - + + + + + @@ -200,12 +198,11 @@ *电话： - - - - - - + + + + + @@ -218,12 +215,11 @@       - - - - - - + + + + +