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

master
“用lww 5 years ago
commit a13e8a5152

@ -662,6 +662,10 @@ class SiteStatAddon extends Addon
$msgc = M('Msg', 'tab_')->where(array('user_id' => UID, 'status' => 2))->count();//站内通知
$daiban['msgc'] = $msgc;
$ver = M('promote','tab_')->where(['ver_status'=>3])->count();
$editver = M('promote','tab_')->where(['ver_status'=>4])->count();
$daiban['ver'] = $ver;
$daiban['editver'] = $editver;
$this->assign('daiban', $daiban);
}

@ -61,7 +61,7 @@ $(document).ready(function () {
</h5>
</div>
<div class="bd wait zwm_wait">
<div class="bd wait zwm_wait" style="overflow-y:scroll;">
<table cellpadding="1" cellspacing="1">
<thead>
<tr>
@ -70,17 +70,19 @@ $(document).ready(function () {
<th style="text-align: center;">待办数量</th>
</tr>
</thead>
<tbody class="athover">
<tbody class="athover">
<tr>
<td>【推广员管理</td>
<td>推广员申请待审核数</td>
<td style="text-align:center;"><a href="{:U('Promote/lists',array('model'=>'promote','status'=>0))}" target="_blank"><span>{$daiban['pcount']}</span></a></td>
<td>【资质审核</td>
<td>推广员身份认证审核</td>
<td><a href="{:U('promote/lists',array('ver_status'=>3))}" target="_blank"><span>{$daiban['ver']}</span></a></td>
</tr>
<tr>
<td>【推广员提现】</td>
<td>推广员提现待审核数</td>
<td><a href="{:U('Query/withdraw',array('status'=>0))}" target="_blank"><span>{$daiban['withc']}</span></a></td>
</tr>
<td>【修改资质审核】</td>
<td>推广员身份修改认证审核</td>
<td><a href="{:U('promote/lists',array('ver_status'=>4))}" target="_blank"><span>{$daiban['editver']}</span></a></td>
</tr>
<tr>
<td>【开发者管理】</td>
<td>开发者申请待审核数</td>
@ -121,6 +123,16 @@ $(document).ready(function () {
<td>推广员包待更新数</td>
<td><a href="{:U('Msg/lists',array('status'=>'未读'))}" target="_blank"><span>{$daiban['msgc']}</span></a></td>
</tr>
<tr>
<td>【推广员管理】</td>
<td>推广员申请待审核数</td>
<td style="text-align:center;"><a href="{:U('Promote/lists',array('model'=>'promote','status'=>0))}" target="_blank"><span>{$daiban['pcount']}</span></a></td>
</tr>
<tr>
<td>【推广员提现】</td>
<td>推广员提现待审核数</td>
<td><a href="{:U('Query/withdraw',array('status'=>0))}" target="_blank"><span>{$daiban['withc']}</span></a></td>
</tr>
</tbody>
</table>

@ -260,7 +260,8 @@ function all_pay_way($type=false)
// $pay_way[5]=array('key'=>6,'value'=>'汇付宝');
/* $pay_way[6]=array('key'=>7,'value'=>"苹果支付");
*/
$pay_way[7]=array('key'=>8,'value'=>'金猪');
$pay_way[7]=array('key'=>8,'value'=>'金猪');
$pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷');
return $pay_way;
}
/* //获取支付方式 */
@ -306,6 +307,9 @@ function get_pay_way($id=null)
case 10:
return "双乾支付-银联";
break;
case 15:
return "双乾支付-快捷";
break;
}
}
function get_pay_way_map($id) {
@ -1442,6 +1446,7 @@ function cash_pay_way()
/* $pay_way[6]=array('key'=>7,'value'=>"苹果支付");
*/
$pay_way[7]=array('key'=>8,'value'=>'金猪');
$pay_way[15]=array('key'=>15,'value'=>'双乾支付-快捷');
return $pay_way;
}

@ -196,7 +196,7 @@ unset($_REQUEST['parent_id']);
$idcardpic = $data["idcarpic"];
$businesspic = $data['businesspic'];
$agreementpic = $data["agreementpic"];
$anothpic = $data["anothpic"];
if(!empty($idcardpic)) {
$idcardpicArr = explode(',', $idcardpic);
foreach ($idcardpicArr as $key => $value) {
@ -215,9 +215,16 @@ unset($_REQUEST['parent_id']);
$agreementpicImg[$key] = get_cover($value2, 'path');
}
}
if(!empty($anothpic)) {
$anothpicArr = explode(',', $anothpic);
foreach ($anothpicArr as $key => $value3) {
$anothpicImg[$key] = get_cover($value3, 'path');
}
}
$this->assign("agreementpicimg",$agreementpicImg);
$this->assign('businesspicImg',$businesspicImg);
$this->assign('idcardimg',$idcardImg);
$this->assign('anothpicimg',$anothpicImg);
$this->assign('data',$data);
$this->meta_title ='编辑渠道信息';

@ -254,7 +254,7 @@ class UserController extends AdminController {
if (!empty($usernameUser)) {
$this->error('用户名已存在!');
}
$emailUser = M('UcenterMember', 'sys_')->field('username')->where(['username' => $username])->find();
$emailUser = M('UcenterMember', 'sys_')->field('id')->where(['email' => $email])->find();
if (!empty($emailUser)) {
$this->error('邮箱已存在!');
}

@ -130,6 +130,18 @@
</div>
</td>
</tr>
<tr>
<td class="l">补充认证:</td>
<td class="r">
<div id="businesspicList" class="uploader-list" style="display: flex;">
<?php if(!empty($anothpicimg)):?>
<?php foreach ($anothpicimg as $key => $info3):?>
<a href="javascript:;"><img src="<?php echo $info3?>" style="width: 100px;height: 100px;cursor: move;"></a>
<?php endforeach;?>
<?php endif;?>
</div>
</td>
</tr>
<td class="l">邮箱:</td>
<td class="r">
<input type="text" class="txt" name="email" value="{$data['email']}" placeholder="输入推广员邮箱">

@ -117,6 +117,16 @@
<option value="0">待审核</option>
</select>
</div>
<div class="input-list input-list-channelstatus">
<select name="ver_status">
<option value="">审核状态</option>
<option value="0">未认证</option>
<option value="1">审核成功</option>
<option value="2">审核失败</option>
<option value="3">审核中</option>
<option value="4">修改审核中</option>
</select>
</div>
<else/>
<div class="input-list input-list-channelstatus">
<select name="url_type">
@ -199,11 +209,21 @@
</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>
<?php if($data['ver_status'] == 1) {?>
<span>成功</span>
<?php }?>
<?php if(intval($data['ver_status']) == 2) {?>
<span>拒绝</span>
<?php }?>
<?php if(intval($data['ver_status']) == 3) {?>
<span>正在审核</span>
<?php }?>
<?php if(intval($data['ver_status']) == 4) {?>
<span>修改审核中</span>
<?php }?>
<?php if(intval($data['ver_status']) == 0) {?>
<span>未认证</span>
<?php }?>
</td>
<td><a class="ajax-view" data-id="{$data.id}">查看</a></td>
<td>

@ -234,7 +234,6 @@ class PromoteRepository {
$resultMap = ['_string' => 'user_id in (' . $inQuery . ')'];
$items = M('user_play_info', 'tab_')->field(['count(*) count', 'promote_id'])->where($resultMap)->group('promote_id')->select();
$records = [];
foreach ($items as $item) {
$promoteId = $item['promote_id'];
@ -260,10 +259,10 @@ class PromoteRepository {
if (count($ids) == 0) {
return [];
}
$params['time_column'] = 'login_time';
$params['time_column'] = 'create_time';
$map = $this->getPublicAchievementMap($ids, $params);
$promoteIds = $map['promote_id'][1];
$items = M('login_daily_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 = [];
@ -272,13 +271,13 @@ class PromoteRepository {
$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();
$rows = M('login_daily_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) {
$promoteId = $item['promote_id'];
@ -372,21 +371,31 @@ class PromoteRepository {
$params['time_column'] = 'pay_time';
$map = $this->getPublicAchievementMap($ids, $params);
$items = M('spend', 'tab_')->field(['sum(pay_amount) amount', 'promote_id', 'pay_way'])->where($map)->group('promote_id, pay_way')->select();
// echo M()->getLastSql();die();
$records = [];
foreach ($items as $item) {
$promoteId = $item['promote_id'];
if (isset($params['basicPromotes'][$promoteId])) {
$promoteId = $params['basicPromotes'][$promoteId];
}
if ($item['pay_way'] == -1) {
$records[$item['promote_id']]['ban_coin'] = $item['amount'];
if (isset($records[$promoteId]) && isset($records[$promoteId]['ban_coin'])) {
$records[$promoteId]['ban_coin'] += $item['amount'];
} else {
$records[$promoteId]['ban_coin'] = $item['amount'];
}
} elseif ($item['pay_way'] == 0) {
$records[$item['promote_id']]['coin'] = $item['amount'];
if (isset($records[$promoteId]) && isset($records[$promoteId]['coin'])) {
$records[$promoteId]['coin'] += $item['amount'];
} else {
$records[$promoteId]['coin'] = $item['amount'];
}
} else {
if (isset($records[$item['promote_id']])) {
$records[$item['promote_id']]['cash'] = isset($records[$item['promote_id']]['cash']) ?
$records[$item['promote_id']]['cash'] + $item['amount'] :
$item['amount'];
if (isset($records[$promoteId]) && isset($records[$promoteId]['cash'])) {
$records[$promoteId]['cash'] = $item['amount'];
} else {
$records[$item['promote_id']]['cash'] = $item['amount'];
$records[$promoteId]['cash'] = $item['amount'];
}
}
}
foreach ($ids as $id) {

@ -39,7 +39,6 @@ class UserRepository
$beginTime = $params['begin_time'] ?? 0;
$endTime = $params['end_time'] ?? 0;
$gameId = $params['game_id'] ?? 0;
$serverId = $params['server_id'] ?? 0;
$ids = $params['promote_id'] ?? [];
$conditions = [];
@ -48,9 +47,6 @@ class UserRepository
if ($gameId > 0) {
$conditions['game_id'] = $gameId;
}
if ($serverId > 0) {
$conditions['server_id'] = $serverId;
}
$conditions['pay_way'] = $isBan ? ['neq', '-10'] : ['neq', '-1'];
return $conditions;
@ -67,9 +63,6 @@ class UserRepository
$conditions['promote_id'] = ['in', $ids];
if (!empty($gameIds)) {
$conditions['game_id'] = ['in', $gameIds];
if (!empty($params['server_id'])) {
$conditions['server_id'] = $params['server_id'];
}
}
$conditions[$params['time_column']] = ['between', [$beginTime, $endTime]];
@ -122,9 +115,9 @@ class UserRepository
public function getLoginCountGroupByDay($params)
{
$dayList = $params['dayList'] ?? [];
$params['time_column'] = 'login_time';
$params['time_column'] = 'create_time';
$conditions = $this->getDayGroupConditions($params);
$items = M('user_login_record', 'tab_')->field('FROM_UNIXTIME(login_time, "%Y-%m-%d") as day, count(DISTINCT user_id) as count')
$items = M('login_daily_record', 'tab_')->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day, count(DISTINCT user_id) as count')
->where($conditions)
->group('day')
->select();
@ -138,9 +131,9 @@ class UserRepository
public function getLoginCountGroupByDayNew($params)
{
$dayList = $params['dayList'] ?? [];
$params['time_column'] = 'login_time';
$params['time_column'] = 'create_time';
$conditions = $this->getDayGroupConditions($params);
$items = M('user_login_record', 'tab_')->field('FROM_UNIXTIME(login_time, "%Y-%m-%d") as day, count(DISTINCT user_id, game_id) as count')
$items = M('login_daily_record', 'tab_')->field('FROM_UNIXTIME(create_time, "%Y-%m-%d") as day, count(DISTINCT user_id, game_id) as count')
->where($conditions)
->group('day')
->select();
@ -154,17 +147,17 @@ class UserRepository
public function getLoginCountGroupByGame($params)
{
$gameIds = $params['game_ids'] ?? [];
$params['time_column'] = 'login_time';
$params['time_column'] = 'create_time';
$conditions = $this->getGameGroupConditions($params);
if (isset($params['all_data'])) {
$sql = M('user_login_record', 'tab_')->field('distinct game_id, user_id')
$sql = M('login_daily_record', 'tab_')->field('distinct game_id, user_id')
->where($conditions)
->fetchSql(true)
->select();
$model = new \Think\Model();
return $model->query("select count(*) as num from ($sql) as t")[0]['num'];
} else {
$items = M('user_login_record', 'tab_')->field('game_id, count(DISTINCT user_id) as count')
$items = M('login_daily_record', 'tab_')->field('game_id, count(DISTINCT user_id) as count')
->where($conditions)
->group('game_id')
->select();

@ -407,6 +407,7 @@ class DownloadController extends BaseController {
if (!empty($payOrderNumber)) {
$map['pay_order_number'] = $payOrderNumber;
}
if (!empty($begTime) && empty($endTime)) {
$map['pay_time'] = ['egt', $begTime];
} elseif (empty($begTime) && !empty($endTime)) {
@ -1582,12 +1583,12 @@ class DownloadController extends BaseController {
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]];
$begtime1 = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
$endtime1 = $nowTime;
$map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]];
}
if(!empty($begtime) && !empty($endtime)) {
$map["apply_time"] = ["between",[$begtime,$endtime]];
$map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime)]];
}
$serverField = '';
$serverJoin = '';
@ -1790,7 +1791,7 @@ class DownloadController extends BaseController {
$params['end_time'] = $endTime;
unset($map['apply_time']);
}
if(!empty($map['tab_server.server_id'])) {
if(!empty($map['tab_server.server_id'])) {
$serverJoin = 'tab_server on tab_server.game_id = tab_apply.game_id';
$params['server_id'] = $map['tab_server.server_id'];
}
@ -2403,6 +2404,8 @@ class DownloadController extends BaseController {
foreach ($data as &$list) {
//提现状态
$list['pay_order_number'] = $this->encryption($list['pay_order_number']);
$list['user_account'] = $this->encryption($list['user_account']);
if ($list['pay_status'] == 1) {
switch ($list['selle_status']) {
case 0:
@ -2677,7 +2680,7 @@ class DownloadController extends BaseController {
if(!empty($map['promote_id'])) {
$spendMap['promote_id'] = $map['promote_id'];
}
$map['create_time'] = ['between', [strtotime(date('Y-m-d 00:00:00')) - 31*24*3600, strtotime(date('Y-m-d 23:59:59'))]];
$map['create_time'] = ['between', [strtotime(date('Y-m-d 00:00:00')) - 6*24*3600, strtotime(date('Y-m-d 23:59:59'))]];
$roles = M('user_play_info','tab_')->where($map)->select();
$roleIds = array_column($roles, 'role_id');

@ -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();
}
@ -1310,20 +1252,7 @@ class QueryController extends BaseController
$allGameIs = array_column($allGameIs, 'game_id');
$records = [];
$allData['role_num'] = 0;
$allData['user_num'] = 0;
$allData['new_user_num'] = 0;
$allData['new_device_num'] = 0;
$allData['new_ip_num'] = 0;
$allData['login_user_num'] = 0;
$allData['spend_user_num'] = 0;
$allData['spend_num'] = 0;
$allData['spend_all_amount'] = 0;
$allData['spend_cash'] = 0;
$allData['spend_generic'] = 0;
$allData['spend_binding'] = 0;
$allData['spend_discount'] = 0;
$allData['spend_voucher'] = 0;
$allData = [];
if (!empty($data)) {
if (intval($endTime - $begTime) / (24 * 3600) <= 31) {
$gameIds = array_column($data, 'game_id');
@ -1386,6 +1315,8 @@ class QueryController extends BaseController
$allData['spend_generic'] = $spendRepository->getPayAmountByGameAndType($params);//通用币充值
$params['pay_way'] = -1;
$allData['spend_binding'] = $spendRepository->getPayAmountByGameAndType($params);//绑定币充值
$allData['spend_discount'] = 0;
$allData['spend_voucher'] = 0;
}
}
@ -1975,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);
@ -2068,33 +2004,33 @@ class QueryController extends BaseController
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);
$selfCreateRoleCountList = $promoteRepository->getCreateRoleCountByIds([$parent['id']], $selfParams);
$selfCreateRoleUserCountList = $promoteRepository->getCreateRoleUserCountByIds([$parent['id']], $selfParams);
$selfNewCreateRoleUserCountList = $promoteRepository->getNewCreateRoleUserCountByIds([$parent['id']], $selfParams);
// $selfNewCreateRoleDeviceCountList = $promoteRepository->getNewCreateRoleDeviceCountByIds([$parent['id']], $selfParams);
$selfNewCreateRoleIpCountList = $promoteRepository->getNewCreateRoleIpCountByIds([$parent['id']], $selfParams);
$selfLoginUserCountList = $promoteRepository->getLoginUserCountByIds([$parent['id']], $selfParams);
$selfRechargeCountList = $promoteRepository->getRechargeCountByIds([$parent['id']], $selfParams);
$selfRechargeUserCountList = $promoteRepository->getRechargeUserCountByIds([$parent['id']], $selfParams);
$selfRechargeAmountList = $promoteRepository->getRechargeAmountByIds([$parent['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'],
'create_role_count' => $selfCreateRoleCountList[$parent['id']],
'create_role_user_count' => $selfCreateRoleUserCountList[$parent['id']],
'new_create_role_user_count' => $selfNewCreateRoleUserCountList[$parent['id']],
// 'new_create_role_device_count' => $selfNewCreateRoleDeviceCountList[$parent['id']],
'new_create_role_ip_count' => $selfNewCreateRoleIpCountList[$parent['id']],
'login_user_count' => $selfLoginUserCountList[$parent['id']],
'recharge_count' => $selfRechargeCountList[$parent['id']],
'recharge_user_count' => $selfRechargeUserCountList[$parent['id']],
'recharge_amount' => $selfRechargeAmountList[$parent['id']]['ban_coin'] + $rechargeAmountList[$parent['id']]['coin'] + $rechargeAmountList[$parent['id']]['cash'],
'recharge_by_ban_coin' => $selfRechargeAmountList[$parent['id']]['ban_coin'],
'recharge_by_coin' => $selfRechargeAmountList[$parent['id']]['coin'],
'recharge_by_cash' => $selfRechargeAmountList[$parent['id']]['cash'],
'current_display' => $currentDisplay,
];
}
@ -2134,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();
}

@ -153,12 +153,17 @@ class SafeController extends BaseController{
//修改用户信息
public function modifyBaseInfo() {
$metaTitle = '基础信息';
$modelList = ['基础信息', $metaTitle];
$this->verifyPasswordView($modelList);
$id = get_pid();
$ver_status = M('promote','tab_')->where(['id'=>$id])->getField('ver_status',true);
if($ver_status[0] == 1) {
//return $this->display('editModify');
$this->redirect('editModify');
}
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'];
@ -258,6 +263,7 @@ class SafeController extends BaseController{
$data['idcarpic'] = $idcarpic;
$data['businesspic'] = $businesspic;
$data['agreementpic'] = $agreementpic;
$data['ver_status'] = 3;
if($account_type == "公司") {
$data['account_type'] = 1;
}else {
@ -313,8 +319,6 @@ 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);
@ -330,12 +334,13 @@ class SafeController extends BaseController{
$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)) {
/* if(!empty($anothpic)) {
$idcarpicArr = explode(',', $anothpic);
foreach ($idcarpicArr as $key => $value) {
$promoteInfo['valuedata'][$key] = $value;
}
}
} */
$promoteInfo = "";
$address = json_decode($rs['address'],false)[1];
$this->assign('addr',$address);
$this->assign('ver_status',$rs['ver_status']);
@ -353,6 +358,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;
@ -361,13 +402,13 @@ class SafeController extends BaseController{
$data['email'] = $email;
$data['account_type'] = $account_type;
$data['bank_card'] = $bank;
$data['ver_status'] = 3;
$data['ver_status'] = 4;
// $data['agreementpic'] = $
$data['anothpic'] = $agreementpic;
$id = get_pid();
$updateRs = M("promote","tab_")->where(['id'=>$id])->save($data);
if($updateRs) {
$this->success("更新信息成功");
$this->success("更新信息成功",U('modifyBaseInfo'));
}else {
$this->error("更新信息失败");
}
@ -375,7 +416,7 @@ class SafeController extends BaseController{
public function ajaxEdit() {
$id = get_pid();
$rs = M("promote","tab_")->field('mobile_phone,address,email,account_type,bank_card')->where(['id'=>$id])->find();
$rs = M("promote","tab_")->field('mobile_phone,address,email,account_type,bank_card,anothpic')->where(['id'=>$id])->find();
$this->assign('tel',$rs['mobile_phone']);
$this->assign('address',$rs['address']);
$this->assign('email',$rs['email']);
@ -388,6 +429,7 @@ class SafeController extends BaseController{
'account_type'=> $rs['account_type'],
'bank_card'=> $rs['bank_card'],
'idcarpic' => $rs['idcarpic'],
'anothpic' => $rs['anothpic'],
];
if($rs['account_type'] == 1) {
$res['complanystatus'] = true;

@ -61,14 +61,14 @@
</select>
</div>
<div class="form-group normal_space fr">
<input type="text" class="txt range-date" name="time" placeholder="起止时间" value="{:I('time', date('Y-m-d'))}" >
<input type="text" class="txt range-date" name="time" placeholder="起止时间" value="{$time}" >
</div>
<div class="form-group">
<input type="submit" class="submit normal_space" value="查询">
</div>
<?php if ($prevParentId > 0):?>
<div class="form-group">
<a class="submit normal_space" href="{:U('Query/achievement', ['row'=>I('get.row'), 'parent_id' => $prevParentId])}" style="line-height: 36px; display: inline-block; text-align: center; background: #E5E5E5; color: #2bd8ed; cursor: pointer;">返回上级</a>
<a class="submit normal_space" href="{:U('Query/achievement', ['row'=>I('get.row'), 'parent_id' => $prevParentId,'time'=>$time])}" style="line-height: 36px; display: inline-block; text-align: center; background: #E5E5E5; color: #2bd8ed; cursor: pointer;">返回上级</a>
</div>
<?php endif;?>
</form>

@ -80,7 +80,7 @@
<div class="form-group normal_space">
<select id="relation_game_id" name="relation_game_id" class="reselect select_gallery">
<option value="">请选择游戏</option>
<option value="0">请选择游戏</option>
<volist name=":get_promote_serach_game()" id="vo">
<option value="{$vo.relation_game_id}" title="{$vo.relation_game_name}">{$vo.relation_game_name}</option>
</volist>
@ -98,7 +98,7 @@
<div class="form-group normal_space">
<select id="server_id" name="server_id" class=" reselect select_gallery">
<option value="">请选择区服</option>
<option value="0">请选择区服</option>
<volist name="serverData" id="vo">
<option value="{$vo.server_id}">{$vo.server_name}</option>
</volist>
@ -152,7 +152,8 @@
<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')}" />
<input type="checkbox" name="own_id" id="own_id" style="display: none;" value="1"
<if condition="$ownId eq 1"> checked="checked" </if> />
</label>
</div>
<!-- <input type="hidden" name="version" value="{:I('version',1)}"> -->
@ -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 = "<option value='' selected>推广员账号</option>";
if (promoteId > 0) {
html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
$.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 += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>";
}
}
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);
}
});

@ -79,7 +79,8 @@
<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')}" />
<input type="checkbox" name="own_id" id="own_id" style="display: none;" value="1"
<if condition="$ownId eq 1"> checked="checked" </if> />
</label>
</div>
</div>
@ -126,7 +127,7 @@
</div>
<div class="pagenation clearfix">
<?php if ($loginer['level'] !== 4) :?>
<a id="sch-btn" data-href="{:U('download/regist_data_export',array_merge(['xlsname'=>'ceshi'],I('post.')))}" class="ajax-get">导出</a>
<a id="sch-btn" data-href="{:U('download/regist_data_export',array_merge(['xlsname'=>'ceshi'],I('get.')))}" class="ajax-get">导出</a>
<?php endif ;?>
{$_page}
</div>
@ -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 = "<option value='' selected>推广员账号</option>";
if (promoteId > 0) {
html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
$.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 += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>";
}
}
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);
}
});

@ -175,6 +175,7 @@
success:function(res) {
var tel = res.tel
var address = res.address
console.log(res)
var email = res.email
var account_type = res.account_type
if(account_type == 1) {
@ -187,7 +188,7 @@
var bank_card = res.bank_card
var complanystatus = res.complanystatus
var personalstatus = res.personalstatus
var anothpic = res.anothpic
layer.open({
type: 1
,title: false //不显示标题栏

@ -63,7 +63,13 @@
<div style="background: RGB(252,236,236);" id="tab">
<span style="padding-left:20px;color:red" >认证审核失败</span>
</div>
<?php };?>
<?php };?>
<?php if($promoteinfo['ver_status'] == 4) {?>
<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">
@ -76,30 +82,28 @@
<table class="table2" style="margin-top:20px;margin-left:30px;width:100%" >
<tr>
<td class="l">真实姓名{$ver_status}</td>
<td class="l"><span style="color:red">*</span>真实姓名:</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 }?>
<if condition="$ver_status eq 1">
<input type="text" disabled ="disabled" class="input txt" name="username" id="password" style="width:430px" value="{$promoteinfo['real_name']}">
<else />
<input type="text" class="input txt" name="username" id="password" style="width:430px" value="{$promoteinfo['real_name']}">
</if>
<span id="password_tip"></span></td>
</tr>
<tr>
<td class="l">身份证号码:</td>
<td class="l"><span style="color:red">*</span>身份证号码:</td>
<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 }?>
<if condition="$ver_status eq 1">
<input type="text" disabled ="disabled" class="input txt" name="id_card" id="confirm_password" style="width:430px" value="{$promoteinfo['idcard']}">
<else />
<input type="text" class="input txt" name="id_card" id="confirm_password" style="width:430px" value="{$promoteinfo['idcard']}">
</if>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
<td class="l">身份证证件:</td>
<td class="l"><span style="color:red">*</span>身份证证件:</td>
<td class="r">
<input type="hidden" name="idcarpic" id="cover_id_{$field.name}" value="{$promoteinfo['idcarpic']}"/>
<div id="uploader-demo" >
@ -192,14 +196,13 @@
</tr>
<tr style="margin-top:50px">
<td class="l">电话:</td>
<td class="l"><span style="color:red">*</span>电话:</td>
<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 }?>
<if condition="$ver_status eq 1">
<input type="text" disabled ="disabled" class="input txt" name="tel" id="confirm_password" style="width:430px" value="{$promoteinfo['mobile_phone']}">
<else />
<input type="text" class="input txt" name="tel" id="confirm_password" style="width:430px" value="{$promoteinfo['mobile_phone']}">
</if>
<span id="confirm_password_tip"></span></td>
</tr>
@ -212,12 +215,11 @@
<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>
<?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 }?>
<if condition="$ver_status eq 1">
<input type="text" class="input txt" disabled ="disabled" name="address" id="confirm_password" style="width:430px;margin-left:20px" value="{$addr}">
<else />
<input type="text" class="input txt" name="address" id="confirm_password" style="width:430px;margin-left:20px" value='{$addr}'>
</if>
<script type="text/javascript" >
var pro="{:$promoteinfo['addressdata']['0']}";
@ -243,64 +245,59 @@
</tr>
<tr>
<td class="l">邮箱:</td>
<td class="l"><span style="color:red">*</span>邮箱:</td>
<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 }?>
<if condition="$ver_status eq 1">
<input type="text" class="input txt" disabled ="disabled" name="email" id="confirm_password" style="width:430px" value="{$promoteinfo['email']}">
<else />
<input type="text" class="input txt" name="email" id="confirm_password" style="width:430px" value="{$promoteinfo['email']}">
</if>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
<td class="l">账户类型{$promoteinfo['complanystatus']}</td>
<td class="l"><span style="color:red">*</span>账户类型{$promoteinfo['complanystatus']}</td>
<td class="r">
<?php if($promoteinfo['complanystatus'] == 1) {?>
<if condition="$ver_status eq 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) {?>
<else />
<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 }?>
</if>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
<td class="l">开户银行:</td>
<td class="l"><span style="color:red">*</span>开户银行:</td>
<td class="r">
<?php if($ver_status == 1 ){?>
<if condition="$ver_status eq 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 }?>
<else />
<input type="text" class="input txt" name="bank_name" id="confirm_password" style="width:430px" value="{$promoteinfo['bank_name']}">
</if>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
<td class="l">银行账户名:</td>
<td class="l"><span style="color:red">*</span>银行账户名:</td>
<td class="r">
<?php if($ver_status == 1 ){?>
<if condition="$ver_status eq 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 }?>
<else />
<input type="text" class="input txt" name="bank_account" id="confirm_password" style="width:430px" value="{$promoteinfo['bank_account']}">
</if>
<span id="confirm_password_tip"></span></td>
</tr>
<tr>
<td class="l">银行账号:</td>
<td class="l"><span style="color:red">*</span>银行账号:</td>
<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 }?>
<if condition="$ver_status eq 1">
<input type="text" class="input txt" disabled ="disabled" name="bank_card" id="confirm_password" style="width:430px" value="{$promoteinfo['bank_card']}">
<else />
<input type="text" class="input txt" name="bank_card" id="confirm_password" style="width:430px" value="{$promoteinfo['bank_card']}">
</if>
<span id="confirm_password_tip"></span></td>
</tr>

@ -68,7 +68,7 @@
<div class="service_info">
<div class="service_left">
<div class="list">
<li class="selected" onclick="javascript:void (alert('123'))">监护工程概述</li>
<li class="selected">监护工程概述</li>
<li class="" >申请服务流程</li>
<li class="" >监护工程概述</li>
<li class="" >健康提示</li>

@ -57,6 +57,7 @@ class UcenterMemberModel extends Model{
array('reg_ip', 'get_client_ip', self::MODEL_INSERT, 'function', 1),
array('update_time', NOW_TIME),
array('status', 'getStatus', self::MODEL_BOTH, 'callback'),
array('openid_sign', '0', self::MODEL_INSERT)
);
/**
@ -117,7 +118,12 @@ class UcenterMemberModel extends Model{
if($data = $this->create($data)){
$data['username'] = $username;
$data['email'] = $email;
$status = M('UcenterMember', 'sys_')->data($data)->add();
try {
$status = M('UcenterMember', 'sys_')->add($data);
} catch (\Throwable $th) {
$status = false;
dump($th);
}
$uid = 0;
if ($status) {
$uid = M()->getLastInsID();

@ -428,3 +428,15 @@ CREATE TABLE `tab_notice_read` (
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`);
--sdk
ALTER TABLE `tab_pay_info`
MODIFY COLUMN `order_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '平台订单ID' AFTER `game_id`,
ADD COLUMN `extend` varchar(255) NOT NULL DEFAULT '' COMMENT 'cp订单ID' AFTER `game_id`;
--广
ALTER TABLE `tab_promote`
CHANGE COLUMN `ver_status` `ver_status` INT(11) NULL DEFAULT '0' COMMENT '资质认证审核状态(1是审核成功2审核失败3未审核,4修改认证)' AFTER `child_game_permission`,
ADD COLUMN `anothpic` CHAR(254) NULL DEFAULT NULL AFTER `account_type`;
Loading…
Cancel
Save