elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Browse Source
master
ELF 5 years ago
parent 065245d657 ffd7221f1d
commit b4afa5d8b2
16 changed files with 318 additions and 165 deletions
Show Stats Download Patch File Download Diff File

9
Application/Admin/Controller/PromoteController.class.php
Unescape Escape View File

@ -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 ='编辑渠道信息';

12
Application/Admin/View/Promote/edit.html
Unescape Escape View File

@ -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="输入推广员邮箱">

30
Application/Admin/View/Promote/lists.html
Unescape Escape View File

@ -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/>
@ -116,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">
@ -161,6 +172,7 @@
<th>所属会长</th>
<th>商务专员</th>
<th>状态</th>
<th>身份状态</th>>
<th>可申请游戏</th>
<th>操作</th>
</tr>
@ -195,6 +207,24 @@
{:get_info_status($data['status'],3)}
</if>
</td>
<td>
<?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>
<a href="{:U('edit',array('id'=>$data['id']))}" class="">编辑</a>

17
Application/Base/Repository/UserRepository.class.php
Unescape Escape View File

@ -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]];
@ -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();

10
Application/Home/Controller/DownloadController.class.php
Unescape Escape View File

@ -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]];
}
@ -2397,6 +2403,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:
@ -2671,7 +2679,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');

21
Application/Home/Controller/FileController.class.php
Unescape Escape View File

@ -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);
}
}

118
Application/Home/Controller/QueryController.class.php
Unescape Escape View File

@ -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);
@ -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);
}

59
Application/Home/Controller/SafeController.class.php
Unescape Escape View File

@ -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) {
return $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 {
@ -312,8 +318,31 @@ 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);
if(empty($promoteInfo['bank_card'])) {
$promoteInfo['bank_card'] = " ";
}
if(empty($promoteInfo['email'])) {
$promoteInfo['email'] = " ";
}
if(empty($promoteInfo['real_name'])) {
$promoteInfo['real_name'] = " ";
}
if(empty($promoteInfo['mobile_phone'])) {
$promoteInfo['mobile_phone'] = " ";
}
if(empty($promoteInfo['bank_name'])) {
$promoteInfo['bank_name'] = " ";
}
if(empty($promoteInfo['idcard'])) {
$promoteInfo['idcard'] = " ";
}
$this->assign("ver_status",$promoteInfo['ver_status']);
$this->assign('promoteinfo', $promoteInfo);
@ -331,31 +360,38 @@ class SafeController extends BaseController{
$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"];
$address = $_REQUEST["address"];
$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'] = $address;
$data['address'] = json_encode($address,TRUE);
$data['email'] = $email;
$data['account_type'] = $account_type;
$data['bank_card'] = $bank;
$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("更新信息失败");
}
@ -363,7 +399,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']);
@ -371,11 +407,12 @@ class SafeController extends BaseController{
$this->assign('bank_card',$rs['bank_card']);
$res = [
'tel'=> $rs['mobile_phone'],
'address'=> $rs['address'],
'address'=> json_decode($rs['address'],false)[1],
'email'=> $rs['email'],
'account_type'=> $rs['account_type'],
'bank_card'=> $rs['bank_card'],
'idcarpic' => $rs['idcarpic'],
'anothpic' => $rs['anothpic'],
];
if($rs['account_type'] == 1) {
$res['complanystatus'] = true;

2
Application/Home/View/default/Download/listsIndex.html
Unescape Escape View File

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

2
Application/Home/View/default/Promote/children.html
Unescape Escape View File

@ -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>

15
Application/Home/View/default/Query/recharge.html
Unescape Escape View File

@ -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();

68
Application/Home/View/default/Query/register.html
Unescape Escape View File

@ -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();

27
Application/Home/View/default/Safe/editModify.html
Unescape Escape View File

@ -133,18 +133,18 @@
营业执照: <span style="color:#449acb">已认证<span>
</div>
<div class="line_text">
合作合同: <span style="color:#449acb">已认证{<span>
合作合同: <span style="color:#449acb">已认证<span>
</div>
</div>
<div class="jiesuan">
<div class="line_title">资质认证</div>
<div class="line_title">结算信息</div>
<div class="line_text">
电话: {$rs['mobile_phone']}
电话: {$tel}
</div>
<div class="line_text">
联系地址: {$rs['address']}
联系地址: {$addr}
</div>
<div class="line_text">
邮箱: {$rs['email']}
@ -175,12 +175,20 @@
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) {
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
console.log(res)
var anothpic = res.anothpic
layer.open({
type: 1
,title: false //不显示标题栏
@ -199,23 +207,26 @@
+'<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="公司" checked="'+complanystatus+'">公司<input type="radio" class="input txt" style="margin-left:20px" name="account_type" value="个人" checked="'+personalstatus+'">个人'
+' <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=""/>'
+' <input type="hidden" name="agreementpic" id="" value="'+anothpic+'"/>'
+'<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">'
+'</td> </tr></table></form>'
+'<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,

80
Application/Home/View/default/Safe/modifyBaseInfo.html
Unescape Escape View File

@ -54,6 +54,22 @@
<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 };?>
<?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">
@ -66,30 +82,30 @@
<table class="table2" style="margin-top:20px;margin-left:30px;width:100%" >
<tr>
<td class="l">真实姓名：</td>
<td class="l"><span style="color:red">*</span>真实姓名：</td>
<td class="r">
<?php if($ver_status !== 0 ){?>
<?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 === 0 ){?>
<?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="l"><span style="color:red">*</span>身份证号码：</td>
<td class="r">
<?php if($ver_status !== 0 ){?>
<?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 === 0 ){?>
<?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>
<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" >
@ -182,13 +198,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 !== 0 ){?>
<?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 === 0 ){?>
<input type="text" class="input txt" name="tel" id="confirm_password" style="width:430px" placeholder="{$promoteinfo['mobile_phone']}" value="{$promoteinfo['mobile_phone']}">
<?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>
@ -202,11 +218,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 !== 0 ){?>
<input type="text" class="input txt" disabled ="disabled" name="address" id="confirm_password" style="width:430px;margin-left:20px" placeholder="" 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 === 0 ){?>
<input type="text" class="input txt" name="address" id="confirm_password" style="width:430px;margin-left:20px" placeholder="" value="{$promoteinfo['address'][1]}">
<?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" >
@ -233,12 +249,12 @@
</tr>
<tr>
<td class="l">邮箱：</td>
<td class="l"><span style="color:red">*</span>邮箱：</td>
<td class="r">
<?php if($ver_status !== 0 ){?>
<?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 === 0 ){?>
<?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 }?>
@ -246,17 +262,23 @@
</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"><span style="color:red">*</span>账户类型{$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="l"><span style="color:red">*</span>开户银行：</td>
<td class="r">
<?php if($ver_status !== 0 ){?>
<?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 === 0 ){?>
<?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 }?>
@ -264,12 +286,12 @@
</tr>
<tr>
<td class="l">银行账户名：</td>
<td class="l"><span style="color:red">*</span>银行账户名：</td>
<td class="r">
<?php if($ver_status !== 0 ){?>
<?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 === 0 ){?>
<?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 }?>
@ -277,12 +299,12 @@
</tr>
<tr>
<td class="l">银行账号：</td>
<td class="l"><span style="color:red">*</span>银行账号：</td>
<td class="r">
<?php if($ver_status !== 0 ){?>
<?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 === 0 ){?>
<?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 }?>

2
Application/Media/View/default/Article/article/detail1.html
Unescape Escape View File

@ -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>

11
Data/update.sql
Unescape Escape View File

@ -422,3 +422,14 @@ 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`);
--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`;

Write Preview
Loading…
Cancel
Save