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

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

Browse Source
master
chenzhi 5 years ago
parent 70aab2f137 7995273b9f
commit 68f4ffc559
5 changed files with 78 additions and 31 deletions
Show Stats Download Patch File Download Diff File

19
Application/Admin/View/Game/edit.html
Unescape Escape View File

@ -380,7 +380,7 @@
</div>
<input type="hidden" id="video_url" name="flooring_page_video" value="{$data['flooring_page_video']}"/>
</span>
<span class="notice-text"></span>
<span class="notice-text">视频大小不能超过20M</span>
</td>
</tr>
@ -1123,7 +1123,7 @@
}
});
//上传落地页视屏
//上传落地页视频
var uploaderVideo = WebUploader.create({
// 选完文件后，是否自动上传。
auto: true,
@ -1134,11 +1134,12 @@
// 选择文件的按钮。可选。
// 内部根据当前运行是创建，可能是input元素，也可能是flash.
pick: {id:'#pickerVideo'},
fileSingleSizeLimit:20*1024*1024, //设定单个文件大小
// dnd: true,
paste: document.body,
accept: {
title: '视频',
extensions: 'mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv',
extensions: 'mp4,3gp,wmv,asf,asx,mov,m4v,avi,flv,',
mimeTypes: '.mp4,.3gp,.wmv,.asf,.asx,.mov,.m4v,.avi,.flv',
},
// 不压缩image, 默认如果是jpeg，文件上传前会压缩一把再上传！
@ -1184,7 +1185,6 @@
});
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>');
@ -1201,6 +1201,17 @@
});
});
/**
* 验证文件格式以及文件大小
*/
uploaderVideo.on("error",function (type){
if (type=="Q_TYPE_DENIED"){
layer.msg("不支持该视频格式");
}else if(type=="F_EXCEED_SIZE"){
layer.msg("视频大小不能超过20M");
}
});
uploaderVideo.on( 'uploadError', function( file ) {
$( '#'+file.id ).find('p.state').text('上传出错');
});

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

@ -84,7 +84,7 @@ class DownloadController extends BaseController {
$res = M('promote','tab_')->where($map1)->field('id,account,nickname')->select();
$childPromoteIds = '';
if(empty($res)) {
$map['tab_downloadlog.admin_id'] = PID;
$map['tab_downloadlog.promote_id'] = PID;
}else {
foreach ($res as $rsKey => $rsValue) {
$id = $rsValue['id'];
@ -92,7 +92,7 @@ class DownloadController extends BaseController {
}
$childPromoteIds = rtrim($childPromoteIds, ',');
$childPromoteIds .= ',' . PID;
$map['tab_downloadlog.admin_id'] = ['in', $childPromoteIds];
$map['tab_downloadlog.promote_id'] = ['in', $childPromoteIds];
}
$levelPromote = $this->getLevelPromote();
$queryPromote = $this->getQueryPromote($levelPromote);
@ -105,7 +105,7 @@ class DownloadController extends BaseController {
$map = [];
if (count($childPromoteIds) > 0) {
$map = ['admin_id' => ['in', $childPromoteIds]];
$map = ['promote_id' => ['in', $childPromoteIds]];
} else {
$map['_string'] = '1<>1';
}
@ -130,7 +130,7 @@ class DownloadController extends BaseController {
$rs = M('downloadlog','tab_')->where($map)->order('tab_downloadlog.addtime desc')
->page($page, $row)->select();
foreach ($rs as $key => $value) {
$pid = intval($value['admin_id']);
$pid = intval($value['promote_id']);
$getNameRs = M('promote','tab_')->field("real_name")->where(['id' => $pid])->find();
$rs[$key]['actor'] = $getNameRs['real_name'];
}
@ -236,7 +236,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'dy_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Query/dailySummary',
'dataname' => '每日概况',
'status' => 0,
@ -291,7 +291,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'withdrawRecord'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Finance/withdrawRecord',
'dataname' => '提现记录',
'status' => 0,
@ -338,7 +338,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'withdrawDtl_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Finance/withdrawDtl',
'dataname' => '提现明细',
'status' => 0,
@ -384,7 +384,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'finance_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Finance/index',
'dataname' => '结算中心',
'status' => 0,
@ -456,7 +456,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'settlementDtl_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Finance/settlementDtl',
'dataname' => '结算明细',
'status' => 0,
@ -512,7 +512,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'test_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/TestResource/index',
'dataname' => '申请测试资源',
'status' => 0,
@ -572,7 +572,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'test_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/TestResource/lists',
'dataname' => '申请测试资源记录',
'status' => 0,
@ -619,7 +619,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'test_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/TestResource/supportNumberList',
'dataname' => '扶持号管理',
'status' => 0,
@ -682,7 +682,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'orderlist_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/CoinOrder/order_list',
'dataname' => '平台币充值',
'status' => 0,
@ -779,7 +779,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'zc_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Query/arpu',
'dataname' => 'ARPU统计',
'status' => 0,
@ -865,7 +865,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'zc_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Query/registe',
'dataname' => '注册明细数据',
'status' => 0,
@ -928,7 +928,7 @@ class DownloadController extends BaseController {
$type = "/Home/Promote/children/promote_type/".$promoteType;
$data = [
'logid' => 'promote_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => $type,
'dataname' => '渠道管理',
'status' => 0,
@ -987,7 +987,7 @@ class DownloadController extends BaseController {
$type = "/Home/PromoteCoin/transferLogs";
$data = [
'logid' => 'cr_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => $type,
'dataname' => '平台币转移',
'status' => 0,
@ -1049,7 +1049,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'pt_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => "/Home/PromoteCoin/coinRecord",
'dataname' => '我的平台币明细',
'status' => 0,
@ -1112,7 +1112,7 @@ class DownloadController extends BaseController {
$type = "/Home/PromoteCoin/myCoin";
$data = [
'logid' => 'pt_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => $type,
'dataname' => '我的平台币',
'status' => 0,
@ -1211,7 +1211,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'cz_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Query/recharge',
'dataname' => '充值明细数据',
'status' => 0,
@ -1322,7 +1322,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'wj_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Query/userRecharges',
'dataname' => '充值玩家数据',
'status' => 0,
@ -1420,7 +1420,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data1 = [
'logid' => 'tg_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Query/achievement',
'dataname' => '推广员业绩',
'status' => 0,
@ -1554,7 +1554,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'js_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Query/userRoles',
'dataname' => '角色查询数据',
'status' => 0,
@ -1651,7 +1651,7 @@ class DownloadController extends BaseController {
$addtime = time();
$data = [
'logid' => 'hz_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Query/summary',
'dataname' => '数据汇总数据',
'status' => 0,
@ -3278,7 +3278,7 @@ class DownloadController extends BaseController {
$conditions = json_encode($map,TRUE);
$data = [
'logid' => 'remitrecord_'.time(),
'admin_id' => PID,
'promote_id' => PID,
'type' => '/Home/Finance/withdrawRecord',
'dataname' => '汇款证明',
'status' => 0,

31
Application/Home/View/default/Home/landingPage.html
Unescape Escape View File

@ -44,7 +44,7 @@
<div class="home">
<?php if (!empty($game['flooring_page_video'])):?>
<div class="home-video">
<video src="{$game['flooring_page_video']}" autoplay controls></video>
<video id="shakeVideo" src="{$game['flooring_page_video']}" autoplay controls muted webkit-playsinline="true" playsinline="true"></video>
</div>
<?php endif;?>
<div class="home-box">
@ -214,8 +214,15 @@
<div class="text"> 购买至尊下载，赠送限量至尊超级礼包（价值100元）</div>
<div class="text">• 至尊下载：永不闪退、不丢数据稳定有保障</div>
<div class="text"> • 同一设备安装一次可在一年内无限次下载重装</div>
<?php if ($game['dow_status'] ==1):?>
<div class="blue-btn" onclick="location.href='mobile.php/Ssg/pay/game_id/{$game[\'id\']}/promote_id/{$promoteId}'">￥10至尊下载</div>
<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>
<?php endif;?>
</div>
</div>
</div>
@ -277,6 +284,7 @@
<?php
?>
<input type="hidden" id="dow_status" name="dow_status" value="{$game['dow_status']}">
<input type="hidden" id="cur_url" name="cur_url" value="{$cur_url}">
<input type="hidden" id="is_new_sdk" name="is_new_sdk" value="{$is_new_sdk}">
<div class="safari" style="display: none">
@ -296,6 +304,13 @@
</html>
<script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
<script>
<?php if (!empty($game['flooring_page_video'])):?>
var video = document.getElementById("shakeVideo");
video.play();
document.addEventListener('WeixinJSBridgeReady',function(){
video.play();
},false);
<?php endif;?>
function is_tip_safari() {
var isTipSafari = false;
@ -352,6 +367,11 @@
});
});
$('.down-link').on('click', function () {
var dow_status = parseInt($('#dow_status').val());
if (dow_status == 0) {
layer.msg('该游戏已关闭下载');
return false;
}
var isTipSafari = is_tip_safari();
if (isTipSafari) {
$('.safari').show();
@ -438,6 +458,7 @@
document.body.style.overflow = 'hidden';
});
$(".window").click(function(){
var dow_status = parseInt($('#dow_status').val());
var isTipSafari = is_tip_safari();
if (isTipSafari) {
$('.safari').show();
@ -447,6 +468,12 @@
document.body.style.overflow = 'auto';
});
$(".gray-btn").click(function(){
var dow_status = parseInt($('#dow_status').val());
if (dow_status == 0) {
layer.msg('该游戏已关闭下载');
$(".window").hide();
return false;
}
var isTipSafari = is_tip_safari();
if (isTipSafari) {
$('.safari').show();
@ -457,7 +484,7 @@
// swiperGet();
document.body.style.overflow = 'hidden';
$(".window").hide();
})
});
$(".second").click(function(){
var isTipSafari = is_tip_safari();
if (isTipSafari) {

6
Application/Home/View/default/Home/landingPage2.html
Unescape Escape View File

@ -22,6 +22,7 @@
<input type="hidden" name="desc" value="{$game['features']}">
<input type="hidden" name="isIOS13" value="<?php if($isIOS13):?>1<?php else:?>0<?php endif;?>">
<input type="hidden" name="isNewIos" value="<?php if($isNewIos):?>1<?php else:?>0<?php endif;?>">
<input type="hidden" id="dow_status" name="dow_status" value="{$game['dow_status']}">
<?php if ($isWechat):?>
<?php if ($isAndroid):?>
<div class="bn-rule" style="display: none;"><img id="rule-img" src="__STATIC__/ios9/images/android-rule.png"></div>
@ -45,6 +46,11 @@
<script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
<script type="text/javascript">
$('.down-link').on('click', function () {
var dow_status = parseInt($('#dow_status').val());
if (dow_status == 0) {
layer.msg('该游戏已关闭下载');
return false;
}
if ($('.bn-rule').length > 0) {
$('.bn-rule').css('display','block')
$('.bn-rule').css('z-index','12')

3
Data/update.sql
Unescape Escape View File

@ -652,3 +652,6 @@ CREATE TABLE `tab_server_notice` (
INSERT INTO `sys_model` ( `name`, `title`, `extend`, `relation`, `need_pk`, `field_sort`, `field_group`, `attribute_list`, `attribute_alias`, `template_list`, `template_add`, `template_edit`, `list_grid`, `list_row`, `search_key`, `search_list`, `create_time`, `update_time`, `status`, `engine_type`)
VALUES ('ServerNotice', '游戏区服预告', '0', '', '1', '{\"1\":[\"289\",\"288\",\"290\",\"291\",\"293\",\"292\",\"287\",\"286\",\"282\",\"281\",\"283\",\"284\",\"285\",\"280\"]}', '1:基础', '', '', '', '', '', 'id:编号\r\ngame_name:游戏名称\r\nserver_name:区服名称\r\nshow_status|get_info_status:区服状态\r\nstart_time|set_show_time:开服时间\r\nserver_version:运营平台\r\ndevelopers:开发商\r\nid:操作:[EDIT]&id=[id]|编辑,ServerNotice/del?ids=[id]|删除', '10', '', '', '1480318911', '1493879217', '1', 'MyISAM');
--游戏表新增字段-落地页视频 liuweiwen 2019-12-09
ALTER TABLE tab_game ADD `flooring_page_video` varchar(150) NOT NULL DEFAULT '' COMMENT '落地页视频';

Write Preview
Loading…
Cancel
Save