Merge remote-tracking branch 'origin/dev' into dev

master
zhengchanglong 5 years ago
commit e5c3ee02ae

@ -53,6 +53,7 @@
<a class=" " href="{:U('add?model='.$model['id'])}"><span class="button_icon button_icon1"></span>新增</a>
<a class="ajax-post " target-form="ids" url="{:U('Promote/set_status',array('status'=>1,'msg_type'=>5,'field'=>'status'))}"><span class="button_icon button_icon9"></span>审核</a>
<a class="ajax-post " target-form="ids" url="{:U('Promote/idcar_status',array('status'=>1,'msg_type'=>5,'field'=>'status'))}"><span class="button_icon button_icon9"></span>资质审核</a>
<a class="ajax-post " target-form="ids" url="{:U('Promote/idcar_status',array('status'=>2,'msg_type'=>5,'field'=>'status'))}"><span class="button_icon button_icon9"></span>拒绝身份通过</a>
<if condition="C(PROMOTE_AUTO_AUDIT) eq 0">
<a class="ajax-get" target-form="ids" url='{:U("set_config_auto_audit",array("val"=>1,"config_key"=>"PROMOTE_AUTO_AUDIT"))}'><span class="button_icon button_icon4"></span>开启自动审核</a>
<else/>
@ -161,6 +162,7 @@
<th>所属会长</th>
<th>商务专员</th>
<th>状态</th>
<th>身份状态</th>>
<th>可申请游戏</th>
<th>操作</th>
</tr>
@ -195,6 +197,14 @@
{:get_info_status($data['status'],3)}
</if>
</td>
<td>
<if condition="$data['ver_status'] eq 1"><span>成功</span>
<elseif condition="$data['ver_status'] eq 2 " /><span>失败</span>
<elseif condition="$data['ver_status'] eq 3 " /><span>审核中</span>
<else/>未认证
</if>
</td>
<td><a class="ajax-view" data-id="{$data.id}">查看</a></td>
<td>
<a href="{:U('edit',array('id'=>$data['id']))}" class="">编辑</a>

@ -26,7 +26,9 @@ class PromoteRepository {
if (isset($params['isContainSubs']) && $params['isContainSubs']) {
$isContainSubs = true;
}
foreach ($ids as $key => $id) {
$ids[$key] = intval($id);
}
$map = [];
$map['promote_id'] = ['in', $ids];
$allIds = $ids;
@ -260,7 +262,22 @@ class PromoteRepository {
}
$params['time_column'] = 'login_time';
$map = $this->getPublicAchievementMap($ids, $params);
$items = M('user_login_record', 'tab_')->field(['count(DISTINCT user_id) as count', 'promote_id'])->where($map)->group('promote_id')->select();
$promoteIds = $map['promote_id'][1];
$tempRows = [];
$tempCount = 0;
$items = [];
foreach ($promoteIds as $promoteId) {
$tempCount ++;
$tempRows[] = $promoteId;
if ($tempCount == 20) {
$map['promote_id'] = ['in', $tempRows];
$rows = M('user_login_record', 'tab_')->field(['count(DISTINCT user_id) as count', 'promote_id'])->where($map)->group('promote_id')->select();
$tempRows = [];
$tempCount = 0;
$items = array_merge($items, $rows);
}
}
$records = [];
foreach ($items as $item) {

@ -297,8 +297,8 @@ class SpendRepository
$oldConditions['pay_time'] = ['lt', $beginTime];
$oldQuery = M('spend', 'tab_')->field('user_id')->where($oldConditions)->group('user_id')->buildSql();
$conditions['user_id'] = ['exp', ' not in (' . $oldQuery . ')'];
$items = M('spend', 'tab_')->field('count(distinct user_id) count, game_id')->where($conditions)->group('game_id')->find();
return $this->assembleRecords($items, $gameIds, 'amount', 'game_id');
$items = M('spend', 'tab_')->field('count(distinct user_id) count, game_id')->where($conditions)->group('game_id')->select();
return $this->assembleRecords($items, $gameIds, 'count', 'game_id');
}
/**

@ -1580,6 +1580,12 @@ class DownloadController extends BaseController {
}
empty($relation_game_id) || $map['tab_game.relation_game_id'] = $relation_game_id;
empty($sdk_version) || $map['tab_game.sdk_version'] = $sdk_version;
if(empty($begtime) && empty($endtime)) {
$nowTime = date('Y-m-d');
$begtime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
$endtime = $nowTime;
$map["apply_time"] = ["between",[$begtime,$endtime]];
}
if(!empty($begtime) && !empty($endtime)) {
$map["apply_time"] = ["between",[$begtime,$endtime]];
}

@ -27,7 +27,7 @@ class FileController extends HomeController {
C('DOWNLOAD_UPLOAD_DRIVER'),
C("UPLOAD_{$file_driver}_CONFIG")
);
/* 记录附件信息 */
if($info){
$return['data'] = think_encrypt(json_encode($info['download']));
@ -62,7 +62,7 @@ class FileController extends HomeController {
$return = array('status' => 1, 'info' => '上传成功', 'data' => '');
/* 调用文件上传组件上传文件 */
$Picture = D('Picture');
$Picture = D('Picture');
$pic_driver = C('PICTURE_UPLOAD_DRIVER');
$info = $Picture->upload(
$_FILES,
@ -70,17 +70,20 @@ class FileController extends HomeController {
C('PICTURE_UPLOAD_DRIVER'),
C("UPLOAD_{$pic_driver}_CONFIG")
); //TODO:上传到远程服务器
/* 记录图片信息 */
if($info){
/* 记录图片信息 */
if ($info) {
$return['status'] = 1;
$return = array_merge($info['download'], $return);
if (empty($info['download'])) {
$file = $info['file'];
} else {
$file = $info['download'];
}
$return = array_merge($file, $return);
} else {
$return['status'] = 0;
$return['info'] = $Picture->getError();
$return['info'] = $Picture->getError();
}
ob_clean();
/* 返回JSON数据 */
/* 返回JSON数据 */
$this->ajaxReturn($return);
}
}

@ -31,6 +31,14 @@ class QueryController extends BaseController
{
$page = intval($p);
$page = $page ? $page : 1; //默认显示第一页数据arraypage
$nowTime = date('Y-m-d');
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
$initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
$initEndTime = $nowTime;
$initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
$begTime = strtotime($initBegTime);
$endTime = strtotime($initEndTime);
$endTime += 3600 * 24;
if (isset($_REQUEST['row'])) {
$row = $_REQUEST['row'];
@ -75,20 +83,9 @@ class QueryController extends BaseController
} else {
$map['_string'] = '1<>1';
}
if (!empty(I('own_id'))) {
$map['tab_spend.promote_id'] = $queryPromote['id'];//本账号
}
if (!empty(I('begtime')) && empty(I('endtime'))) {
$map['tab_spend.pay_time'] = ['egt', strtotime(I('begtime'))];
} elseif (empty(I('begtime')) && !empty(I('endtime'))) {
$map['tab_spend.pay_time'] = ['elt', strtotime(I('endtime')) + 86399];
} elseif (!empty(I('begtime')) && !empty(I('endtime'))) {
$map['tab_spend.pay_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
}
if (isset($_REQUEST['pay_way']) && $_REQUEST['pay_way'] !== '') {
$payWay = intval(I('pay_way'));
@ -107,23 +104,27 @@ class QueryController extends BaseController
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];
$data = M('Spend', 'tab_')
->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.chain as chain')
->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)
->order('tab_spend.id desc')
->page($page, $row)
->select();
$count = M('Spend', 'tab_')
->join('tab_game on tab_spend.game_id = tab_game.id')
->where($map)
->count();
$data = [];
$count = 0;
if (intval($endTime - $begTime) / (24 * 3600) <= 31) {
$data = M('Spend', 'tab_')
->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.chain as chain')
->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)
->order('tab_spend.id desc')
->page($page, $row)
->select();
$count = M('Spend', 'tab_')
->join('tab_game on tab_spend.game_id = tab_game.id')
->where($map)
->count();
}
if (!empty($data)) {
foreach ($data as &$list) {
$list['p_p_pro_account'] = $list['pro_account'];
@ -159,21 +160,23 @@ class QueryController extends BaseController
$strLen = 4;
$hideChar = '';
if($orderLen <=8) {
if ($orderLen <= 8) {
$strLen = 2;
}
for($i = 0;$i<$orderLen-$strLen*2;$i++) {
$hideChar .='*';
for ($i = 0; $i < $orderLen - $strLen * 2; $i++) {
$hideChar .= '*';
}
$list['order_number'] = substr($list['order_number'], 0, $strLen) . $hideChar . substr($list['order_number'], $orderLen-$strLen);
$list['order_number'] = substr($list['order_number'], 0, $strLen) . $hideChar . substr($list['order_number'], $orderLen - $strLen);
}
}
//分页
$parameter['p'] = I('get.p', 1);
$parameter['row'] = I('get.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');
@ -182,8 +185,6 @@ class QueryController extends BaseController
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('begtime')) || $parameter['begtime'] = I('begtime');
empty(I('endtime')) || $parameter['endtime'] = I('endtime');
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');
@ -199,6 +200,8 @@ class QueryController extends BaseController
$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);
@ -216,6 +219,14 @@ class QueryController extends BaseController
{
$page = intval($p);
$page = $page ? $page : 1; //默认显示第一页数据arraypage
$nowTime = date('Y-m-d');
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
$initBegTime = empty(I('begtime')) ? $initBegTime : I('begtime');
$initEndTime = $nowTime;
$initEndTime = empty(I('endtime')) ? $initEndTime : I('endtime');
$begTime = strtotime($initBegTime);
$endTime = strtotime($initEndTime);
$endTime += 3600 * 24;
if (isset($_REQUEST['row'])) {
$row = $_REQUEST['row'];
@ -266,28 +277,25 @@ class QueryController extends BaseController
$map['tab_user.promote_id'] = $queryPromote['id'];//本账号
}
if (!empty(I('begtime')) && empty(I('endtime'))) {
$map['tab_user.register_time'] = ['egt', strtotime(I('begtime'))];
} elseif (empty(I('begtime')) && !empty(I('endtime'))) {
$map['tab_user.register_time'] = ['elt', strtotime(I('endtime')) + 86399];
} elseif (!empty(I('begtime')) && !empty(I('endtime'))) {
$map['tab_user.register_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
}
$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 = M('User', 'tab_')
->field('tab_user.*,tab_promote.real_name as pro_real_name')
->join('left join tab_promote on tab_user.promote_id = tab_promote.id')
->where($map)
->order('tab_user.id desc')
->page($page, $row)
->select();
$data = [];
$count = 0;
if (intval($endTime - $begTime) / (24 * 3600) <= 31) {
$data = M('User', 'tab_')
->field('tab_user.*,tab_promote.real_name as pro_real_name')
->join('left join tab_promote on tab_user.promote_id = tab_promote.id')
->where($map)
->order('tab_user.id desc')
->page($page, $row)
->select();
$count = M('User', 'tab_')
->where($map)
->count();
$count = M('User', 'tab_')
->where($map)
->count();
}
if (!empty($data)) {
foreach ($data as &$list) {
@ -307,12 +315,12 @@ class QueryController extends BaseController
//分页
$parameter['p'] = I('get.p', 1);
$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('begtime')) || $parameter['begtime'] = I('begtime');
empty(I('endtime')) || $parameter['endtime'] = I('endtime');
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');
@ -324,6 +332,8 @@ class QueryController extends BaseController
$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('thisParentPromoteId', $thisParentPromoteId);
$this->assign('pID', PID);
@ -755,7 +765,7 @@ class QueryController extends BaseController
$timeout = 0;
$records = [];
if (intval($endTime - $beginTime) / (24 * 3600) <= 31) {
if (intval($endTime - $beginTime) / (24 * 3600) <= 7) {
$userRepository = new UserRepository();
$spendRepository = new SpendRepository();
$payGameCountList = $spendRepository->getPayGameCountGroupByDay($params);
@ -1740,15 +1750,15 @@ class QueryController extends BaseController
$strLen = 3;
$hideChar = '';
if($orderLen <=8) {
if ($orderLen <= 8) {
$strLen = 2;
}
for($i = 0;$i<$orderLen-$strLen*2;$i++) {
$hideChar .='*';
for ($i = 0; $i < $orderLen - $strLen * 2; $i++) {
$hideChar .= '*';
}
$records[$key]['user_account'] = substr($value['user_account'], 0, $strLen) . $hideChar . substr($value['user_account'], $orderLen-$strLen);
$records[$key]['user_account'] = substr($value['user_account'], 0, $strLen) . $hideChar . substr($value['user_account'], $orderLen - $strLen);
}
@ -2040,73 +2050,78 @@ class QueryController extends BaseController
list($beginTime, $endTime) = $this->getBetweenTime($time);
$params['begin_time'] = $beginTime;
$params['end_time'] = $endTime;
$promoteRepository = new PromoteRepository();
$createRoleCountList = $promoteRepository->getCreateRoleCountByIds($ids, $params);
$createRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds($ids, $params);
$newCreateRoleUserCountList = $promoteRepository->getNewCreateRoleUserCountByIds($ids, $params);
$newCreateRoleDeviceCountList = $promoteRepository->getNewCreateRoleDeviceCountByIds($ids, $params);
$newCreateRoleIpCountList = $promoteRepository->getNewCreateRoleIpCountByIds($ids, $params);
$loginUserCountList = $promoteRepository->getLoginUserCountByIds($ids, $params);
$rechargeCountList = $promoteRepository->getRechargeCountByIds($ids, $params);
$rechargeUserCountList = $promoteRepository->getRechargeUserCountByIds($ids, $params);
$rechargeAmountList = $promoteRepository->getRechargeAmountByIds($ids, $params);
$timeout = 0;
$records = [];
if (I('p', 1) == 1) {
$selfParams = $params;
$selfParams['isContainSubs'] = false;
$selfCreateRoleCountList = $promoteRepository->getCreateRoleCountByIds([$promote['id']], $selfParams);
$selfCreateRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds([$promote['id']], $selfParams);
$selfNewCreateRoleUserCountList = $promoteRepository->getNewCreateRoleUserCountByIds([$promote['id']], $selfParams);
$selfNewCreateRoleDeviceCountList = $promoteRepository->getNewCreateRoleDeviceCountByIds([$promote['id']], $selfParams);
$selfNewCreateRoleIpCountList = $promoteRepository->getNewCreateRoleIpCountByIds([$promote['id']], $selfParams);
$selfLoginUserCountList = $promoteRepository->getLoginUserCountByIds([$promote['id']], $selfParams);
$selfRechargeCountList = $promoteRepository->getRechargeCountByIds([$promote['id']], $selfParams);
$selfRechargeUserCountList = $promoteRepository->getRechargeUserCountByIds([$promote['id']], $selfParams);
$selfRechargeAmountList = $promoteRepository->getRechargeAmountByIds([$promote['id']], $selfParams);
if (intval($endTime - $beginTime) / (24 * 3600) <= 7) {
$promoteRepository = new PromoteRepository();
$createRoleCountList = $promoteRepository->getCreateRoleCountByIds($ids, $params);
$createRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds($ids, $params);
$newCreateRoleUserCountList = $promoteRepository->getNewCreateRoleUserCountByIds($ids, $params);
// $newCreateRoleDeviceCountList = $promoteRepository->getNewCreateRoleDeviceCountByIds($ids, $params);
$newCreateRoleIpCountList = $promoteRepository->getNewCreateRoleIpCountByIds($ids, $params);
$loginUserCountList = $promoteRepository->getLoginUserCountByIds($ids, $params);
$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;
$selfCreateRoleCountList = $promoteRepository->getCreateRoleCountByIds([$promote['id']], $selfParams);
$selfCreateRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds([$promote['id']], $selfParams);
$selfNewCreateRoleUserCountList = $promoteRepository->getNewCreateRoleUserCountByIds([$promote['id']], $selfParams);
// $selfNewCreateRoleDeviceCountList = $promoteRepository->getNewCreateRoleDeviceCountByIds([$promote['id']], $selfParams);
$selfNewCreateRoleIpCountList = $promoteRepository->getNewCreateRoleIpCountByIds([$promote['id']], $selfParams);
$selfLoginUserCountList = $promoteRepository->getLoginUserCountByIds([$promote['id']], $selfParams);
$selfRechargeCountList = $promoteRepository->getRechargeCountByIds([$promote['id']], $selfParams);
$selfRechargeUserCountList = $promoteRepository->getRechargeUserCountByIds([$promote['id']], $selfParams);
$selfRechargeAmountList = $promoteRepository->getRechargeAmountByIds([$promote['id']], $selfParams);
$records[] = [
'id' => $parent['id'],
'account' => $parent['account'],
'real_name' => $parent['real_name'],
'level' => $parent['level'],
'create_role_count' => $selfCreateRoleCountList[$promote['id']],
'create_role_user_count' => $selfCreateRoleUserCountList[$promote['id']],
'new_create_role_user_count' => $selfNewCreateRoleUserCountList[$promote['id']],
'new_create_role_device_count' => $selfNewCreateRoleDeviceCountList[$promote['id']],
'new_create_role_ip_count' => $selfNewCreateRoleIpCountList[$promote['id']],
'login_user_count' => $selfLoginUserCountList[$promote['id']],
'recharge_count' => $selfRechargeCountList[$promote['id']],
'recharge_user_count' => $selfRechargeUserCountList[$promote['id']],
'recharge_amount' => $selfRechargeAmountList[$promote['id']]['ban_coin'] + $rechargeAmountList[$promote['id']]['coin'] + $rechargeAmountList[$promote['id']]['cash'],
'recharge_by_ban_coin' => $selfRechargeAmountList[$promote['id']]['ban_coin'],
'recharge_by_coin' => $selfRechargeAmountList[$promote['id']]['coin'],
'recharge_by_cash' => $selfRechargeAmountList[$promote['id']]['cash'],
'current_display' => $currentDisplay,
];
}
foreach ($promotes as $promote) {
$id = $promote['id'];
$records[] = [
'id' => $id,
'account' => $promote['account'],
'real_name' => $promote['real_name'],
'level' => $promote['level'],
'create_role_count' => $createRoleCountList[$id],
'create_role_user_count' => $createRoleUserCountList[$id],
'new_create_role_user_count' => $newCreateRoleUserCountList[$id],
'new_create_role_device_count' => $newCreateRoleDeviceCountList[$id],
'new_create_role_ip_count' => $newCreateRoleIpCountList[$id],
'login_user_count' => $loginUserCountList[$id],
'recharge_count' => $rechargeCountList[$id],
'recharge_user_count' => $rechargeUserCountList[$id],
'recharge_amount' => $rechargeAmountList[$id]['ban_coin'] + $rechargeAmountList[$id]['coin'] + $rechargeAmountList[$id]['cash'],
'recharge_by_ban_coin' => $rechargeAmountList[$id]['ban_coin'],
'recharge_by_coin' => $rechargeAmountList[$id]['coin'],
'recharge_by_cash' => $rechargeAmountList[$id]['cash'],
'current_display' => '',
];
$records[] = [
'id' => $parent['id'],
'account' => $parent['account'],
'real_name' => $parent['real_name'],
'level' => $parent['level'],
'create_role_count' => $selfCreateRoleCountList[$promote['id']],
'create_role_user_count' => $selfCreateRoleUserCountList[$promote['id']],
'new_create_role_user_count' => $selfNewCreateRoleUserCountList[$promote['id']],
// 'new_create_role_device_count' => $selfNewCreateRoleDeviceCountList[$promote['id']],
'new_create_role_ip_count' => $selfNewCreateRoleIpCountList[$promote['id']],
'login_user_count' => $selfLoginUserCountList[$promote['id']],
'recharge_count' => $selfRechargeCountList[$promote['id']],
'recharge_user_count' => $selfRechargeUserCountList[$promote['id']],
'recharge_amount' => $selfRechargeAmountList[$promote['id']]['ban_coin'] + $rechargeAmountList[$promote['id']]['coin'] + $rechargeAmountList[$promote['id']]['cash'],
'recharge_by_ban_coin' => $selfRechargeAmountList[$promote['id']]['ban_coin'],
'recharge_by_coin' => $selfRechargeAmountList[$promote['id']]['coin'],
'recharge_by_cash' => $selfRechargeAmountList[$promote['id']]['cash'],
'current_display' => $currentDisplay,
];
}
foreach ($promotes as $promote) {
$id = $promote['id'];
$records[] = [
'id' => $id,
'account' => $promote['account'],
'real_name' => $promote['real_name'],
'level' => $promote['level'],
'create_role_count' => $createRoleCountList[$id],
'create_role_user_count' => $createRoleUserCountList[$id],
'new_create_role_user_count' => $newCreateRoleUserCountList[$id],
// 'new_create_role_device_count' => $newCreateRoleDeviceCountList[$id],
'new_create_role_ip_count' => $newCreateRoleIpCountList[$id],
'login_user_count' => $loginUserCountList[$id],
'recharge_count' => $rechargeCountList[$id],
'recharge_user_count' => $rechargeUserCountList[$id],
'recharge_amount' => $rechargeAmountList[$id]['ban_coin'] + $rechargeAmountList[$id]['coin'] + $rechargeAmountList[$id]['cash'],
'recharge_by_ban_coin' => $rechargeAmountList[$id]['ban_coin'],
'recharge_by_coin' => $rechargeAmountList[$id]['coin'],
'recharge_by_cash' => $rechargeAmountList[$id]['cash'],
'current_display' => '',
];
}
} else {
$timeout = 1;
}
$this->assign('prevParentId', $prevParentId);
@ -2118,6 +2133,7 @@ class QueryController extends BaseController
$this->assign('pagination', $pagination);
$this->assign('parentid', $parentId);
$this->assign('count', $count);
$this->assign('timeout', $timeout);
$this->display();
}

@ -154,7 +154,11 @@ class SafeController extends BaseController{
//修改用户信息
public function modifyBaseInfo() {
if($_POST) {
$id = get_pid();
$ver_status = M('promote','tab_')->where(['id'=>$id])->getField('ver_status',true);
if($ver_status[0] == 1) {
$this->success('认证',U('editModify'));
}
$username = $_REQUEST['username']; //真实姓名
$id_card = $_REQUEST["id_card"]; //身份证号码
$tel = $_REQUEST['tel'];
@ -242,7 +246,6 @@ class SafeController extends BaseController{
$this->error('卡号格式错误');
return false;
}
$id = get_pid();
$data["real_name"] = $username;
$data['mobile_phone'] = $tel;
$data['idcard'] = $id_card;
@ -309,15 +312,93 @@ class SafeController extends BaseController{
if(!empty(json_decode($address))) {
$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);
$this->assign("ver_status",$promoteInfo['ver_status']);
$this->assign('promoteinfo', $promoteInfo);
}
$this->display();
}
public function editModify() {
$id = get_pid();
$rs = M("promote","tab_")->field('anothpic,ver_status,real_name,bank_card,mobile_phone,email,address,idcard')->where(['id'=>$id])->find();
$anothpic = $rs['anothpic'];
if(!empty($anothpic)) {
$idcarpicArr = explode(',', $anothpic);
foreach ($idcarpicArr as $key => $value) {
$promoteInfo['valuedata'][$key] = $value;
}
}
$address = json_decode($rs['address'],false)[1];
$this->assign('addr',$address);
$this->assign('ver_status',$rs['ver_status']);
$this->assign('rs',$rs);
$this->assign('promoteInfo',$promoteInfo);
$this->assign('tel',$rs['mobile_phone']);
$this->display();
}
public function edit() {
$id = get_pid();
$tel = $_REQUEST["tel"];
$address1 = $_REQUEST["address"];
$email = $_REQUEST["email"];
$account_type = $_REQUEST["account_type"];
$bank = $_REQUEST["bank"];
$agreementpic = $_REQUEST["agreementpic"];
$Res = M("promote","tab_")->field('address')->where(['id'=>$id])->find();
$address = json_decode($Res['address'],false);
$address[1] = $address1;
$data['mobile_phone'] = $tel;
$data['address'] = json_encode($address,TRUE);
$data['email'] = $email;
$data['account_type'] = $account_type;
$data['bank_card'] = $bank;
$data['ver_status'] = 3;
// $data['agreementpic'] = $
$data['anothpic'] = $agreementpic;
$id = get_pid();
$updateRs = M("promote","tab_")->where(['id'=>$id])->save($data);
if($updateRs) {
$this->success("更新信息成功");
}else {
$this->error("更新信息失败");
}
}
public function ajaxEdit() {
$id = get_pid();
$rs = M("promote","tab_")->field('mobile_phone,address,email,account_type,bank_card')->where(['id'=>$id])->find();
$this->assign('tel',$rs['mobile_phone']);
$this->assign('address',$rs['address']);
$this->assign('email',$rs['email']);
$this->assign('account_type',$rs['account_type']);
$this->assign('bank_card',$rs['bank_card']);
$res = [
'tel'=> $rs['mobile_phone'],
'address'=> json_decode($rs['address'],false)[1],
'email'=> $rs['email'],
'account_type'=> $rs['account_type'],
'bank_card'=> $rs['bank_card'],
'idcarpic' => $rs['idcarpic'],
];
if($rs['account_type'] == 1) {
$res['complanystatus'] = true;
$res['personalstatus'] = false;
}else {
$res['personalstatus'] = true;
$res['complanystatus'] = false;
}
$this->ajaxReturn($res);
}
public function safeDocument() {
$time = time();
$today = date('Y-m-d');

@ -261,7 +261,7 @@
</script>
<script>
function reload() {
setTimeout(function(){ window.location.reload(); }, 1000);
setTimeout(function(){ window.location.reload(); }, 7000);
}
</script>
</block>

@ -155,7 +155,7 @@
<input type="text" id="shift-order-time" autocomplete="off" class="form-input" name="order_time" placeholder="订单日期"" value="" style="width: 199px;">
</div>
</div>
<div class="form-group">
<div class="form-group" style="display:none">
<label>平台币管理</label>
<div class="form-item">
<label class="radio-item"><input type="radio" value="1" name="balance_coin_mode" checked> 平台币平移最高账户</label>

@ -80,7 +80,7 @@
<th>创角数</th>
<th>创角用户</th>
<th>新创角用户</th>
<th>新创角设备</th>
<!-- <th>新创角设备</th> -->
<th>新创角IP</th>
<th>登录用户数</th>
<th>充值人数</th>
@ -106,7 +106,7 @@
<td>{$record.create_role_count}</td>
<td>{$record.create_role_user_count}</td>
<td>{$record.new_create_role_user_count}</td>
<td>{$record.new_create_role_device_count}</td>
<!-- <td>{$record.new_create_role_device_count}</td> -->
<td>{$record.new_create_role_ip_count}</td>
<td>{$record.login_user_count}</td>
<td>{$record.recharge_count}</td>
@ -118,7 +118,7 @@
<?php if($parent['level'] < 4):?>
<td>
<?php if($record['current_display'] == '' && $record['level'] < 4):?>
<a href="{:U('Query/achievement', ['parent_id' => $record['id']])}">查看下级</a>
<a href="{:U('Query/achievement', ['parent_id' => $record['id'], 'time' => I('time', '')])}">查看下级</a>
<?php endif;?>
</td>
<?php endif;?>
@ -149,6 +149,11 @@
<script src="__STATIC__/flatpickr/flatpickr.min.js"></script>
<script src="__STATIC__/flatpickr/l10n/zh.js"></script>
<script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
<eq name='timeout' value='1'>
<script>
layer.msg('时间间隔不能超过7天');
</script>
</eq>
<script type="text/javascript">
$(function() {
var defaultDate = $('.range-date').val()

@ -76,31 +76,47 @@
<li class="keywords_title">关键词说明<a href="javascript:;" class="keywords_close"><img src="__IMG__/20180207/btn_normal_close.png"/></a></li>
<li class="keywords_list">
<span class="">活跃用户</span>
<span class="">当天登录的用户总数</span>
<span class="">当日在线的推广玩家</span>
</li>
<li class="keywords_list">
<span class="">付费游戏数</span>
<span class="">当日有产生付费的游戏(区分 Android与ios)</span>
</li>
<li class="keywords_list">
<span class="">新增用户</span>
<span class="">当日新注册用户付费用户:当日游戏充值用户</span>
</li>
<li class="keywords_list">
<span class="">付费用户</span>
<span class="">当天付费的用户数量</span>
<span class="">日游戏充值用户</span>
</li>
<li class="keywords_list">
<span class="">新增付费用户</span>
<span class="">当天付费用户中第一次付费的用户数</span>
<span class="">注册以来首次充值的用户</span>
</li>
<li class="keywords_list">
<span class="">付费总额</span>
<span class="">当日充值总额</span>
</li>
<li class="keywords_list">
<span class="">新增付费额</span>
<span class="">第一次付费的玩家当天充值总额</span>
<span class="">新增注册用户充值总额</span>
</li>
<li class="keywords_list">
<span class="">付费率</span>
<span class="">付费用户/活跃用户</span>
<span class="">单日在线玩家充值率</span>
</li>
<li class="keywords_list">
<span class="">累计付费用户</span>
<span class="">历史累计付费注册用户(去重)</span>
</li>
<li class="keywords_list">
<span class="">ARPU(每用户平均付费)</span>
<span class="">当日总充值/活跃用户数</span>
<span class="">ARPU</span>
<span class="">即每个用户平均收入</span>
</li>
<li class="keywords_list">
<span class="">ARPPU(付费用户的平均付费)</span>
<span class="">当日总充值/付费用户数</span>
<span class="">ARPPU</span>
<span class="">每付费用户平均收益</span>
</li>
</ul>
</div>
@ -148,17 +164,17 @@
<if condition="I('promote_id', 0) gt 0 or I('sub_promote_id', 0) gt 0">
<th>所属渠道</th>
</if>
<th title="当日在线的推广玩家">活跃用户</th>
<th title="当日新注册用户">新增用户</th>
<th title="当日游戏充值用户">付费用户</th>
<th title="注册以来首次充值的用户">新增付费用户</th>
<th title="当日充值总额">付费总额</th>
<th title="当日在线玩家充值率">付费率</th>
<th title="新增注册用户充值总额">新增付费额</th>
<th title="历史累计付费注册用户">累计付费用户</th>
<th>活跃用户</th>
<th>新增用户</th>
<th>付费用户</th>
<th>新增付费用户</th>
<th>付费总额</th>
<th>付费率</th>
<th>新增付费额</th>
<th>累计付费用户</th>
<!-- <th>1日留存</th> -->
<th title="即每个用户平均收入">ARPU</th>
<th title="每付费用户平均收益">ARPPU</th>
<th>ARPU</th>
<th>ARPPU</th>
<if condition="I('game_id', 0) eq 0">
<th>详情</th>
</if>
@ -226,7 +242,7 @@
<script type="text/javascript" src="__JS__/common.js"></script>
<eq name='timeout' value='1'>
<script>
layer.msg('时间间隔不能超过31天');
layer.msg('时间间隔不能超过7天');
</script>
</eq>
<script>
@ -308,6 +324,27 @@ var gameId = $('#game-select').val();
}
var promoteUrl = "{:U('Query/getSubPromotes')}"
initPromoteSelect(promoteUrl)
$('.keywords_information .keywords_mark').click(function() {
var that = $(this).siblings().addClass('active');
console.log(that);
$(document).click(function(event) {
var e = event || window.event;
var target= $(e.target);
if (!target.hasClass('keywords_information') && target.closest('.keywords_information').length<1) {
that.removeClass('active');
}
});
that.find('.keywords_close').click(function() {
that.removeClass('active');
return false;
});
return false;
});
</script>
</block>

@ -118,11 +118,11 @@
<div class="form-group normal_space">
<label class="form-title select-title" style="position: relative;">起止时间:</label>
<div class="select-time">
<input type="text" id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{:I('begtime')}">
<input type="text" readonly id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{$initBegTime}">
</div>
<label class="form-title select-title zhi_color">&nbsp;&nbsp;</label>
<div class="select-time">
<input type="text" id="edate" class="txt" name="endtime" placeholder="结束时间" value="{:I('endtime')}">
<input type="text" readonly id="edate" class="txt" name="endtime" placeholder="结束时间" value="{$initEndTime}">
</div>
</div>
@ -370,12 +370,17 @@
});
$('#submit').click(function () {
var sdate = $('#sdate').val();
var edate = $('#edate').val();
if (Date.parse(sdate) > Date.parse(edate)) {
var sdate = Date.parse($('#sdate').val()) / 1000;
var edate = Date.parse($('#edate').val()) / 1000;
if (sdate > edate) {
layer.msg('开始时间必须小于等于结束时间');
return false;
}
if ((edate - sdate) > 2592000) {
layer.msg('时间间隔不能超过31天请重新选择日期');
return false;
}
var url = $(this).attr('url');
console.log(url);
var query = $('.jssearch').find('input').serialize();

@ -48,41 +48,40 @@
</div>
<div class="trunk-content article">
<div class="trunk-search clearfix">
<form action="{:U('Query/register',array('row'=>I('get.row')))}" method="post" enctype="multipart/form-data">
<include file="Public/promote_select" />
<include file="Public/promote_select" />
<div class="form-group normal_space">
<input type="text" name="account" class="txt normal_txt" placeholder="请输入玩家账号"
value="{:I('account')}">
</div>
<div class="form-group normal_space">
<input type="text" name="account" class="txt normal_txt" placeholder="请输入玩家账号"
value="{:I('account')}">
</div>
<div class="form-group normal_space">
<input type="text" name="id" class="txt normal_txt" placeholder="请输入玩家ID"
value="{:I('id')}">
</div>
<div class="form-group normal_space">
<input type="text" name="id" class="txt normal_txt" placeholder="请输入玩家ID"
value="{:I('id')}">
</div>
<div class="form-group normal_space">
<label class="form-title select-title" style="position: relative;">起止时间:</label>
<div class="select-time">
<input type="text" readonly id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{:I('begtime')}">
</div>
<label class="form-title select-title zhi_color">&nbsp;&nbsp;</label>
<div class="select-time">
<input type="text" readonly id="edate" class="txt" name="endtime" placeholder="结束时间" value="{:I('endtime')}">
</div>
<div class="form-group normal_space">
<label class="form-title select-title" style="position: relative;">起止时间:</label>
<div class="select-time">
<input type="text" readonly id="sdate" class="txt" name="begtime" placeholder="开始时间" value="{$initBegTime}">
</div>
<div class="form-group normal_space">
<input type="submit" class="submit normal_space" value="查询">
<label class="form-title select-title zhi_color">&nbsp;&nbsp;</label>
<div class="select-time">
<input type="text" readonly id="edate" class="txt" name="endtime" placeholder="结束时间" value="{$initEndTime}">
</div>
</div>
<div class="form-group normal_space" style="margin-left: 46px;">
<label style="line-height: 34px;cursor: pointer;" id="own">
<i class="iconfont {:empty(I('own_id'))?'iconfangxingweixuanzhong':'iconfangxingxuanzhongfill selected-color'}" style="font-size: 1.5rem;position: relative;top: 3px;margin-right: 2px;"></i>本账号
<input type="hidden" name="own_id" id="own_id" value="{:empty(I('own_id'))?0:I('own_id')}" />
</label>
</div>
</form>
<div class="form-group normal_space">
<input type="submit" class="submit" id='submit' url="{:U('Query/register','model='.$model['name'],false)}"
value="查询">
</div>
<div class="form-group normal_space" style="margin-left: 46px;">
<label style="line-height: 34px;cursor: pointer;" id="own">
<i class="iconfont {:empty(I('own_id'))?'iconfangxingweixuanzhong':'iconfangxingxuanzhongfill selected-color'}" style="font-size: 1.5rem;position: relative;top: 3px;margin-right: 2px;"></i>本账号
<input type="hidden" name="own_id" id="own_id" value="{:empty(I('own_id'))?0:I('own_id')}" />
</label>
</div>
</div>
</div>
<div class="page-list query-register-list">
@ -241,12 +240,17 @@
$(".select_gallery").select2();
$('#submit').click(function () {
var sdate = $('#sdate').val();
var edate = $('#edate').val();
if (Date.parse(sdate) > Date.parse(edate)) {
var sdate = Date.parse($('#sdate').val()) / 1000;
var edate = Date.parse($('#edate').val()) / 1000;
if (sdate > edate) {
layer.msg('开始时间必须小于等于结束时间');
return false;
}
if ((edate - sdate) > 2592000) {
layer.msg('时间间隔不能超过31天请重新选择日期');
return false;
}
var url = $(this).attr('url');
console.log(url);
var query = $('.jssearch').find('input').serialize();

@ -0,0 +1,385 @@
<extend name="Public/promote_base"/>
<block name="css">
<link href="__CSS__/20180207/account.css" rel="stylesheet" >
<link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all">
<link rel="stylesheet" type="text/css" href="__STATIC__/webuploader/webuploader.css" media="all">
<script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
<script type="text/javascript" src="__STATIC__/webuploader/webuploader.js"></script>
<script type="text/javascript" src="__JS__/jquery-1.11.1.min.js"></script>
<!-- <script type="text/javascript" src="__STATIC__/webuploader/webuploader.inc.js"></script> -->
<script type="text/javascript" src="__STATIC__/webuploader/webuploader.before.js"></script>
<style>.notice_tip {padding-left:20px;color:#999;font-size:12px;}
.formtxt{display:inline-block;width:232px;}
.trunk-list .table2 .r .qrcodeboxwrap {padding-left:0;padding-right:20px;padding-bottom:20px;}
.qrcodebox img {width:100px;height:100px;}
.qrcodebox p {font-size:12px;margin:0;color:#666;}
.qrcodebox p span{color:red;}
.qrcodeboxwrap~.notice_tip{vertical-align:top;display:inline-block;margin-top:20px;}
.mail_suffix {position: absolute;
top: 43px;
border: 1px solid rgb(229,229,229);
border-radius: 2px;
color: #666;
font-size: 11px;
width: 230px;
padding: 0 10px;
line-height: 1.4;
z-index: 1;
background: #FFF;
height: 200px;
overflow: hidden;
overflow-y: auto;}
.mail_suffix li {
padding: 2px 0;
cursor: pointer;
}
.mail_suffix li:first-child {padding-top:4px;}
.mail_suffix li:last-child{padding-bottom:4px;}
#tab{
margin-top:10px;
height:46px;display:flex;
justify-content: space-between;
align-items: center;
background: #ecf4f5;
width:100%;
}
.contain {
display: flex;
width:100%;
height:100%;
flex-direction: column;
}
.zizhi {
margin-top:30px;
margin-left:2%;
width:94%;
display: flex;
height:300px;
flex-direction: column;
}
.line_title {
width:100%;
display: flex;
height:50px;
font-size:18px;
font-weight: bold;
align-items: center;
justify-content: space-between;
}
.line_text {
display: flex;
margin-top:10px;
width:94%;
margin-left:3%;
height: 30px;
align-items: center;
font-size:14px;
}
.jiesuan {
margin-top:86px;
margin-left:2%;
width:94%;
display: flex;
height:300px;
flex-direction: column;
}
.editjiesuan {
margin-top:40px;
margin-left:5%;
width:90%;
display: flex;
height:300px;
flex-direction: column;
}
.line_jiesuan_text {
margin-top:20px;
margin-left:7%;
width:86%;
display: flex;
height:300px;
align-items: center;
align-content: center;
font-size:14px;
}
.inputcss {
margin-left:30px;
height:30px;
}
</style>
</block>
<block name="body" >
<div class="contain">
<div class="zizhi">
<div class="line_title">资质认证</div>
<div class="line_text">
真实姓名: {$rs['real_name']}
</div>
<div class="line_text">
身份证号码: {$rs['idcard']}
</div>
<div class="line_text">
身份证扫描: <span style="color:#449acb">已认证<span>
</div>
<div class="line_text">
营业执照: <span style="color:#449acb">已认证<span>
</div>
<div class="line_text">
合作合同: <span style="color:#449acb">已认证<span>
</div>
</div>
<div class="jiesuan">
<div class="line_title">结算信息</div>
<div class="line_text">
电话: {$tel}
</div>
<div class="line_text">
联系地址: {$addr}
</div>
<div class="line_text">
邮箱: {$rs['email']}
</div>
<div class="line_text">
账户类型: <span style="color:#449acb">已认证<span>
</div>
<div class="line_text">
开户银行: {$rs['bank_card']} &nbsp; &nbsp; &nbsp;
<span onclick="ed(1)" id="edit" style="color:#449acb">修改</span>
</div>
</div>
</div>
<script src="__LAY__/layui.js" type="text/javascript" ></script>
<link rel="stylesheet" href="__LAY__/css/layui.css" media="all">
<script>
</script>
<script>
function ed(id) {
$.ajax({
type:"POST",
url:"{:U('Safe/ajaxEdit')}",
data:{'id':id},
dataType:'json',
success:function(res) {
var tel = res.tel
var address = res.address
var email = res.email
var account_type = res.account_type
if(account_type == 1) {
var complany = 'checked';
var personal = '';
}else {
var complany = '';
var personal = 'checked';
}
var bank_card = res.bank_card
var complanystatus = res.complanystatus
var personalstatus = res.personalstatus
layer.open({
type: 1
,title: false //不显示标题栏
,closeBtn: true
,area: ["800px","700px"]
,shade: 0.8
,id: 'LAY_layuipro' //设定一个id防止重复弹出
,moveType: 1 //拖拽模式0或者1
,content: '<div class="trunk-title"> <span class="title_main">结算信息</span></div> <div class="trunk-content article"> <div class="trunk-list baseInfo">'
+'<form action="{:U("safe/edit")}" novalidate="novalidate" method="post" class="paw_info">'
+'<table class="table2" style="margin-top:20px;margin-left:30px;width:100%" >'
+'<tr><td class="l">电话:</td><td class="r"><input type="text" class="input txt" name="tel" id="password" style="width:430px" placeholder="" value="'+tel+'">'
+'<span id="password_tip"></span></td>'
+'</tr><tr><td class="l">联系地址:</td>'
+'<td class="r"><input type="text" class="input txt" name="address" id="confirm_password" style="width:430px" placeholder="" value="'+address+'">'
+'<span id="confirm_password_tip"></span></td></tr>'
+' <tr><td class="l">邮箱:</td><td class="r"><input type="text" class="input txt" name="email" id="confirm_password" style="width:430px" placeholder="" value="'+email+'">'
+'<span id="confirm_password_tip"></span></td></tr>'
+' <tr><td class="l">账户类型:</td><td class="r"><input type="radio" class="input txt" name="account_type" value="公司" '+complany+'>公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" '+personal+'>个人'
+'<span id="confirm_password_tip"></span></td></tr>'
+' <tr><td class="l">开户银行:</td><td class="r"><input type="text" class="input txt" name="bank" id="confirm_password" style="width:430px" placeholder="" value="'+bank_card+'">'
+'<span id="confirm_password_tip"></span></td></tr>'
+' <tr> <td class="l" style="margin-top:20px">补充协议:</td><td class="r">'
+' <input type="hidden" name="agreementpic" id="" value=""/>'
+'<div id="uploader-demo" > <div id="agreementpic"><div class="webuploader-pick" style="line-height:30px" onclick="">点击上传</div></div>'
+'<div id="agreementpicList" class="uploader-list" style="display: flex;"></div></td></tr>'
+'<tr><td class="l" colspan="5"><div style="margin-top:40px;" id="tab"><span style="padding-left:20px;color:#26c7dbd4" >*须补充修改协议(联系平台签署)</span></div> </td></tr>'
+'<tr style=""><td class="l"></td><td style="margin-top:50px" class="r">'
+'<input type="submit" class="tj btn ajax-post" value="保存" style="margin-top:40px;width:200px" title="" target-form="paw_info">'
+'<input type="button" id="btn" class="tj btn ajax-post" value="返回" style="margin-top:40px;width:200px;margin-left:50px" title="" target-form="paw_info"></td> </tr></table></form>'
+'</div></div></div>'
// ,content:content
})
$("#btn").click(function() {
window.location.href = "{:U('safe/editModify')}"
})
var uploaderImgagreementpic = WebUploader.create({
// 选完文件后,是否自动上传。
auto: true,
// swf文件路径
swf: '__STATIC__/webuploader/Uploader.swf',
// 文件接收服务端。
server: "{:U('File/uploadPicture',array('session_id'=>session_id(),'flag'=>true))}",
// 选择文件的按钮。可选。
// 内部根据当前运行是创建可能是input元素也可能是flash.
pick: {
id:'#agreementpic',
multiple:true
},
// dnd: false,
paste: document.body,
accept: {
title: '图片',
extensions: 'png,gif,jpg,jpeg,bmp',
mimeTypes: '.png,.gif,.jpg,.jpeg,.bmp',
},
// 不压缩image, 默认如果是jpeg文件上传前会压缩一把再上传
resize: false,
disableGlobalDnd: true,
fileNumLimit:5,
threads:5,
thumb:true,
compress:false,
prepareNextFile: true,
formData: function(){return $.extend(true, {}, userInfo);},
chunked:false,
duplicate: true
});
var imgListagreementpicData = [];
<?php if (!empty($promoteInfo['valuedata'])) :?>
var html = '';
$('#agreementpicList').css('margin-top','10px');
<?php foreach ($promoteInfo['valuedata'] as $value1) { ?>
<?php $value1 = (int)$value1; ?>
imgListagreementpicData.push(<?=$value1?>);
html += '<div id="' + <?=$value1?> + '" class="item flooring_page_img_box" style="margin-right: 10px;">';
html += '<a href="javascript:;"><img src="<?=get_cover($value1,"path")?>" style="width: 100px;height: 100px;cursor: move;"></a>';
html += '<h4 class="info" style="text-align: center;">';
html += '<a href="javascript:;" class="jsdelzip table_click" style="float:none;display:inline-block;" img-id="' + <?=$value1?> + '">删除</a>';
html += '</h4>';
html += '<div class="progress progress-striped active" style="display: none;">';
html += '<div class="progress-bar" role="progressbar" style="width: 100%;">100%</div>';
html += '</div>';
html += '</div>';
<?php }?>
$('#agreementpicList').html(html);
$('#agreementpicList').children().children('h4').children('.jsdelzip').on('click', function() {
var thisId = $(this).attr('img-id');
$(this).parent().parent().remove();
$.each(imgListagreementpicData,function(index, item) {
if (thisId == item) {
imgListagreementpicData.splice(index,1);
return false;
}
});
setagreementpicVal();
});
<?php endif ;?>
var thisIndex1 = 0;
var imgagreementpicList = $("#agreementpicList");
uploaderImgagreementpic.on( 'fileQueued', function( file ) {
var html = '';
html += '<div id="' + file.id + '" class="item" style="margin-right: 10px;">';
html += '<a href="javascript:;"><img src="" style="width: 100px;height: 100px;cursor: move;"></a>';
html += '<h4 class="info">' + file.name + '</h4>';
html += '<p class="state">等待上传...</p>';
html += '</div>';
imgagreementpicList.append(html);
imgagreementpicList.css('margin-top','10px');
var img1 = imgagreementpicList.children('#'+file.id).find('img');
uploaderImgagreementpic.makeThumb(file, function (error, src) {
if (error) {
return;
}
img1.attr('src', src);
}, 300, 300);
});
// 文件上传过程中创建进度条实时显示。
uploaderImgagreementpic.on( 'uploadProgress', function( file, percentage ) {
var $li = $( '#'+file.id ),
$percent = $li.find('.progress .progress-bar');
// 避免重复创建
if ( !$percent.length ) {
$percent = $('<div class="progress progress-striped active">' +
'<div class="progress-bar" role="progressbar" style="width: 0%">' +
'</div>' +
'</div>').appendTo( $li ).find('.progress-bar');
}
$li.find('p.state').text('上传中');
$percent.css( 'width', percentage * 100 + '%' );
$percent.text( (percentage * 100).toFixed(0) + '%' );
});
uploaderImgagreementpic.on( 'uploadSuccess', function( file , response) {
console.log(response)
imgListagreementpicData.push(Number(response.id));
setagreementpicVal();
$( '#'+file.id ).find('p.state').text('已上传').fadeOut(800);
//alert(JSON.stringify(response));
$('#'+file.id).find('h4.info').append('<a href="javascript:;" class="jsdelzip table_click" style="float:none;display:inline-block;margin-left:10px;">删除</a>');
$('#'+file.id).find('.jsdelzip').on('click',function() {
uploaderImgagreementpic.removeFile( file.id );
$('#'+file.id).remove();
$.each(imgListagreementpicData,function(index, item) {
if (response.id == item) {
imgListagreementpicData.splice(index,1);
return false;
}
});
setagreementpicVal();
console.log(imgListagreementpicData);
return false;
});
});
function setagreementpicVal()
{
var agreementpic = '';
$.each(imgListagreementpicData,function(index, item) {
agreementpic += item + ',';
});
console.log('444444444444444444')
console.log(agreementpic)
agreementpic = agreementpic.substring(0, agreementpic.length - 1);
$('input[name=agreementpic]').val(agreementpic);
}
}
})
}
</script>
</block>
<block name="script">
<script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
<script type="text/javascript" src="__STATIC__/mail_suffix.js"></script>
<script type="text/javascript" src="__STATIC__/bank.js"></script>
</block>

@ -49,28 +49,53 @@
<block name="body" >
<script type="text/javascript" src="__STATIC__/provincecityarea/area1.js" ></script>
<?php if($promoteinfo['ver_status'] == 3) {?>
<div style="background: RGB(252,236,236);" id="tab">
<span style="padding-left:20px;color:red" >正在审核中,请耐心等待~加急,请联系您的平台对接人员</span>
</div>
<?php };?>
<?php if($promoteinfo['ver_status'] == 1) {?>
<div style="background: RGB(252,236,236);" id="tab">
<span style="padding-left:20px;color:#26c7dbd4" >认证审核成功</span>
</div>
<?php };?>
<?php if($promoteinfo['ver_status'] == 2) {?>
<div style="background: RGB(252,236,236);" id="tab">
<span style="padding-left:20px;color:red" >认证审核失败</span>
</div>
<?php };?>
<div class="page-list normal_list promote-base_info-form" style="min-height:120vh">
<div class="trunk-title">
<img src="__IMG__/20180207/icon_normal_zhanghu.png">
<span class="title_main">资质认证</span>
</div>
<div class="trunk-content article">
<div class="trunk-list baseInfo">
<!-- <div style="" id="tab">
<span style="padding-left:20px;color:#26c7dbd4" >注意:密码必须由字母与数字组合</span>
</div>-->
<form action="{:U('Safe/modifyBaseInfo')}" novalidate="novalidate" method="post" class="paw_info">
<table class="table2" style="margin-top:20px;margin-left:30px;width:100%" >
<tr>
<td class="l">真实姓名:</td>
<td class="r"><input type="text" class="input txt" name="username" id="password" style="width:430px" placeholder="{$promoteinfo['real_name']}" value="{$promoteinfo['real_name']}">
<td class="l">真实姓名{$ver_status}</td>
<td class="r">
<?php if($ver_status == 1 ){?>
<input type="text" disabled ="disabled" class="input txt" name="username" id="password" style="width:430px" placeholder="{$promoteinfo['real_name']}" value="{$promoteinfo['real_name']}">
<?php }?>
<?php if($ver_status != 1) {?>
<input type="text" class="input txt" name="username" id="password" style="width:430px" placeholder="{$promoteinfo['real_name']}" value="{$promoteinfo['real_name']}">
<?php }?>
<span id="password_tip"></span></td>
</tr>
<tr>
<td class="l">身份证号码:</td>
<td class="r"><input type="text" class="input txt" name="id_card" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['idcard']}" value="{$promoteinfo['idcard']}">
<td class="r">
<?php if($ver_status == 1 ){?>
<input type="text" disabled ="disabled" class="input txt" name="id_card" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['idcard']}" value="{$promoteinfo['idcard']}">
<?php }?>
<?php if($ver_status != 1) {?>
<input type="text" class="input txt" name="id_card" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['idcard']}" value="{$promoteinfo['idcard']}">
<?php }?>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
@ -168,7 +193,14 @@
<tr style="margin-top:50px">
<td class="l">电话:</td>
<td class="r"><input type="text" class="input txt" name="tel" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['mobile_phone']}" value="{$promoteinfo['mobile_phone']}">
<td class="r">
<?php if($ver_status == 1 ){?>
<input type="text" disabled ="disabled" class="input txt" name="tel" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['mobile_phone']}" value="{$promoteinfo['mobile_phone']}">
<?php }?>
<?php if($ver_status != 1) {?>
<input type="text" class="input txt" name="tel" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['mobile_phone']}" value="{$promoteinfo['mobile_phone']}">
<?php }?>
<span id="confirm_password_tip"></span></td>
</tr>
@ -180,7 +212,13 @@
<select id="s_province" name="s_province" class="areaselect1 select_gallery" style="width: 90px;"></select>  
<select id="s_city" name="s_city" class="areaselect2 select_gallery" style="width: 120px;"></select>  
<select id="s_county" name="s_county" class="areaselect3 select_gallery" style="width: 90px;"></select>
<input type="text" class="input txt" name="address" id="confirm_password" style="width:430px;margin-left:20px" placeholder="{$promoteinfo['address'][1]}" value="{$promoteinfo['address'][1]}">
<?php if($ver_status == 1 ){?>
<input type="text" class="input txt" disabled ="disabled" name="address" id="confirm_password" style="width:430px;margin-left:20px" placeholder="{$addr}" value="{$addr}">
<?php }?>
<?php if($ver_status != 1) {?>
<input type="text" class="input txt" name="address" id="confirm_password" style="width:430px;margin-left:20px" placeholder="{$addr}" value='{$addr}'>
<?php }?>
<script type="text/javascript" >
var pro="{:$promoteinfo['addressdata']['0']}";
var city="{:$promoteinfo['addressdata']['1']}";
@ -206,30 +244,64 @@
<tr>
<td class="l">邮箱:</td>
<td class="r"><input type="text" class="input txt" name="email" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['email']}" value="{$promoteinfo['email']}">
<td class="r">
<?php if($ver_status == 1 ){?>
<input type="text" class="input txt" disabled ="disabled" name="email" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['email']}" value="{$promoteinfo['email']}">
<?php }?>
<?php if($ver_status != 1) {?>
<input type="text" class="input txt" name="email" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['email']}" value="{$promoteinfo['email']}">
<?php }?>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
<td class="l">账户类型:</td>
<td class="r"><input type="radio" class="input txt" name="account_type" value="公司" checked="{$promoteinfo['complanystatus']}">公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" checked="{$promoteinfo['personlastatus']}">个人
<td class="l">账户类型{$promoteinfo['complanystatus']}</td>
<td class="r">
<?php if($promoteinfo['complanystatus'] == 1) {?>
<input type="radio" class="input txt" name="account_type" value="公司" checked>公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" >个人
<?php }?>
<?php if($promoteinfo['complanystatus'] == 0) {?>
<input type="radio" class="input txt" name="account_type" value="公司" >公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" checked>个人
<?php }?>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
<td class="l">开户银行:</td>
<td class="r"><input type="text" class="input txt" name="bank_name" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['bank_name']}" value="{$promoteinfo['bank_name']}">
<td class="r">
<?php if($ver_status == 1 ){?>
<input type="text" class="input txt" disabled ="disabled" name="bank_name" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['bank_name']}" value="{$promoteinfo['bank_name']}">
<?php }?>
<?php if($ver_status != 1) {?>
<input type="text" class="input txt" name="bank_name" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['bank_name']}" value="{$promoteinfo['bank_name']}">
<?php }?>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
<td class="l">银行账户名:</td>
<td class="r"><input type="text" class="input txt" name="bank_account" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['bank_account']}" value="{$promoteinfo['bank_account']}">
<td class="r">
<?php if($ver_status == 1 ){?>
<input type="text" class="input txt" disabled ="disabled" name="bank_account" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['bank_account']}" value="{$promoteinfo['bank_account']}">
<?php }?>
<?php if($ver_status != 1) {?>
<input type="text" class="input txt" name="bank_account" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['bank_account']}" value="{$promoteinfo['bank_account']}">
<?php }?>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
<td class="l">银行账号:</td>
<td class="r"><input type="text" class="input txt" name="bank_card" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['bank_card']}" value="{$promoteinfo['bank_card']}">
<td class="r">
<?php if($ver_status == 1 ){?>
<input type="text" class="input txt" disabled ="disabled" name="bank_card" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['bank_card']}" value="{$promoteinfo['bank_card']}">
<?php }?>
<?php if($ver_status != 1) {?>
<input type="text" class="input txt" name="bank_card" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['bank_card']}" value="{$promoteinfo['bank_card']}">
<?php }?>
<span id="confirm_password_tip"></span></td>
</tr>

@ -422,3 +422,9 @@ CREATE TABLE `tab_notice_read` (
`create_time` int(11) DEFAULT NULL COMMENT '创建时间',
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=utf8;
-- 2019-11-19 cxj
-- 添加索引
ALTER TABLE `tab_user_play_info` ADD INDEX `search`(`promote_id`, `game_id`, `server_id`, `create_time`);
ALTER TABLE `tab_user_login_record` ADD INDEX `search`(`promote_id`, `game_id`, `server_id`, `login_time`);
ALTER TABLE `tab_spend` ADD INDEX `search`(`promote_id`, `game_id`, `server_id`, `pay_way`, `pay_status`, `pay_time`);

Loading…
Cancel
Save