Merge branch 'release-1.0.0' into dev

master
zhengchanglong 5 years ago
commit ab5f7267e5

@ -1706,12 +1706,25 @@ function get_admin_listOther()
* @param $promote_id
* @return mixed
*/
function getOffspringByPromoteId($promote_id) {
function getOffspringByPromoteId($promote_id = null) {
if (isset($promote_id)) {
if ($promote_id ==0) {//官方渠道
$promote_ids = '0';
} else {
$where['chain'] = ['like', "%/{$promote_id}/%"];
$where['id'] = $promote_id;//会长本身
$where['_logic'] = 'or';
$map['_complex'] = $where;
$promote_ids = M('promote', 'tab_')
->where(['chain' => ['like', "%/{$promote_id}/%"]])
->where($map)
->field('group_concat(id) as promote_ids')
->find();
return $promote_ids['promote_ids'];
$promote_ids = $promote_ids['promote_ids'];
}
} else {
$promote_ids = getPowerPromoteIds();
}
return $promote_ids;
}
//导出csv 新增字段排序功能
function data2csv(&$data,$title,$fields){

@ -1072,28 +1072,29 @@ class MemberController extends ThinkController
if (isset($_REQUEST['promote_id'])) {
if (I('promote_level') ==1) {
$promote_ids = getOffspringByPromoteId($_REQUEST['promote_id']);
if (empty($promote_ids)) {
$promote_ids = -1;
}
$map['promote_id'] = ['exp', "in($promote_ids)"];
} else {
$map['promote_id'] = $_REQUEST['promote_id'];
}
unset($_REQUEST['promote_id']);
} elseif (I('promote_level') ==1) {
$promote_ids = getOffspringByPromoteId();
if ($promote_ids != 'all') {
$map['promote_id'] = ['exp', "in($promote_ids)"];
}
}
// $map['type'] = 1;
// $map['login_time'] = ['exp', 'login_time<>0'];
$extend = array();
$extend['map'] = $map;
$count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false);
$count = M('UserLoginRecord','tab_')->table('tab_user_login_record FORCE INDEX(user_id_promote_idx)')->field('user_id')->where($extend['map'])->group('user_id')->select(false);
$sql = "select count(user_id) as count from ({$count})t";
$count = M('UserLoginRecord','tab_')->query($sql);
$this->m_title = '登录记录';
$this->assign('user_count',$count[0]['count']);
$this->assign("is_admin",is_administrator());
$this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find());
parent::lists("UserLoginRecord", $p, $extend['map']);

@ -91,6 +91,7 @@ class PlatformController extends ThinkController
$data = array_slice($data, ($arraypage - 1) * $size, $size);
$this->meta_title = '游戏注册统计列表';
$this->assign('list_data', $data);
$this->assign("is_admin",is_administrator());
$this->display();
}
@ -172,6 +173,7 @@ class PlatformController extends ThinkController
$data = array_slice($data, ($arraypage - 1) * $size, $size);
$this->meta_title = '游戏充值统计列表';
$this->assign('list_data', $data);
$this->assign("is_admin",is_administrator());
$this->display();
}
@ -211,10 +213,7 @@ class PlatformController extends ThinkController
unset($_REQUEST['register_way']);
}
$promoteRoot = getPowerPromoteIds();
if ($promoteRoot) {
$map['promote_id'] =array('in',$promoteRoot);
}
setPowerPromoteIds($map);
$today = total(1);
$week = total(2);
@ -256,6 +255,7 @@ class PlatformController extends ThinkController
$this->meta_title = '注册方式统计列表';
$this->assign('list_data', $data);
$this->assign('total', $total);
$this->assign("is_admin",is_administrator());
$this->display();
}
@ -295,10 +295,7 @@ class PlatformController extends ThinkController
unset($_REQUEST['pay_way']);
}
$promoteRoot = getPowerPromoteIds();
if ($promoteRoot) {
$map['promote_id'] =array('in',$promoteRoot);
}
setPowerPromoteIds($map);
$map['pay_status'] = 1;
$today = total(1);
@ -341,6 +338,7 @@ class PlatformController extends ThinkController
$data = array_slice($data, ($arraypage - 1) * $size, $size);
$this->meta_title = '充值方式统计列表';
$this->assign('list_data', $data);
$this->assign("is_admin",is_administrator());
$this->display();
}
@ -405,7 +403,7 @@ class PlatformController extends ThinkController
count(IF(register_time ' . $mounth . ',1,null)) as mounth')
->join("tab_promote AS tp2 ON tp2.`chain` LIKE CONCAT('%/', tp1.id, '/%') OR tp2.id = tp1.id", 'left')
->join("tab_user as u on tp2.id = u.promote_id", 'left')
->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
// ->join($play_info_map ? "tab_user_play_info as upi on upi.user_id = u.id " . $play_info_map : false)
->where($map)
->group('tp1.id')
->order('count desc, register_time')
@ -465,6 +463,7 @@ class PlatformController extends ThinkController
//用array_slice(array,offset,length) 函数在数组中根据条件取出一段值;array(数组),offset(元素的开始位置),length(组的长度)
$data = array_slice($data, ($arraypage - 1) * $size, $size);
$this->meta_title = '渠道注册统计列表';
$this->assign("is_admin",is_administrator());
$this->assign('list_data', $data);
$this->assign('total', $total);
$this->display();
@ -595,6 +594,7 @@ class PlatformController extends ThinkController
$pnum = ceil(count($data) / $size); //总页数ceil()函数用于求大于数字的最小整数
$this->meta_title = '渠道充值统计列表';
$this->assign('list_data', $data);
$this->assign("is_admin",is_administrator());
$this->display();
}

@ -144,7 +144,7 @@ class RechargeSumController extends ThinkController
$this->assign('total', $total);
$this->assign('startDate', $startDateTime);
$this->assign('endDate', $endDateTime);
$this->assign("is_admin",is_administrator());
$this->m_title = '充值汇总';
$this->assign('commonset', M('Kuaijieicon')->where(['url' => 'RechargeSum/summation', 'status' => 1])->find());

@ -40,7 +40,7 @@
<div class="tb-unit-bar box_mt">
<button class="category_btn ajax-post" type="submit" target-form="save-category">确 定</button>
<button class="category_return" onclick="javascript:history.back(-1);return false;">返 回</button>
<a class="category_return" style="display: inline-block;text-align: center;top: -10px" href="{:U('index')}" ><span style=" line-height: 36px;">返 回</span></a>
</div>
</form>
</div>

@ -73,7 +73,7 @@
<button class="submit_btn ajax-post mlspacing" id="submit" type="submit" target-form="form-horizontal" >
确认
</button>
<a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back(-1);" style="color:#000000;background:#ffffff;border: solid 1px #000">
<a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('index')}" style="color:#000000;background:#ffffff;border: solid 1px #000">
返回
</a>
</div>

@ -143,7 +143,13 @@
<volist name="list_data" id="data">
<tr>
<td><input class="ids" type="checkbox" value="{$data['id']}" name="ids"></td>
<td>{$data.user_account}</td>
<td>
<if condition="$is_admin eq true ">
{$data.user_account}
<else />
{$data.user_account|encryptStr}
</if>
</td>
<?php $gamename=trim(get_game_name($data['game_id'],'id'));?>
<td><notempty name="gamename">{$gamename}<else /><eq name="data.type" value="2">APP登录<else/>官网登录</eq></notempty></td>
<!--<td><notempty name="data.server_name">{$data['server_name']}<else />空</notempty></td>-->
@ -164,7 +170,9 @@
</div>
</div>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/login_record',array_merge(['xlsname'=>'玩家_登录记录'],I('get.')))}">导出</a>
</if>
{$_page|default=''}
</div>

@ -161,6 +161,7 @@
</div>
</div>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/platform_statistics',
array(
'timestart'=>$_GET['timestart'],
@ -170,6 +171,7 @@
'xlsname'=>'统计_平台统计_游戏注册统计',
),
false)}">导出</a>
</if>
{$_page|default=''}
</div>
</block>

@ -134,9 +134,11 @@
</div>
</div>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/platform_statistics',
array('timestart'=>$_GET['timestart'],'timeend'=>$_GET['timeend'],'type'=>1,'game_name'=>$_GET['game_name'],p=>$_GET['p'],'xlsname'=>'统计_平台统计_游戏充值统计',)
,false)}">导出</a>
</if>
{$_page|default=''}
</div>
</block>

@ -126,9 +126,11 @@
</div>
</div>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/platform_statistics',
array('timestart'=>$_GET['timestart'],'timeend'=>$_GET['timeend'],'type'=>3,'pay_way'=>$_GET['pay_way'],p=>$_GET['p'],'xlsname'=>'统计_平台统计_充值方式统计')
,false)}">导出</a>
</if>
{$_page|default=''}
</div>
</block>

@ -165,9 +165,11 @@
</div>
</div>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/promote_statistics',
array('timestart'=>$_GET['timestart'],'timeend'=>$_GET['timeend'],'promote_id'=>$_GET['promote_id'],p=>$_GET['p'],'xlsname'=>'统计_推广员统计_推广员注册统计',)
,false)}">导出</a>
</if>
{$_page|default=''}
</div>
</block>

@ -141,9 +141,11 @@
</div>
</div>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/promote_statistics',
array('timestart'=>$_GET['timestart'],'timeend'=>$_GET['timeend'],'type'=>1,'promote_id'=>$_GET['promote_id'],p=>$_GET['p'],'xlsname'=>'统计_推广员统计_推广员充值统计',)
,false)}">导出</a>
</if>
{$_page|default=''}
</div>
</block>

@ -131,10 +131,11 @@
</div>
</div>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/platform_statistics',
array('timestart'=>$_GET['timestart'],'timeend'=>$_GET['timeend'],'type'=>2,'register_way'=>$_GET['register_way'],p=>$_GET['p'],'xlsname'=>'统计_平台统计_注册方式统计',)
,false)}">导出</a>
</if>
{$_page|default=''}
</div>
</block>

@ -153,7 +153,9 @@
</div>
</div>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('RechargeSum/summation',array_merge(array('export'=>1,'xlsname'=>'游戏订单_充值汇总'),I('get.')))}">导出</a>
</if>
{$_page|default=''}
</div>

@ -394,7 +394,11 @@
location.reload();
}, 1500);
} else {
var tip_msg = e.msg ? e.msg : "补单失败";
if (e.msg) {
var tip_msg = e.msg;
} else {
var tip_msg = e.info ? e.info : "补单失败";
}
layer.msg(tip_msg, {icon: 2});
}
},

@ -169,6 +169,7 @@
</table>
</div>
<div class="page">
<if condition="$is_admin eq true ">
<a class="sch-btn" href="{:U('Export/expUser',array(
'id'=>1,
'user_account'=>I('user_account'),
@ -182,6 +183,7 @@
'time_start'=>I('time_start'),
'time_end'=>I('time_end'),
))}">导出</a>
</if>
{$_page}
</div>

@ -54,7 +54,7 @@
<div class="home-fiexdBox">
<div class="home-video">
<video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
<video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls webkit-playsinline="true" playsinline="true"></video>
</div>
<div class="fiexd-heard" style="z-index: 10001">
<div class="fiexd-heardBox" style="display: none;">
@ -69,7 +69,7 @@
<?php else :?>
<div class="home-fiexd-two" style="background: #fff;width: 100%;height: 4.22rem;">
<div class="home-video">
<video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
<video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls webkit-playsinline="true" playsinline="true"></video>
</div>
<div class="fiexd-heard" style="width: 100%;position: fixed;top: 0; left: 0;background: rgba(255, 255, 255,0);display: none;z-index: 10001;">
<div class="fiexd-heardBox">

Loading…
Cancel
Save