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

master
liuweiwen 5 years ago
commit 166a868543

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

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

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

@ -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();
//同时修改代充游戏折扣

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

@ -169,7 +169,7 @@
</div>
</div>
<div class="page">
<!-- <a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>7,'xlsname'=>'游戏订单_游戏充值'),I('get.')))}">导出</a> -->
<a class="sch-btn" href="{:U('Export/expUser',array_merge(array('id'=>21,'xlsname'=>'游戏充值预下单'),I('get.')))}">导出</a>
{$_page|default=''}
</div>

@ -384,6 +384,26 @@
</td>
</tr>
<tr class="picbox">
<td class="l noticeinfo" >落地页视频封面</td>
<td class="r">
<span class="table_btn table_upload table_icon" style="float: none;">
<input type="hidden" name="flooring_page_video_cover" value="{$data['flooring_page_video_cover']}" />
<div id="uploadImg" class="wu-example">
<div class="btns">
<div id="flooring_page_video_cover">
<div class="webuploader-pick" style="line-height:13px">上传封面</div>
</div>
</div>
<!--用来存放文件信息-->
<div id="flooring_page_video_cover_thelist" class="uploader-list" style="display: flex;">
</div>
</div>
</span>
<span class="notice-text">安卓视频封面 图片大小不得超过1M 图片比例610 * 343</span>
</td>
</tr>
<tr>
<td class="l">ios视频是否置顶</td>
<if condition="$data['ios_video_top'] eq 1">
@ -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 += '<div id="' + file.id + '" class="item" style="margin-right: 10px;">';
html += '<a href="javascript:;"><img src="" style="width: 150px;height: 84px;cursor: move;"></a>';
html += '<h4 class="info">' + file.name + '</h4>';
html += '<p class="state">等待上传...</p>';
html += '</div>';
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 = $('<div class="progress progress-striped active">' +
'<div class="progress-bar" role="progressbar" style="width: 0%">' +
'</div>' +
'</div>').appendTo( $li ).find('.progress-bar');
}
$li.find('p.state').text('上传中');
$percent.css( 'width', percentage * 100 + '%' );
$percent.text( (percentage * 100).toFixed(0) + '%' );
});
uploaderFlooringVideoPageCover.on( 'uploadSuccess', function( file , response) {
$( '#'+file.id ).find('p.state').text('已上传').fadeOut(800);
$('#'+file.id).find('h4.info').append('<a href="javascript:;" class="jsdelvideo table_click" style="float:none;display:inline-block;margin-left:10px;">删除</a>');
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 = [];
<?php if (!empty($data['flooring_page_video_cover'])) :?>
var html = '';
<?php $flooringVideoPageCover = $data['flooring_page_video_cover']; ?>
html += '<div id="' + <?=$flooringVideoPageCover?> + '" class="item" style="margin-right: 10px;">';
html += '<a href="javascript:;"><img src="<?=get_cover($flooringVideoPageCover,"path")?>" style="width: 150px;height: 84px;cursor: move;"></a>';
html += '<h4 class="info" style="text-align: center;">';
html += '<a href="javascript:;" class="jsdelzip table_click" style="float:none;display:inline-block;" img-id="' + <?=$flooringVideoPageCover?> + '">删除</a>';
html += '</h4>';
html += '<div class="progress progress-striped active" style="display: none;">';
html += '<div class="progress-bar" role="progressbar" style="width: 100%;">100%</div>';
html += '</div>';
html += '</div>';
$('#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('');
});
<?php endif ;?>
var uploaderFile = WebUploader.create({
// 选完文件后,是否自动上传。
auto: true,

@ -145,7 +145,8 @@
<td><input class="ids" type="checkbox" value="{$data['id']}" name="ids"></td>
<td>{$data.user_account}</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="gamename">{$gamename}
</notempty></td>
<!--<td><notempty name="data.server_name">{$data['server_name']}<else />空</notempty></td>-->
<!--<td>{$data['game_player_name']}</td>-->
<td><empty name='data["login_time"]'>--<else/>{$data.login_time|date='Y-m-d H:i:s',###}</empty> </td>

@ -119,7 +119,7 @@
<select id="game_name" name="game_name" class="select_gallery" >
<option value="">游戏名称</option>
<volist name=":getAllGame()" id="vo">
<option value="{$vo.game_name}" <?php echo $vo.relation_game_name == I('game_name') ? 'selected':''; ?> >{$vo.game_name}</option>
<option value="{$vo.game_name}" <if condition="$vo.game_name eq I('game_name')">selected</if> >{$vo.game_name}</option>
</volist>
</select>
</div>
@ -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 = "<option value=''>请选择区服</option>";
for (var i in data){
str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"

@ -169,7 +169,7 @@
<!-- 列表 -->
<tbody>
<empty name="list_data">
<td colspan="15" class="text-center">aOh! 暂时还没有内容!</td>
<td colspan="17" class="text-center">aOh! 暂时还没有内容!</td>
<else/>
<volist name="list_data" id="data">
<tr>
@ -212,7 +212,6 @@
</if>
</td>
<td style="text-indent:0;">
<if condition="$data['pay_game_status'] eq 0 and $data['pay_status'] eq 1">
<a class=" budan" href="javascript:void(0);"
href-data="{$data.pay_order_number}" href-hhh="{:U('Repair/repairEdit')}" style="width:100%;">补单</a>
@ -227,19 +226,17 @@
</volist>
</empty>
<tr class="data_summary">
<td>汇总</td>
<td colspan="6">
<td colspan="16">
当页充值:{:null_to_0(array_sum(array_column(array_status2value('pay_status','',$list_data),'pay_amount')))}
今日充值:{$ttotal}
昨日充值:{$ytotal}
<!-- 今日充值:{$ttotal}-->
<!-- 昨日充值:{$ytotal}-->
累计充值:{$total}(此处只汇总充值成功的订单)
</td>
<td colspan="99" style="color: #a9a9a9;">
<!--<td colspan="99" style="color: #a9a9a9;">
今日充值:今日平台所有推广员的累计充值(包括官方渠道)/
昨日充值:昨日平台所有推广员的累计充值(包括官方渠道)
</td>
</td>-->
</tr>
</tbody>
</table>

@ -170,6 +170,7 @@
</div>
</div>
<div class="page">
<a class="sch-btn" href="{:U('Export/Support_list',array_merge(array('xlsname'=>'扶持发放'),I('get.')))}">导出</a>
{$_page|default=''}
</div>
</block>

@ -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 "暂无登录";

@ -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']) {

@ -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 = [];

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

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

@ -48,32 +48,36 @@
<!--落地页视频置顶-->
<?php if ($game['ios_video_top'] == 1):?>
<div class="home-fiexd" <?php if (empty($game['flooring_page_video'])):?> style="height: 0" <?php endif;?> >
<div class="home-fiexdBox">
<div class="home-fiexdBox">
<?php if (!empty($game['flooring_page_video'])):?>
<div class="home-video">
<video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
</div>
<?php endif;?>
<?php if (!empty($game['flooring_page_video'])):?>
<div class="home-video">
<video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
</div>
<?php endif;?>
<div class="fiexd-heard">
<div class="fiexd-heardBox" style="display: none;">
<!-- <div>完成</div>-->
<img src="{$game['icon']}" alt="" style="">
<div class="download">下载</div>
</div>
<div class="fiexd-heard" style="z-index: 10001">
<div class="fiexd-heardBox" style="display: none;">
<!-- <div>完成</div>-->
<img src="{$game['icon']}" alt="" style="">
<div class="download">下载</div>
</div>
</div>
</div>
</div>
<!--落地页视频不置顶-->
<?php else:?>
<div class="home-fiexd-two" style="background: #fff;width: 100%;height: 4.22rem;">
<div class="home-fiexd-two" style="background: #fff;width: 100%;
<?php if (empty($game['flooring_page_video'])):?>height: 0; <?php else :?> height: 4.22rem; <?php endif;?>
">
<?php if (!empty($game['flooring_page_video'])):?>
<div class="home-video">
<video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted 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;">
<?php endif;?>
<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">
<img src="{$game['icon']}" alt="" style="">
<div class="download">下载</div>
@ -83,165 +87,165 @@
<?php endif;?>
<div class="home-box">
<div class="heard">
<div style="height: 2.5rem;width: 2.5rem">
<img src="{$game['icon']}" alt="">
</div>
<div class="right">
<div>{$game['relation_game_name']}</div>
<div>{$game['features']}</div>
<div>
<?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
<div class="download">免费安装</div>
<?php else :?>
<div class="download">免费安装</div>
<?php endif ;?>
<img src="__IMG__/wenhao.png" class="doubt" alt="">
</div>
<div class="home-box">
<div class="heard">
<div style="height: 2.5rem;width: 2.5rem">
<img src="{$game['icon']}" alt="">
</div>
<div class="right">
<div>{$game['relation_game_name']}</div>
<div>{$game['features']}</div>
<div>
<?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
<div class="download">免费安装</div>
<?php else :?>
<div class="download">免费安装</div>
<?php endif ;?>
<img src="__IMG__/wenhao.png" class="doubt" alt="">
</div>
</div>
<div class="evaluate">
<div class="evaluate-box">
<div class="number">
<span>{$game['game_score']}</span>
</div>
<div class="evaluate">
<div class="evaluate-box">
<div class="number">
<span>{$game['game_score']}</span>
<div class="start">
<div class="iconImg ">
<div style=" width: <?php echo round($game['game_score']/5, 2)*100 ?>%;"></div>
</div>
</div>
<div class="start">
<div class="iconImg ">
<div style=" width: <?php echo round($game['game_score']/5, 2)*100 ?>%;"></div>
</div>
</div>
<div class="grade">14.48K个评分</div>
</div>
<div class="evaluate-box" style="display: none">
<span>#{$game['recommend_level']}</span>
<div class="grade">网络游戏</div>
</div>
<div class="evaluate-box">
<span>16+</span>
<div class="grade">年龄</div>
</div>
<div class="grade">14.48K个评分</div>
</div>
<div class="slide_list">
<ul class="slide-box">
<volist name="game['screenshot']" id="item">
<li class="slide-item">
<img src="{$item}" alt="">
</li>
</volist>
</ul>
<div class="evaluate-box" style="display: none">
<span>#{$game['recommend_level']}</span>
<div class="grade">网络游戏</div>
</div>
<div class="synopsis">
<div>简介</div>
<div id="brief_introduction">{$game['introduction']}</div>
<div id="look_more">
<div class="bg-blur"></div>
<div class="more">查看更多</div>
</div>
<div class="evaluate-box">
<span>16+</span>
<div class="grade">年龄</div>
</div>
<div class="appraisal">
<div class="title">评分及评论</div>
<div class="appraisal-box">
<div class="left">
<span>{$game['game_score']}</span>
<span>满分5分</span>
</div>
<div class="slide_list">
<ul class="slide-box">
<volist name="game['screenshot']" id="item">
<li class="slide-item">
<img src="{$item}" alt="">
</li>
</volist>
</ul>
</div>
<div class="synopsis">
<div>简介</div>
<div id="brief_introduction">{$game['introduction']}</div>
<div id="look_more">
<div class="bg-blur"></div>
<div class="more">查看更多</div>
</div>
</div>
<div class="appraisal">
<div class="title">评分及评论</div>
<div class="appraisal-box">
<div class="left">
<span>{$game['game_score']}</span>
<span>满分5分</span>
</div>
<div class="right">
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="strip">
<div style="width: <?php echo round($game['game_score']/5, 2) * 100 ?>%;"></div>
</div>
</div>
<div class="right">
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="strip">
<div style="width: <?php echo round($game['game_score']/5, 2) * 100 ?>%;"></div>
</div>
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="strip">
<div style="width: 0.24rem;"></div>
</div>
<div class="strip">
<div style="width: 0.24rem;"></div>
</div>
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="strip">
<div style="width: 0.06rem;"></div>
</div>
</div>
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="strip">
<div style="width: 0.04rem;"></div>
</div>
<div class="strip">
<div style="width: 0.06rem;"></div>
</div>
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="strip">
<div style="width: 0;"></div>
</div>
</div>
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="strip">
<div style="width: 0.04rem;"></div>
</div>
</div>
<div class="start-number">
<div class="start">
<img src="__IMG__/start1.png" alt="">
</div>
<div class="strip">
<div style="width: 0;"></div>
</div>
<div class="mark">14.48K个评分</div>
</div>
<div class="mark">14.48K个评分</div>
</div>
</div>
<div class="device">
<div class="title">新功能</div>
<div class="soon-title">更新说明:</div>
<div class="del">1、优化用户体验</div>
</div>
<div class="device">
<div class="title">新功能</div>
<div class="soon-title">更新说明:</div>
<div class="del">1、优化用户体验</div>
</div>
<div class="information">
<div class="title">信息</div>
<div class="data-box">
<span>大小</span>
<div>{$game['game_size']}</div>
</div>
<div class="information">
<div class="title">信息</div>
<div class="data-box">
<span>大小</span>
<div>{$game['game_size']}</div>
</div>
<div class="data-box">
<span>类别</span>
<div>游戏</div>
</div>
<div class="data-box">
<span>语言</span>
<div>英语,简体中文</div>
</div>
<div class="data-box">
<span>年龄分级</span>
<div>限16岁以上</div>
</div>
<div class="data-box">
<span>价格</span>
<div>免费</div>
</div>
<div class="privacy">隐私政策</div>
<div class="data-box">
<span>类别</span>
<div>游戏</div>
</div>
</div>
<div class="foot">
<div>
<div>闽ICP备19000000号-0</div>
<div>闽网文{2019}1554-099号</div>
<div class="data-box">
<span>语言</span>
<div>英语,简体中文</div>
</div>
<div class="data-box">
<span>年龄分级</span>
<div>限16岁以上</div>
</div>
<div>抵制不良游戏,拒绝盗版游戏。注意自我保护,谨防受骗上当。</div>
<div>适度游戏益脑,沉迷游戏伤身。合理安排时间,享受健康生活。</div>
<div class="data-box">
<span>价格</span>
<div>免费</div>
</div>
<div class="privacy">隐私政策</div>
</div>
</div>
<div class="foot">
<div>
<div>闽ICP备19000000号-0</div>
<div>闽网文{2019}1554-099号</div>
</div>
<div>抵制不良游戏,拒绝盗版游戏。注意自我保护,谨防受骗上当。</div>
<div>适度游戏益脑,沉迷游戏伤身。合理安排时间,享受健康生活。</div>
</div>
</div>
<div class="window" style="display: none;z-index: 1000">
@ -254,12 +258,12 @@
<?php if ($game['dow_status'] ==1):?>
<?php if ($game['supersign_status'] ==1):?>
<?php if ($game['supersign_status'] ==1):?>
<div class="blue-btn" onclick="location.href='mobile.php/Ssg/pay/game_id/{$game[\'id\']}/promote_id/{$promoteId}'">¥10至尊下载</div>
<?php else:?>
<div class="blue-btn" onclick="layer.msg('该游戏已关闭超级签下载');">¥10至尊下载</div>
<?php endif;?>
<div class="gray-btn down-link" down-link="{$downloadUrl}">普通下载</div>
<?php else:?>
<div class="blue-btn" onclick="layer.msg('该游戏已关闭超级签下载');">¥10至尊下载</div>
<?php endif;?>
<div class="gray-btn down-link" down-link="{$downloadUrl}">普通下载</div>
<?php else:?>
<div class="blue-btn" onclick="layer.msg('该游戏已关闭下载');">¥10至尊下载</div>
<div class="gray-btn down-link" onclick="layer.msg('该游戏已关闭下载');return false;" down-link="{$downloadUrl}">普通下载</div>
@ -350,27 +354,28 @@
<script>
$(window).scroll(function () {
<?php if ($game['ios_video_top'] == 1):?>
var v=($(this).scrollTop())/100;
$(".fiexd-heardBox").show();
$('.home-fiexd .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
var v=($(this).scrollTop())/100;
$(".fiexd-heardBox").show();
$('.home-fiexd .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
var t = $(window).scrollTop();
if(t<10){
$(".home-fiexd .fiexd-heardBox").hide();
}
var t = $(window).scrollTop();
if(t<10){
$(".home-fiexd .fiexd-heardBox").hide();
}
<?php else:?>
var t = $(window).scrollTop();
var h=$('.home-video').height();
if(t>h){
var v=($(this).scrollTop())/100;
$(".home-fiexd-two .fiexd-heard").show();
$('.home-fiexd-two .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
}else{
if(t<h){
$(".home-fiexd-two .fiexd-heard").hide();
}
<?php if (!empty($game['flooring_page_video'])):?>
var t = $(window).scrollTop();
var h=$('.home-video').height();
if(t>h){
var v=($(this).scrollTop())/100;
$(".home-fiexd-two .fiexd-heard").show();
$('.home-fiexd-two .fiexd-heard').css('backgroundColor','rgba(255, 255, 255,'+v+')');
}else{
if(t<h){
$(".home-fiexd-two .fiexd-heard").hide();
}
}
<?php endif;?>
<?php endif;?>
})
@ -381,12 +386,12 @@
<?php if(!empty($game['flooring_page_video'])):?>
var video = document.getElementById("shakeVideo");
console.log(video)
var video = document.getElementById("shakeVideo");
console.log(video)
video.play();
document.addEventListener('WeixinJSBridgeReady',function(){
video.play();
document.addEventListener('WeixinJSBridgeReady',function(){
video.play();
},false);
},false);
<?php endif;?>
function is_tip_safari() {
@ -403,7 +408,7 @@
//$('.safari').show();
}
return isTipSafari;
}
}
function checkSafari(){
/*var ua = navigator.userAgent.toLowerCase();
if (ua.match(/MicroMessenger/i) == "micromessenger") {
@ -429,20 +434,20 @@
}
$(function(){
$('#go_confirm').click(function () {
var isTipSafari = is_tip_safari();
if (isTipSafari) {
$('.safari').show();
return;
}
layer.confirm('请您回到手机桌面查看安装包情况,<br/>并在安装完成后点击"点我去信任"进行<br/>快速信任证书即可', {
title: "请确认游戏是否已安装?",
btn: ['已安装', '取消'], //按钮
}, function () {
$('.layui-layer-btn0').css("font-size", "18px");
window.location.href = "__STATIC__/ios9/images/embedded.mobileprovision";
});
$('#go_confirm').click(function () {
var isTipSafari = is_tip_safari();
if (isTipSafari) {
$('.safari').show();
return;
}
layer.confirm('请您回到手机桌面查看安装包情况,<br/>并在安装完成后点击"点我去信任"进行<br/>快速信任证书即可', {
title: "请确认游戏是否已安装?",
btn: ['已安装', '取消'], //按钮
}, function () {
$('.layui-layer-btn0').css("font-size", "18px");
window.location.href = "__STATIC__/ios9/images/embedded.mobileprovision";
});
});
$('.down-link').on('click', function () {
var dow_status = parseInt($('#dow_status').val());
if (dow_status == 0) {
@ -454,9 +459,9 @@
$('.safari').show();
return;
}
var downLink = $(this).attr('down-link');
var downLink = $(this).attr('down-link');
// if ($('.bn-rule').length > 0) {
// if ($('.bn-rule').length > 0) {
// $('.bn-rule').css('display','block')
// $('.bn-rule').css('z-index','12')
// return
@ -467,10 +472,10 @@
location.href = iosDownUrl;
return
} else {
layer.confirm('请先到官网注册', {title: '提示'}, function () {
// location.href = '{:U("User/login",array("url"=>base64_encode(base64_encode(U("Game/detail",array("id"=>$_GET["id"], "pid" => $apply.promote_id, "gid" => $apply.game_id))))))}';
location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + "/url/"+ cur_url + ".html"
});
layer.confirm('请先到官网注册', {title: '提示'}, function () {
// location.href = '{:U("User/login",array("url"=>base64_encode(base64_encode(U("Game/detail",array("id"=>$_GET["id"], "pid" => $apply.promote_id, "gid" => $apply.game_id))))))}';
location.href = "/mobile.php?s=/User/login/pid/" + "{$apply.promote_id}" + "/gid/" + "{$apply.game_id}" + "/url/"+ cur_url + ".html"
});
return
}

@ -58,15 +58,10 @@
<?php if ($k == 1) :?>
<?php if (!empty($game['flooring_page_video'])):?>
<div class="home-video">
<video id="example_video_1" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="none" width="640" height="264"
poster="http://video-js.zencoder.com/oceans-clip.png"
data-setup="{}">
<video id="example_video_1" class="video-js vjs-default-skin vjs-big-play-centered" controls preload="none" width="640" height="264" poster="{$game['flooring_page_video_cover']}" data-setup='{}'>
<source src="{$game['flooring_page_video']}" type='video/mp4' />
</video>
</div>
<!-- <div class="home-video">-->
<!-- <video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>-->
<!-- </div>-->
<?php endif;?>
<?php endif ;?>
<?php if ($downloadUrl == 'https://'.$_SERVER['HTTP_HOST']) :?>
@ -85,97 +80,6 @@
var videoWidth = $('.video-js').width();
$('.video-js').height(videoWidth * 0.562295082);
var myPlayer = videojs('example_video_1');
myPlayer.ready(function(){
var myPlayer = this;
myPlayer.play();
});
//设置中文
videojs.addLanguage('zh-CN', {
"Play": "播放",
"Pause": "暂停",
"Current Time": "当前时间",
"Duration": "时长",
"Remaining Time": "剩余时间",
"Stream Type": "媒体流类型",
"LIVE": "直播",
"Loaded": "加载完毕",
"Progress": "进度",
"Fullscreen": "全屏",
"Non-Fullscreen": "退出全屏",
"Mute": "静音",
"Unmute": "取消静音",
"Playback Rate": "播放速度",
"Subtitles": "字幕",
"subtitles off": "关闭字幕",
"Captions": "内嵌字幕",
"captions off": "关闭内嵌字幕",
"Chapters": "节目段落",
"Close Modal Dialog": "关闭弹窗",
"Descriptions": "描述",
"descriptions off": "关闭描述",
"Audio Track": "音轨",
"You aborted the media playback": "视频播放被终止",
"A network error caused the media download to fail part-way.": "网络错误导致视频下载中途失败。",
"The media could not be loaded, either because the server or network failed or because the format is not supported.": "视频因格式不支持或者服务器或网络的问题无法加载。",
"The media playback was aborted due to a corruption problem or because the media used features your browser did not support.": "由于视频文件损坏或是该视频使用了你的浏览器不支持的功能,播放终止。",
"No compatible source was found for this media.": "无法找到此视频兼容的源。",
"The media is encrypted and we do not have the keys to decrypt it.": "视频已加密,无法解密。",
"Play Video": "播放视频",
"Close": "关闭",
"Modal Window": "弹窗",
"This is a modal window": "这是一个弹窗",
"This modal can be closed by pressing the Escape key or activating the close button.": "可以按ESC按键或启用关闭按钮来关闭此弹窗。",
", opens captions settings dialog": ", 开启标题设置弹窗",
", opens subtitles settings dialog": ", 开启字幕设置弹窗",
", opens descriptions settings dialog": ", 开启描述设置弹窗",
", selected": ", 选择",
"captions settings": "字幕设定",
"Audio Player": "音频播放器",
"Video Player": "视频播放器",
"Replay": "重播",
"Progress Bar": "进度小节",
"Volume Level": "音量",
"subtitles settings": "字幕设定",
"descriptions settings": "描述设定",
"Text": "文字",
"White": "白",
"Black": "黑",
"Red": "红",
"Green": "绿",
"Blue": "蓝",
"Yellow": "黄",
"Magenta": "紫红",
"Cyan": "青",
"Background": "背景",
"Window": "视窗",
"Transparent": "透明",
"Semi-Transparent": "半透明",
"Opaque": "不透明",
"Font Size": "字体尺寸",
"Text Edge Style": "字体边缘样式",
"None": "无",
"Raised": "浮雕",
"Depressed": "压低",
"Uniform": "均匀",
"Dropshadow": "下阴影",
"Font Family": "字体库",
"Proportional Sans-Serif": "比例无细体",
"Monospace Sans-Serif": "单间隔无细体",
"Proportional Serif": "比例细体",
"Monospace Serif": "单间隔细体",
"Casual": "舒适",
"Script": "手写体",
"Small Caps": "小型大写字体",
"Reset": "重启",
"restore all settings to the default values": "恢复全部设定至预设值",
"Done": "完成",
"Caption Settings Dialog": "字幕设定视窗",
"Beginning of dialog window. Escape will cancel and close the window.": "开始对话视窗。离开会取消及关闭视窗",
"End of dialog window.": "结束对话视窗"
});
$('.down-link').on('click', function () {
var dow_status = parseInt($('#dow_status').val());
if (dow_status == 0) {
@ -185,6 +89,7 @@
if ($('.bn-rule').length > 0) {
$('.bn-rule').css('display','block')
$('.bn-rule').css('z-index','12')
$('video').hide();
return
}
if ($('input[name=isNewIos]').val() == 0 && $('input[name=isIOS13]').val() == 1) {

@ -178,7 +178,7 @@
<td>{$vo.game_name}</td>
<td>{$vo.promote_id}</td>
<td>{$vo.server_name}</td>
<td>{$vo.user_id}</td>
<td>{$vo.game_player_id}</td>
<td>{$vo.game_player_name}</td>
<td>{$vo.price}</td>

@ -216,7 +216,7 @@
<td>{$vo.p_p_pro_account}({$vo.p_p_pro_real_name})</td>
<td>{$vo.p_pro_account}({$vo.p_pro_real_name})</td>
<td>{$vo.pro_account}({$vo.pro_real_name})</td>
<td>{$vo.pay_time|date='Y-m-d H:i:s',###}</td>
<td>{$vo.pay_time}</td>
<!-- <td>-->
<!-- <a href="{:U('Query/viewSpendDetailed',array('id'=>$vo['id']))}" style="cursor: pointer"-->
<!-- class="chakan">查看详细</a>-->

@ -10,6 +10,33 @@
<link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
<link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
<link rel="stylesheet" type="text/css" href="__CSS__/recharge.css">
<style>
.pop-dialog {
display: none;
position: fixed;
z-index: 1999;
top: 0;
left: 0;
right: 0;
text-align: center;
width: 100vw;
height: 100vh;
}
.pop-dialog span {
background: rgba(0,0,0,.6);
top: 50%;
color: #FFF;
display: inline-block;
line-height: 2;
position: relative;
word-break: break-all;
max-width: 2rem;
font-size: 0.32rem;
border-radius: 5px;
display: block;
margin: auto;
}
</style>
</head>
<body>
<div class="recharge">
@ -175,20 +202,20 @@
</div>
<!--<div class="popmsg pop-dialog"></div>-->
<div class="popmsg pop-dialog"></div>
</body>
<script type="text/javascript" src="__JS__/recharge.js"></script>
<script src="__JS__/pop.lwx.min.js"></script>
<script>
$(function() {
//var popmsg = $('.popmsg').pop();
var popmsg = $('.popmsg').pop();
if (isWeiXin() || !is_mobile()) {
$('#ch_weixin').hide();
$("#recharge_weixin").hide();
}
if(isWeiXin()){
//popmsg.msg('请点击右上角按钮,选择在浏览器中打开去充值');
alert('请点击右上角按钮,选择在浏览器中打开去充值');
popmsg.msg('请点击右上角按钮,选择在浏览器中打开去充值');
// alert('请点击右上角按钮,选择在浏览器中打开去充值');
}
$('.jstab .btn').click(function() {
var that = $(this),parent = that.closest('.jstab'),sib=parent.siblings('.jslist');
@ -319,11 +346,11 @@
}*/
if(obj.attr('id') == 'form2' && $.trim(game_id) == ''){
//popmsg.msg('请选择充值游戏');
alert("请选择充值游戏");
popmsg.msg("请选择充值游戏");
return false;
}
if($.trim(pay_amount) == ''){
alert("请输入充值金额");
popmsg.msg("请输入充值金额");
//popmsg.msg('请输入充值金额');
return false;
}
@ -370,7 +397,7 @@
},
error:function(res){
console.log(res)
alert("服务端异常");
popmsg.msg("服务端异常");
}
})
}else{

@ -696,5 +696,17 @@ ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0'
ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` varchar(30) DEFAULT '0' COMMENT '玩家游戏内id';
ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 ';
ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号';
ALTER TABLE `tab_pay_info`
MODIFY COLUMN `game_player_id` varchar(255) NULL DEFAULT '0' COMMENT '玩家游戏内id' AFTER `promote_id`;
ALTER TABLE `tab_pay_info`
ADD COLUMN `ip` varchar(255) NOT NULL DEFAULT '0' AFTER `promote_account`,
ADD COLUMN `pay_way` int NOT NULL DEFAULT 0 AFTER `ip`;
-- 菜单(游戏充值预下单)
INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('游戏充值预下单', 16, 0, 'BehaviorLog/game', 0, '', '行为日志', 0, 1);
--2019-12-13
--
ALTER TABLE `tab_game`
ADD COLUMN `flooring_page_video_cover` int(11) NOT NULL DEFAULT 0 COMMENT '落地页视频封面';
Loading…
Cancel
Save