Merge branches 'dev' and 'dev_zyx' of 47.111.118.107:/srv/git/platform into dev_zyx

master
zhengyongxing 5 years ago
commit 11177b895c

@ -384,6 +384,31 @@
</td>
</tr>
<tr>
<td class="l">ios视频是否置顶</td>
<if condition="$data['ios_video_top'] eq 1">
<td class="r" >
<span class="form_radio table_btn">
<label>
<input type="radio" class="inp_radio" value="0" name="ios_video_top" > 不置顶
</label>
<label>
<input type="radio" class="inp_radio" value="1" name="ios_video_top" checked="checked"> 置顶
</label></span>
</td>
<else/>
<td class="r" >
<span class="form_radio table_btn">
<label>
<input type="radio" class="inp_radio" value="0" name="ios_video_top" checked="checked"> 不置顶
</label>
<label>
<input type="radio" class="inp_radio" value="1" name="ios_video_top" > 置顶
</label></span>
</td>
</if>
</tr>
<notempty name="data.accredit_img">

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

@ -45,6 +45,8 @@
<div class="home">
<!--落地页视频置顶-->
<?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">
@ -57,17 +59,29 @@
<div class="fiexd-heard">
<div class="fiexd-heardBox" style="display: none;">
<!-- <div>完成</div>-->
<img src="{$game['icon']}" alt="" style="ma">
<div class="fiexd-pay">
<!-- <span>App购买</span>-->
<div class="download">下载</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-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;">
<div class="fiexd-heardBox">
<img src="{$game['icon']}" alt="" style="">
<div class="download">下载</div>
</div>
</div>
</div>
<?php endif;?>
<div class="home-box">
<div class="heard">
@ -335,17 +349,30 @@
<script src="__STATIC__/ios9/js/layer/layer.js?VerNo=20190923" type="text/javascript"></script>
<script>
$(window).scroll(function () {
var v = ($(this).scrollTop()) / 100;
//为什么除以100是因为我希望当$(this).scrollTop()为100的过程中
//透明度由0变为1$(this).scrollTop()/100得到的值正好与opacity的范围[0,1]相符合。
$(".fiexd-heardBox").show();
$('.fiexd-heard').css('backgroundColor', 'rgba(255, 255, 255,' + v + ')');
var t = $(window).scrollTop();
if (t < 10) {
console.log(111)
$(".fiexd-heardBox").hide();
}
<?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 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 endif;?>
})
</script>
@ -355,6 +382,7 @@
<?php if(!empty($game['flooring_page_video'])):?>
var video = document.getElementById("shakeVideo");
console.log(video)
video.play();
document.addEventListener('WeixinJSBridgeReady',function(){
video.play();

@ -653,6 +653,45 @@ VALUES ('ServerNotice', '游戏区服预告', '0', '', '1', '{\"1\":[\"289\",\"2
--- liuweiwen 2019-12-09
ALTER TABLE tab_game ADD `flooring_page_video` varchar(150) NOT NULL DEFAULT '' COMMENT '落地页视频';
ALTER TABLE tab_game ADD `supersign_status` tinyint(1) DEFAULT '1' COMMENT '超级签开关1-开启0-关闭';
ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落地页视频是否置顶1-置顶0-不置顶';
-- 新旧IOS打包标识
ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)';
-- 合服游戏区服表 tping
CREATE TABLE `tab_server_union` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键自增',
`game_id` int(11) NOT NULL COMMENT '游戏id',
`game_name` varchar(30) NOT NULL COMMENT '游戏名称',
`server_name` varchar(30) NOT NULL COMMENT '区服名称',
`server_num` int(11) DEFAULT NULL COMMENT '对接区服id',
`recommend_status` tinyint(2) DEFAULT '1' COMMENT '推荐状态(0:否,1:是)',
`show_status` tinyint(2) DEFAULT '1' COMMENT '显示状态(0:否,1:是)',
`stop_status` tinyint(2) DEFAULT '0' COMMENT '是否停服(0:否,1:是)',
`server_status` tinyint(2) DEFAULT '0' COMMENT '区服状态(0:正常,1拥挤,2爆满)',
`icon` int(11) DEFAULT NULL COMMENT '区服图标',
`start_time` int(11) DEFAULT NULL COMMENT '开始时间',
`desride` varchar(300) DEFAULT NULL COMMENT '描述',
`prompt` varchar(300) DEFAULT NULL COMMENT '停服提示',
`parent_id` int(11) DEFAULT NULL COMMENT '父类id',
`create_time` int(11) DEFAULT NULL COMMENT '创建时间',
`server_version` tinyint(2) DEFAULT NULL COMMENT '运营平台 1and 2ios 0双平台',
`developers` int(11) DEFAULT '0' COMMENT '开发商',
`server_id` varchar(50) NOT NULL DEFAULT '' COMMENT '对接区服id',
PRIMARY KEY (`id`),
KEY `game_id` (`game_id`),
KEY `show_status` (`show_status`),
KEY `start_time` (`start_time`),
KEY `create_time` (`create_time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='合服游戏区服表';
-- 用户行为
ALTER TABLE `tab_pay_info` ADD COLUMN `user_account` varchar(30) DEFAULT NULL COMMENT '用户账号';
ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_name` varchar(30) DEFAULT '' COMMENT '游戏玩家昵称';
ALTER TABLE `tab_pay_info` ADD COLUMN `game_name` varchar(30) DEFAULT '' COMMENT '游戏名称';
ALTER TABLE `tab_pay_info` ADD COLUMN `server_id` int(11) DEFAULT '0' COMMENT '区服id';
ALTER TABLE `tab_pay_info` ADD COLUMN `server_name` varchar(30) DEFAULT '' COMMENT '区服名称';
ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id';
ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` int(11) 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 '推广员账号';

@ -40,6 +40,7 @@
font-size: 0.32rem;
color: #007AFF;
line-height: 1.2rem;
height: 100%;
}
.fiexd-heardBox>img{
width: 0.6rem;
@ -55,7 +56,7 @@
font-size: 0.2rem;
margin-right: 0.14rem;
}
.fiexd-pay>div{
.download{
width: 1.5rem;
height: 0.6rem;
background-color: #007AFF;
@ -65,7 +66,6 @@
line-height: 0.6rem;
color: #fff;
font-weight: 500;
margin-top: 0.3rem;
}
.heard{
width: 100%;

Loading…
Cancel
Save