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

master
chenzhi 5 years ago
commit 95aa18a928

@ -86,7 +86,9 @@ class FileController extends AdminController
if (I('get.typee') == 1) {
$uploader->set('path', './Uploads/Ios/description');
}
if (strpos(I('type'),'video') !== false) {
$uploader->set('path', './Uploads/Video');
}
// var_dump($_POST);
// exit;
//用于断点续传,验证指定分块是否已经存在,避免重复上传

@ -346,6 +346,7 @@ class GameController extends ThinkController
$phone['back_describe'] = $sibling['back_describe'];
$phone['dow_icon'] = $sibling['dow_icon'];
$phone['back_map'] = $sibling['back_map'];
$phone['flooring_page_video'] = $sibling['flooring_page_video'];
M('Game', 'tab_')->data($phone)->where(array('id' => $another['id']))->save();
//同时修改代充游戏折扣
$set_fidel['status'] = 1;

@ -215,7 +215,7 @@
<textarea name="introduction" class="txt_area">{$data['introduction']}</textarea>
</td>
</tr>
<tr>
<td class="l">游戏资料中心:</td>
<td class="r">
@ -355,6 +355,37 @@
<span class="notice-text">横版游戏建议尺寸1691280*720px及以上竖版游戏建议尺寸916720*1280px及以上用于游戏详情页内展示</span>
</td>
</tr>
<tr class="picbox">
<td class="l noticeinfo">落地页视频</td>
<td class="r">
<span class="table_btn table_upload">
<div id="uploaderVideo" class="wu-example">
<div class="btns">
<div id="pickerVideo" style="width: auto;float: left;margin-right: 20px;">上传视频</div>
</div>
<!--用来存放文件信息-->
<div id="video_thelist" class="uploader-list" style="float: left;">
<!-- <span id="up_status">
<notempty name="data.material_url">已上传</notempty>
</span> -->
<notempty name="data.flooring_page_video">
<?php $name = substr($data['flooring_page_video'],strripos($data['flooring_page_video'],'/',0)+1); ?>
<div id="beforeuploadvideo" class="item">
<h4 class="info">{$name}<a href="javascript:;" class="jsdelvideo table_click" style="float:none;display:inline-block;margin-left:10px;">删除</a></h4>
<video src="{$data['flooring_page_video']}" controls width="150px"></video>
</div>
</notempty>
</div>
</div>
<input type="hidden" id="video_url" name="flooring_page_video" value="{$data['flooring_page_video']}"/>
</span>
<span class="notice-text"></span>
</td>
</tr>
<notempty name="data.accredit_img">
<tr class="picbox">
<td class="l noticeinfo">知识产权</td>
@ -1092,6 +1123,92 @@
}
});
//上传落地页视屏
var uploaderVideo = WebUploader.create({
// 选完文件后,是否自动上传。
auto: true,
// swf文件路径
swf: '__STATIC__/webuploader/Uploader.swf',
// 文件接收服务端。
server: backEndUrl,
// 选择文件的按钮。可选。
// 内部根据当前运行是创建可能是input元素也可能是flash.
pick: {id:'#pickerVideo'},
// dnd: true,
paste: document.body,
accept: {
title: '视频',
extensions: 'mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv',
mimeTypes: '.mp4,.3gp,.wmv,.asf,.asx,.mov,.m4v,.avi,.flv',
},
// 不压缩image, 默认如果是jpeg文件上传前会压缩一把再上传
resize: false,
disableGlobalDnd: true,
fileNumLimit:1,
threads:3,
compress: false,
prepareNextFile: true,
formData: function(){return $.extend(true, {}, userInfo);},
duplicate: true
});
// 当有文件被添加进队列的时候
uploaderVideo.on( 'fileQueued', function( file ) {
$("#up_status").remove();
$("#video_thelist").html( '<div id="' + file.id + '" class="item">' +
'<h4 class="info">' + file.name + '</h4>' +
'<p class="state">等待上传...</p>' +
'</div>' );
});
// 文件上传过程中创建进度条实时显示。
uploaderVideo.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) + '%' );
});
$('#beforeuploadvideo').children('.info').children('.jsdelvideo').click(function() {
$("#video_url").val('');
$('#beforeuploadvideo').remove();
return false;
});
uploaderVideo.on( 'uploadSuccess', function( file , response) {
console.log(file);
$( '#'+file.id ).find('p.state').text('已上传').fadeOut(800);
//alert(JSON.stringify(response));
$('#'+file.id).find('h4.info').append('<a href="javascript:;" class="jsdelvideo table_click" style="float:none;display:inline-block;margin-left:10px;">删除</a>');
var url = response.path + "/" +response.name;
$('#'+file.id).find('h4.info').after("<video src="+url+" controls width=\"150px\"></video>");
$("#video_url").val(url);
$('#'+file.id).find('.jsdelvideo').on('click',function() {
console.log(file);
$("#video_url").val('');
$('#'+file.id).remove();
uploaderVideo.removeFile( file.id );
return false;
});
});
uploaderVideo.on( 'uploadError', function( file ) {
$( '#'+file.id ).find('p.state').text('上传出错');
});
uploaderVideo.on( 'uploadComplete', function(file) {
$( '#'+file.id ).find('.progress').fadeOut();
});
var uploaderFile = WebUploader.create({
// 选完文件后,是否自动上传。
auto: true,
@ -1179,7 +1296,7 @@
uploaderFile.on( 'uploadComplete', function(file) {
$( '#'+file.id ).find('.progress').fadeOut();
});
//游戏截图
var uploaderImg = WebUploader.create({
// 选完文件后,是否自动上传。
@ -1215,7 +1332,7 @@
});
var imgListData = [];
@ -1392,7 +1509,7 @@
);
}
</script>
<script type="text/javascript">
var uploaderImgScreen = WebUploader.create({
// 选完文件后,是否自动上传。
@ -1425,8 +1542,8 @@
formData: function(){return $.extend(true, {}, userInfo);},
chunked:false,
duplicate: true
});
});
var imgListScreenData = [];
<?php if (!empty($data['screenshot_data'])) :?>
var html = '';
@ -1434,7 +1551,7 @@
<?php foreach ($data['screenshot_data'] as $value1) { ?>
<?php $value1 = (int)$value1; ?>
imgListScreenData.push(<?=$value1?>);
html += '<div id="' + <?=$value1?> + '" class="item flooring_page_img_box" style="margin-right: 10px;">';
html += '<a href="javascript:;"><img src="<?=get_cover($value1,"path")?>" style="width: 100px;height: 100px;cursor: move;"></a>';
html += '<h4 class="info" style="text-align: center;">';
@ -1446,7 +1563,7 @@
html += '</div>';
<?php }?>
$('#screenshot_thelist').html(html);
$('#screenshot_thelist').children().children('h4').children('.jsdelzip').on('click', function() {
var thisId = $(this).attr('img-id');
$(this).parent().parent().remove();
@ -1460,7 +1577,7 @@
setScreenshotVal();
});
<?php endif ;?>
<?php endif ;?>
var thisIndex1 = 0;
var imgScreenList = $("#screenshot_thelist");
uploaderImgScreen.on( 'fileQueued', function( file ) {
@ -1525,7 +1642,7 @@
return false;
});
});
function setScreenshotVal()
{
var screen_shot = '';
@ -1537,8 +1654,8 @@
}
</script>
<script>
<script>
var uploaderImgCover = WebUploader.create({
// 选完文件后,是否自动上传。
auto: true,
@ -1570,8 +1687,8 @@
formData: function(){return $.extend(true, {}, userInfo);},
chunked:false,
duplicate: true
});
});
var imgListCoverData = [];
<?php if (!empty($data['cover_data'])) :?>
var html = '';
@ -1579,7 +1696,7 @@
<?php foreach ($data['cover_data'] as $value2) { ?>
<?php $value2 = (int)$value2; ?>
imgListCoverData.push(<?=$value2?>);
html += '<div id="' + <?=$value2?> + '" class="item flooring_page_img_box" style="margin-right: 10px;">';
html += '<a href="javascript:;"><img src="<?=get_cover($value2,"path")?>" style="width: 100px;height: 100px;cursor: move;"></a>';
html += '<h4 class="info" style="text-align: center;">';
@ -1591,7 +1708,7 @@
html += '</div>';
<?php }?>
$('#cover_thelist').html(html);
$('#cover_thelist').children().children('h4').children('.jsdelzip').on('click', function() {
var thisId = $(this).attr('img-id');
$(this).parent().parent().remove();
@ -1605,7 +1722,7 @@
setCoverVal();
});
<?php endif ;?>
<?php endif ;?>
var thisIndex2 = 0;
var imgCoverList = $("#cover_thelist");
uploaderImgCover.on( 'fileQueued', function( file ) {
@ -1666,7 +1783,7 @@
return false;
});
});
function setCoverVal()
{
var cover = '';
@ -1676,7 +1793,7 @@
cover = cover.substring(0, cover.length - 1);
$('input[name=cover]').val(cover);
}
</script>
<script>
var iconInfo = {userId:"kazaff", md5:"",icon:1}; //用户会话信息
@ -1711,8 +1828,8 @@
formData: function(){return $.extend(true, {}, iconInfo);},
chunked:false,
duplicate: true
});
});
var imgListIconData = [];
<?php if (!empty($data['icon_data'])) :?>
var html = '';
@ -1720,7 +1837,7 @@
<?php foreach ($data['icon_data'] as $value3) { ?>
<?php $value3 = (int)$value3; ?>
imgListIconData.push(<?=$value3?>);
html += '<div id="' + <?=$value3?> + '" class="item flooring_page_img_box" style="margin-right: 10px;">';
html += '<a href="javascript:;"><img src="<?=get_cover($value3,"path")?>" style="width: 100px;height: 100px;cursor: move;"></a>';
html += '<h4 class="info" style="text-align: center;">';
@ -1732,7 +1849,7 @@
html += '</div>';
<?php }?>
$('#icon_thelist').html(html);
$('#icon_thelist').children().children('h4').children('.jsdelzip').on('click', function() {
var thisId = $(this).attr('img-id');
$(this).parent().parent().remove();
@ -1746,7 +1863,7 @@
setIconVal();
});
<?php endif ;?>
<?php endif ;?>
var thisIndex2 = 0;
var imgIconList = $("#icon_thelist");
uploaderImgIcon.on( 'fileQueued', function( file ) {
@ -1816,7 +1933,7 @@
}
});
function setIconVal()
{
var icon = '';
@ -1826,6 +1943,6 @@
icon = icon.substring(0, icon.length - 1);
$('input[name=icon]').val(icon);
}
</script>
</block>

@ -177,7 +177,8 @@ class HomeController extends Controller
'game_score',
'recommend_level',
'game_size',
'introduction'
'introduction',
'flooring_page_video',
];
$map = ['id' => intval($gameId)];
$game = M('game', 'tab_')->field($columns)->where($map)->find();

@ -22,6 +22,11 @@ class QueryController extends BaseController
2 => '微信',
];
public static $payStatus = [
0 => '下单未支付',
1 => '充值成功',
];
public function recharge($p = 0)
{
$page = intval(I('p', 1));
@ -85,8 +90,14 @@ class QueryController extends BaseController
}
}
}
if (isset($_REQUEST['pay_status']) && $_REQUEST['pay_status'] !== '') {
$payStatus = intval(I('pay_status'));
if (in_array($payStatus, array_keys(QueryController::$payStatus))) {
$map['tab_spend.pay_status'] = $payStatus;
}
}
$map['tab_spend.pay_time'] = ['between', [$begTime, $endTime - 1]];
$map['tab_spend.pay_status'] = 1;
$map['tab_spend.is_check'] = ['neq', 2];
$data = [];
@ -161,6 +172,8 @@ class QueryController extends BaseController
break;
}
$list['user_account'] = substr($list['user_account'], 0, 2) . '******' . substr($list['user_account'], 8);
$list['pay_status'] = isset(QueryController::$payStatus[$list['pay_status']]) ? QueryController::$payStatus[$list['pay_status']] : '未知状态';
$list['sdk_version'] = getSDKTypeName($list['sdk_version']);
//订单隐藏算法
$orderLen = strlen($list['pay_order_number']);
@ -210,6 +223,7 @@ class QueryController extends BaseController
$this->assign('serverData', $serverData['data']);
$this->assign('ownId', $ownId);
$this->assign('payWayData', QueryController::$payWay);
$this->assign('payStatusData', QueryController::$payStatus);
$this->meta_title = "订单查询";
$this->display();
}

@ -42,6 +42,11 @@
<div class="home">
<?php if (!empty($game['flooring_page_video'])):?>
<div class="home-video">
<video src="{$game['flooring_page_video']}" autoplay controls></video>
</div>
<?php endif;?>
<div class="home-box">
<div class="heard">
<div style="height: 2.5rem;width: 2.5rem">

@ -144,6 +144,19 @@
</select>
</div>
<div class="form-group normal_space">
<select id="pay_status" name="pay_status" class="reselect select_gallery" style="min-width:130px;">
<option value="-1">充值状态</option>
<foreach name="payStatusData" item="vo" key="k">
<if condition="$k eq I('pay_status',-1)">
<option value="{$k}" selected>{$vo}</option>
<else/>
<option value="{$k}">{$vo}</option>
</if>
</foreach>
</select>
</div>
<div class="form-group normal_space">
<input type="submit" class="submit" id='submit' url="{:U('Query/recharge','model='.$model['name'],false)}"
value="查询">
@ -169,8 +182,10 @@
<th>玩家账号</th>
<th>游戏订单</th>
<th>支付方式</th>
<th>充值状态</th>
<th>订单金额</th>
<th>游戏名称</th>
<th>设备类型</th>
<th>区服</th>
<th>角色名</th>
<th>部门长</th>
@ -192,8 +207,10 @@
<td title="玩家ID{$vo.user_id}">{$vo.user_account}</td>
<td>{$vo.pay_order_number}</td>
<td>{:get_pay_way($vo['pay_way'])}</td>
<td>{$vo.pay_status}</td>
<td>{$vo.pay_amount}</td>
<td>{$vo.game_name}</td>
<td>{$vo.sdk_version}</td>
<td>{$vo.server_name}</td>
<td>{$vo.game_player_name}</td>
<td>{$vo.p_p_pro_account}({$vo.p_p_pro_real_name})</td>

@ -1,3 +1,11 @@
.home-video{
width: 100%;
height: 4.22rem;
}
.home-video video{
width: 100%;
height: 100%;
}
.home{
width: 100%;
font-family:PingFang SC;

Loading…
Cancel
Save