diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php index 8db3fc557..44cb0b5c3 100644 --- a/Application/Admin/Controller/AjaxController.class.php +++ b/Application/Admin/Controller/AjaxController.class.php @@ -77,6 +77,8 @@ class AjaxController extends ThinkController{ $game_map = []; if ($game_name) { $game_map['relation_game_name'] = $game_name; + }else { + $this->AjaxReturn([]); } if ($sdk_version) { $map['server_version'] = $game_map['sdk_version'] = $sdk_version; diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index ec5612d45..7ed604212 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -9,34 +9,27 @@ class BehaviorLogController extends ThinkController { $params = I('get.'); - $ignoreData = ['p', 'row', 'timestart', 'timeend', 'promote_id']; $map = []; - // if (isset($params['user_account'])) { - // $map['user_account'] = $params['user_account']; - // } - // if (isset($params['extend'])) { - // $map['extend'] = $params['extend']; - // } - // if (isset($params['game_name'])) { - // $map['game_name'] = $params['game_name']; - // } - // if (isset($params['server_name'])) { - // $map['server_name'] = $params['server_name']; - // } - // if (isset($params['sdk_version'])) { - // $map['sdk_version'] = $params['sdk_version']; - // } - // if (isset($params['user_nickname'])) { - // $map['user_nickname'] = $params['user_nickname']; - // } - // if (isset($params['game_player_id'])) { - // $map['game_player_id'] = $params['game_player_id']; - // } - foreach ($params as $k => $v) { - if (!in_array($k, $ignoreData)) { - $map[$k] = $v; - } + if (isset($params['user_account'])) { + $map['user_account'] = $params['user_account']; + } + if (isset($params['extend'])) { + $map['extend'] = $params['extend']; + } + if (isset($params['game_name'])) { + $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')]; + $map['game_id'] = $game_id; + } + if (isset($params['server_name'])) { + $map['server_name'] = $params['server_name']; } + if (isset($params['user_nickname'])) { + $map['user_nickname'] = $params['user_nickname']; + } + if (isset($params['game_player_id'])) { + $map['game_player_id'] = $params['game_player_id']; + } + $p = $params['p'] ? $params['p'] : 1; $row = $params['row'] ? $params['row'] : 10; @@ -46,16 +39,15 @@ class BehaviorLogController extends ThinkController $startTime = strtotime($startDate); $endTime = strtotime($endDate) + 86399; $map['create_time'] = array('BETWEEN', [$startTime, $endTime]); - if ($promoteId = I('promote_id')) { + if (isset($params['promote_id'])) { + $promoteId = $params['promote_id']; if ($promoteId == 0) { $map['promote_id'] = 0; } else { $promoteMap['chain'] = ['like', "%/$promoteId/%"]; $promoteIds = M('Promote', 'tab_')->where($promoteMap)->getField('id', true); - if(empty($promoteIds)) { - $promoteIds[] = $promoteIds; - } - $map['promote_id'] = ['in', $promoteIds]; + $promoteIds[] = $promoteId; + $map['promote_id'] = ['in', $promoteIds]; } } $data = M('pay_info', 'tab_')->where($map)->order('id DESC')->page($p, $row)->select(); diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 7cd7b86cb..2e6b1472d 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -52,14 +52,18 @@ class ExportController extends Controller $xlsName = $_REQUEST['xlsname']; switch ($id) { case 1: +// $xlsCell = array( +// array('user_account', "玩家账号"), +// array('game_name', "游戏名称"), +// array('server_name', L('Game_area_clothing')), +// array('role_name', "角色名"), +// array('role_level', "游戏等级"), +// array('play_time', "最后登录时间", 'time_format', '*'), +// array('play_ip', "最后登录ip"), +// ); $xlsCell = array( - array('user_account', "玩家账号"), - array('game_name', "游戏名称"), - array('server_name', L('Game_area_clothing')), - array('role_name', "角色名"), - array('role_level', "游戏等级"), - array('play_time', "最后登录时间", 'time_format', '*'), - array('play_ip', "最后登录ip"), + "创建时间","玩家账号", "游戏名称","游戏区服", L('Game_area_clothing'), "角色ID", "角色名", "游戏等级","所属推广员", + "最后登录时间", '最后登录ip', ); if (isset($_REQUEST['game_name'])) { $map['game_name'] = ['like', trim($_REQUEST['game_name'])."%"]; @@ -95,10 +99,53 @@ class ExportController extends Controller $promoter_ids ? $map['promote_id'] = ['in', implode(',', array_column($promoter_ids, 'id'))] : null; } } - $xlsData = M('user_play_info', 'tab_') + + $csvFileName = $xlsName.'.csv'; + //设置好告诉浏览器要下载excel文件的headers + header('Content-Description: File Transfer'); + header('Content-Type: application/vnd.ms-excel'); + header('Content-Disposition: attachment; filename="'. $csvFileName .'"'); + header('Expires: 0'); + header('Cache-Control: must-revalidate'); + header('Pragma: public'); + $fp = fopen('php://output', 'a');//打开output流 + mb_convert_variables('GBK', 'UTF-8', $xlsCell); + fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中 + + $accessNum = M('user_play_info', 'tab_') ->where($map) - ->order('play_time desc') - ->select(); + ->order('play_time desc') + ->count(); +// $accessNum =$accessNum['count']; + + $perSize = 5000;//每次查询的条数 + $pages = ceil($accessNum / $perSize); + $lastId = 0; + + + for($i = 1; $i <= $pages; $i++) { + + $xlsData = M('user_play_info', 'tab_') + ->field("create_time,user_account,game_name,server_id,server_name,role_id,role_name,role_level,promote_account,play_time,play_ip") + ->where($map) + ->limit(($i-1)*$perSize ,$perSize) + ->order('play_time desc') + ->select(); + + foreach($xlsData as $value) { + $value['create_time'] = date("Y-m-d H:i:s",$value['create_time']); + $value['play_time'] = date("Y-m-d H:i:s",$value['play_time']); + mb_convert_variables('GBK', 'UTF-8', $value); + fputcsv($fp, $value); + $lastId = $value['id']; + } + unset($xlsData);//释放变量的内存 + //刷新输出缓冲到浏览器 + ob_flush(); + flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 + } + fclose($fp); + exit(); break; case 2: $xlsName = $xlsName?$xlsName:"渠道注册"; @@ -339,10 +386,10 @@ class ExportController extends Controller $field = 'a.id,a.account,a.promote_account,a.balance, IFNULL(sum(ss.pay_amount),0) AS recharge_total,a.gold_coin,a.alipay ,a.id as small_count,a.id as vip_level,a.register_type,register_time,a.login_time - ,a.register_ip,a.lock_status,a.age_status,a.register_way'; + ,a.register_ip,a.device_number,a.lock_status,check_status,a.age_status,a.register_way'; $xlsCell = [L('Account_number_ID'),"玩家账号",L('Subordinate_channel'), "账户平台币" , "累计充值", "金币", "绑定支付宝", "小号", "VIP等级", "注册方式", L('Registration_time'), - "最后登录时间", L('Register_iP'), L('Account_status')]; + "最后登录时间", L('Register_iP'), "设备号" ,L('Account_status'), "拉黑状态"]; $map['tab_user.register_type']=['in','1,2']; $map['tab_user.register_type']=['in','0,1,2,7']; @@ -645,7 +692,9 @@ class ExportController extends Controller $xlsData[$k]['register_time'] = date('Y-m-d H:i:s',$xlsData[$k]['register_time']); $xlsData[$k]['login_time'] = date('Y-m-d H:i:s',$xlsData[$k]['login_time']); + $xlsData[$k]['device_number'] = encryption($xlsData[$k]['device_number']); $xlsData[$k]['lock_status'] = $xlsData[$k]['lock_status']==1?'正常':'锁定'; + $xlsData[$k]['check_status'] = $xlsData[$k]['check_status']==1?'正常':'已拉黑'; $xlsData[$k]['register_type'] = $v['register_type'] == 2?'手机号':($v['register_type']==7?'邮箱':'账号'); @@ -1753,6 +1802,62 @@ class ExportController extends Controller $xlsData[$key]['developers'] = get_developers_account($value['developers'],'account'); } break; + case 21: + $xlsCell = array( + array('extend', 'CP订单号'), + array('create_time', '充值时间'), + array('user_account', '玩家账号'), + array('game_name', '游戏名称'), + array('server_name', '游戏区服'), + array('promote_account', '所属推广员'), + array('game_player_id', '角色ID'), + array('game_player_name', '角色名称'), + array('price', '订单金额'), + ); + $params = I('get.'); + + $map = []; + if (isset($params['user_account'])) { + $map['user_account'] = $params['user_account']; + } + if (isset($params['extend'])) { + $map['extend'] = $params['extend']; + } + if (isset($params['game_name'])) { + $game_id = ['in', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')]; + $map['game_id'] = $game_id; + } + if (isset($params['server_name'])) { + $map['server_name'] = $params['server_name']; + } + if (isset($params['user_nickname'])) { + $map['user_nickname'] = $params['user_nickname']; + } + if (isset($params['game_player_id'])) { + $map['game_player_id'] = $params['game_player_id']; + } + + $startDate = empty($params['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $params['timestart']; + $endDate = empty($params['timeend']) ? date('Y-m-d') : $params['timeend']; + $startTime = strtotime($startDate); + $endTime = strtotime($endDate) + 86399; + $map['create_time'] = array('BETWEEN', [$startTime, $endTime]); + if ($promoteId = I('promote_id')) { + if ($promoteId == 0) { + $map['promote_id'] = 0; + } else { + $promoteMap['chain'] = ['like', "%/$promoteId/%"]; + $promoteIds = M('Promote', 'tab_')->where($promoteMap)->getField('id', true); + $promoteIds[] = $promoteId; + $map['promote_id'] = ['in', $promoteIds]; + } + } + $xlsData = M('pay_info', 'tab_')->where($map)->order('id DESC')->select(); + foreach($xlsData as $k => $v) { + $xlsData[$k]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); + } + break; + default: $xlsName = $xlsCell = $xlsData = []; @@ -5517,7 +5622,7 @@ if ($key == 'model'){ $map['tab_user.account']=array('like','%'.$_REQUEST['account'].'%'); unset($_REQUEST['account']); } - + $map['register_type'] = array('in','(0,1,2,3,4,5,6,7)'); $csvFileName = $xlsName.'.csv'; //设置好告诉浏览器要下载excel文件的headers header('Content-Description: File Transfer'); @@ -6876,5 +6981,84 @@ if ($key == 'model'){ return $data; } + /** + * 推广补链 + * @author 鹿文学 + */ + public function Support_list() { + $xlsName = $_REQUEST['xlsname']; + + $model = M('user','tab_'); + + $xlsCell = array( + '一级渠道','玩家账号','游戏名称','区服','角色名','申请额度','扶持类型','备注','申请时间','可用额度','实际发放额度','状态' + ); + + if(I('promote_id')){ + $map['promote_id']=I('promote_id'); + } + if(I('game_id')){ + $map['game_id']=I('game_id'); + } + if(!empty(I('apply_type')) || I('apply_type')==='0'){ + $map['apply_type']=I('apply_type'); + } + // + if(!empty(I('apply_status')) || I('apply_status')==='0'){ + $map['apply_status']=I('apply_status'); + } + + $csvFileName = $xlsName.'.csv'; + //设置好告诉浏览器要下载excel文件的headers + header('Content-Description: File Transfer'); + header('Content-Type: application/vnd.ms-excel'); + header('Content-Disposition: attachment; filename="'. $csvFileName .'"'); + header('Expires: 0'); + header('Cache-Control: must-revalidate'); + header('Pragma: public'); + $fp = fopen('php://output', 'a');//打开output流 + mb_convert_variables('GBK', 'UTF-8', $xlsCell); + fputcsv($fp, $xlsCell);//将数据格式化为CSV格式并写入到output流中 + + $accessNum=M('test_resource','tab_')->where($map)->count(); + + $perSize = 5000;//每次查询的条数 + $pages = ceil($accessNum / $perSize); + + for($i = 1; $i <= $pages; $i++) { + /* 获取频道列表 */ + $xlsData = M('test_resource','tab_') + ->field('promote_account,user_account,game_name,server_name,role_name, + apply_resource,apply_type,apply_remark,create_time,id as max_quota,verify_resource,apply_status') + ->where($map) + ->order('id desc') + ->select(); + + foreach($xlsData as $key => $value) { + + $value['create_time'] = date("Y-m-d H:i:s", $value['create_time']); + $value['max_quota'] = max_quota($value['game_id'],$value['promote_id']); + $value['apply_type'] = $value['apply_type']==0?'新增扶持':'后续扶持'; + if($value['apply_status'] == 1) { + $value['apply_status'] = '拒绝'; + } else if ($value['apply_status'] == 2) { + $value['apply_status'] = '通过'; + } else { + $value['apply_status'] = '待审核'; + } + + mb_convert_variables('GBK', 'UTF-8', $value); + fputcsv($fp, $value); + + } + unset($xlsData);//释放变量的内存 + //刷新输出缓冲到浏览器 + ob_flush(); + flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 + } + fclose($fp); + exit(); + + } } diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index e78b40125..5638da792 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -347,6 +347,7 @@ class GameController extends ThinkController $phone['dow_icon'] = $sibling['dow_icon']; $phone['back_map'] = $sibling['back_map']; $phone['flooring_page_video'] = $sibling['flooring_page_video']; + $phone['flooring_page_video_cover'] = $sibling['flooring_page_video_cover']; $phone['supersign_status'] = $sibling['supersign_status']; M('Game', 'tab_')->data($phone)->where(array('id' => $another['id']))->save(); //同时修改代充游戏折扣 diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 439c2cc3d..f6c322d5f 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -826,6 +826,7 @@ class MemberController extends ThinkController $this->m_title = '登录记录'; $this->assign('user_count',$count[0]['count']); + $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Member/login_record', 'status' => 1])->find()); parent::lists("UserLoginRecord", $p, $extend['map']); diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html index 446c5a642..97b53ae2f 100644 --- a/Application/Admin/View/BehaviorLog/index.html +++ b/Application/Admin/View/BehaviorLog/index.html @@ -169,7 +169,7 @@
- + 导出 {$_page|default=''}
diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 9bfe4fbee..595e67d20 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -384,6 +384,26 @@ + + 落地页视频封面 + + + +
+
+
+
上传封面
+
+
+ +
+
+
+ + 安卓视频封面 图片大小不得超过1M 图片比例：610 * 343 + + + ios视频是否置顶： @@ -1272,6 +1292,118 @@ $( '#'+file.id ).find('.progress').fadeOut(); }); + //上传落地页视频封面 + var uploaderFlooringVideoPageCover = WebUploader.create({ + // 选完文件后，是否自动上传。 + auto: true, + // swf文件路径 + swf: '__STATIC__/webuploader/Uploader.swf', + // 文件接收服务端。 + server: "{:U('File/uploadPicture',array('session_id'=>session_id(),'flag'=>true))}", + // 选择文件的按钮。可选。 + // 内部根据当前运行是创建，可能是input元素，也可能是flash. + pick: { + id:'#flooring_page_video_cover', + multiple:true + }, + // dnd: false, + paste: document.body, + accept: { + title: '图片', + extensions: 'png,gif,jpg,jpeg,bmp', + mimeTypes: '.png,.gif,.jpg,.jpeg,.bmp', + }, + // 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！ + resize: false, + disableGlobalDnd: true, + fileNumLimit:1, + threads:1, + thumb:true, + compress:false, + prepareNextFile: true, + formData: function(){return $.extend(true, {}, userInfo);}, + chunked:false, + duplicate: true + }); + + // 当有文件被添加进队列的时候 + uploaderFlooringVideoPageCover.on( 'fileQueued', function( file ) { + var html = ''; + var imgList = $("#flooring_page_video_cover_thelist"); + html += '
'; + html += ''; + html += '

' + file.name + '

'; + html += '

等待上传...

'; + html += '
'; + + imgList.html(html); + imgList.css('margin-top','10px'); + + var img2 = imgList.children('#'+file.id).find('img'); + uploaderFlooringVideoPageCover.makeThumb(file, function (error, src) { + if (error) { + return; + } + img2.attr('src', src); + }, 300, 300); + }); + + // 文件上传过程中创建进度条实时显示。 + uploaderFlooringVideoPageCover.on( 'uploadProgress', function(file, percentage) { + var $li = $( '#'+file.id ), + $percent = $li.find('.progress .progress-bar'); + // 避免重复创建 + if ( !$percent.length ) { + $percent = $('
' + + '
' + + '
' + + '
').appendTo( $li ).find('.progress-bar'); + } + $li.find('p.state').text('上传中'); + $percent.css( 'width', percentage * 100 + '%' ); + $percent.text( (percentage * 100).toFixed(0) + '%' ); + }); + + uploaderFlooringVideoPageCover.on( 'uploadSuccess', function( file , response) { + $( '#'+file.id ).find('p.state').text('已上传').fadeOut(800); + $('#'+file.id).find('h4.info').append('删除'); + console.log(response); + + var cover = response.id; + $("input[name=flooring_page_video_cover]").val(cover); + $('#'+file.id).find('.jsdelvideo').on('click',function() { + console.log(file); + $("input[name=flooring_page_video_cover]").val(''); + $('#'+file.id).remove(); + uploaderFlooringVideoPageCover.removeFile( file.id ); + return false; + }); + }); + + var flooringVideoPageCover = []; + + var html = ''; + + html += '
'; + html += '" style="width: 150px;height: 84px;cursor: move;">'; + html += '

'; + html += '删除'; + html += '

'; + html += ''; + html += '
'; + + $('#flooring_page_video_cover_thelist').css('margin-top','10px'); + $('#flooring_page_video_cover_thelist').html(html); + + $('#flooring_page_video_cover_thelist').children().children('h4').children('.jsdelzip').on('click', function() { + $(this).parent().parent().remove(); + + $("input[name=flooring_page_video_cover]").val(''); + }); + + var uploaderFile = WebUploader.create({ // 选完文件后，是否自动上传。 auto: true, diff --git a/Application/Admin/View/Member/login_record.html b/Application/Admin/View/Member/login_record.html index 8de70f9e1..7165ab834 100644 --- a/Application/Admin/View/Member/login_record.html +++ b/Application/Admin/View/Member/login_record.html @@ -145,7 +145,8 @@ {$data.user_account} - {$gamename}APP登录平台登录 + {$gamename} + --{$data.login_time|date='Y-m-d H:i:s',###} diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index a9acb9286..2d88c9f05 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -119,7 +119,7 @@ @@ -475,12 +475,14 @@ $(function(){ }) var game_server = "{:I('server_name')}"; $("#game_type").change(function(){ + console.log({sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}) $.ajax({ url:"{:U('Ajax/getGmeServer')}", type:"post", data:{sdk_version:$("#game_type option:selected").val(), game_name:$("#game_name option:selected").val()}, dataType:'json', success:function(data){ + console.log(data) str = ""; for (var i in data){ str += "" diff --git a/Application/Admin/View/Spend/lists.html b/Application/Admin/View/Spend/lists.html index 4c52357aa..ea64fb7c6 100644 --- a/Application/Admin/View/Spend/lists.html +++ b/Application/Admin/View/Spend/lists.html @@ -169,7 +169,7 @@ - aOh! 暂时还没有内容! + aOh! 暂时还没有内容! @@ -212,7 +212,6 @@ - 补单 @@ -227,19 +226,17 @@ - - 汇总 - + 当页充值：{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))} - 今日充值：{$ttotal} - 昨日充值：{$ytotal} + + 累计充值：{$total}（此处只汇总充值成功的订单） - + diff --git a/Application/Admin/View/Support/lists.html b/Application/Admin/View/Support/lists.html index 344fc096d..8c82c84d7 100644 --- a/Application/Admin/View/Support/lists.html +++ b/Application/Admin/View/Support/lists.html @@ -170,6 +170,7 @@
+ 导出 {$_page|default=''}
diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php index 7fe9e4803..36e236668 100644 --- a/Application/Common/Common/extend.php +++ b/Application/Common/Common/extend.php @@ -1691,17 +1691,18 @@ function array_order($arr){ */ function set_show_time($time = null,$type='time',$tab_type=''){ $date = ""; - switch ($type) { - case 'date': - $date = date('Y-m-d ',$time); - break; - case 'time': - $date = date('Y-m-d H:i',$time); - break; - default: - $date = date('Y-m-d H:i:s',$time); - break; - } + // switch ($type) { + // case 'date': + // $date = date('Y-m-d ',$time); + // break; + // case 'time': + // $date = date('Y-m-d H:i',$time); + // break; + // default: + // $date = date('Y-m-d H:i:s',$time); + // break; + // } + $date = date('Y-m-d H:i:s',$time); if(empty($time)){//若为空 根据不同情况返回 if($tab_type==''){ return "暂无登录"; diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index fbb3391bc..1b4ba9afa 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1194,7 +1194,7 @@ class DownloadController extends BaseController { empty(I('game_player_name')) || $map['tab_pay_info.game_player_name'] = ['like', '%' . I('game_player_name') . '%']; empty(I('user_account')) || $map['tab_pay_info.user_account'] = ['like', '%' . I('user_account') . '%']; empty(I('extend')) || $map['tab_pay_info.extend'] = I('extend'); - empty(I('user_id')) || $map['tab_pay_info.user_id'] = I('user_id'); + empty(I('user_id')) || $map['tab_pay_info.game_player_id'] = I('user_id'); if (!empty($begTime) && !empty($endTime)) { $map['tab_pay_info.create_time'] = ['between', [strtotime($begTime), strtotime($endTime) - 1]]; }else if (empty($begTime) && !empty($endTime)) { @@ -1305,7 +1305,7 @@ class DownloadController extends BaseController { $payStatus = intval(I('pay_status')); if (in_array($payStatus, array_keys(self::$payStatus))) { - $map['tab_spend.pay_status'] = $payStatus; + $map['tab_spend.pay_status'] = $payStatus + 2; } } $conditions = json_encode($map,TRUE); @@ -1786,7 +1786,6 @@ class DownloadController extends BaseController { $map[$key] = $value; } } - // var_dump($dataname);die(); switch ($dataname) { case "注册明细数据": $this->registerExcelInfo($id,$map); //注册明细 @@ -1904,7 +1903,7 @@ class DownloadController extends BaseController { $csvData['game_name'] = $v['game_name']; $csvData['promote_id'] = $v['promote_id']; $csvData['server_name'] = $v['server_name']; - $csvData['user_id'] = $v['user_id']; + $csvData['user_id'] = $v['game_player_id']; $csvData['game_player_name'] = $v['game_player_name']; $csvData['price'] = $v['price']; mb_convert_variables('GBK', 'UTF-8', $csvData); @@ -3300,6 +3299,9 @@ class DownloadController extends BaseController { '付款时间', ); $model = M('spend','tab_'); + if(!empty($map['tab_spend.pay_status'])) { + $map['tab_spend.pay_status'] = $map['tab_spend.pay_status'] -2 ; + } $data1 = $model ->field('tab_spend.id') ->join('tab_game on tab_spend.game_id = tab_game.id') @@ -3307,7 +3309,6 @@ class DownloadController extends BaseController { ->where($map) ->order('tab_spend.id desc') ->select(); - $csvFileName = $xlsName.'.csv'; //设置好告诉浏览器要下载excel文件的headers header('Content-Description: File Transfer'); @@ -3354,13 +3355,13 @@ class DownloadController extends BaseController { } foreach ($data as $key1 => $value1) { $value1['pay_way'] = $this->payWay[$value1['pay_way']]; - $value1['pay_time'] = date('Y-m-d H:i:s',$value1['pay_time']); $value1['p_p_proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; $value1['p_proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; $value1['proinfo'] = $value1['pro_account'].'('.$value1['pro_real_name'].')'; // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12); $value1['user_account'] = $this->encryption($value1['user_account']); $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']); + $value1['pay_time'] = ($value1['pay_status'] == 1) ? date('Y-m-d H:i:s', $value1['pay_time']) : '--'; $value1['pay_status'] = isset(self::$payStatus[$value1['pay_status']]) ? self::$payStatus[$value1['pay_status']] : "未知状态"; $value1['sdk_version'] = getSDKTypeName($value1['sdk_version']); switch ($value1['level']) { diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 6470429ae..8d79381f1 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -179,6 +179,7 @@ class HomeController extends Controller 'game_size', 'introduction', 'flooring_page_video', + 'flooring_page_video_cover', 'supersign_status', 'ios_video_top' ]; @@ -209,6 +210,7 @@ class HomeController extends Controller $imageUrls[] = get_cover($imageId, 'path'); } $game['flooring_page_imgs'] = $imageUrls; + $game['flooring_page_video_cover'] = get_cover($game['flooring_page_video_cover'], 'path'); $screenshotIds = explode(',', $game['screenshot']) ?? []; $screenshotUrls = []; diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index 2f4829fb0..b9172645d 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -57,7 +57,7 @@ class PlayersController extends BaseController { $map['tab_pay_info.extend'] = $extend; } if (!empty($userId)) { - $map['tab_pay_info.user_id'] = $userId; + $map['tab_pay_info.game_player_id'] = $userId; } if (!empty($begTime) && !empty($endTime)) { $map['tab_pay_info.create_time'] = ['between', [$begTime, $endTime - 1]]; @@ -68,7 +68,6 @@ class PlayersController extends BaseController { } $page = intval(I('get.p', 1)); $page = $page ? $page : 1; //默认显示第一页数据arraypage - $row=10; $rs = M('pay_info','tab_')->where($map)->order('tab_pay_info.create_time desc') ->page($page, $row)->select(); foreach($rs as $key => $v) { @@ -98,13 +97,13 @@ class PlayersController extends BaseController { $parameter['level_promote_2'] = $levelPromote[0]; $parameter['level_promote_3'] = $levelPromote[1]; $parameter['level_promote_4'] = $levelPromote[2]; - $serverData = $this->getServer($relationGameId, $sdkVersion); + $serverData = $this->getServer(I('relation_game_id'), I('sdk_version')); $page = set_pagination($count, $row, $parameter); if ($page) { $this->assign('_page', $page); } $this->assign('listData',$rs); - $this->assign('serverData', $serverData); + $this->assign('serverData', $serverData['data']); $this->assign('initBegTime', I('begtime')); $this->assign('initEndTime', I('endtime')); $this->display(); @@ -171,4 +170,10 @@ class PlayersController extends BaseController { return $result; } + public function getServerAjax() + { + $serverData = $this->getServer(I('relation_game_id'), I('sdk_version')); + + $this->ajaxReturn($serverData); + } } \ No newline at end of file diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 631b0cdd0..31add93cd 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -174,6 +174,7 @@ class QueryController extends BaseController break; } $list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8); + $list['pay_time'] = ($list['pay_status'] == 1) ? date('Y-m-d H:i:s', $list['pay_time']) : '--'; $list['pay_status'] = isset(QueryController::$payStatus[$list['pay_status']]) ? QueryController::$payStatus[$list['pay_status']] : '未知状态'; $list['sdk_version'] = getSDKTypeName($list['sdk_version']); diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index 0dce88c12..b9b47fe62 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -48,32 +48,36 @@
style="height: 0" > -
+
- -
- -
- + +
+ +
+ -
- +
+
+
-
+
+
-