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

Merge branch 'release-1.0.0' into dev

Browse Source 
# Conflicts:
#	Application/Home/Controller/QueryController.class.php
master
liuweiwen 5 years ago
parent 660397bf4f dabfc64dc9
commit f5316aee55
3 changed files with 211 additions and 216 deletions
Show Stats Download Patch File Download Diff File

9
Application/Admin/Controller/MemberController.class.php
Unescape Escape View File

@ -812,20 +812,13 @@ class MemberController extends ThinkController
$map['server_name'] = $_REQUEST['server_name'];
unset($_REQUEST['server_name']);
}
if (isset($_REQUEST['promote_id'])) {
$map['promote_id'] = $_REQUEST['promote_id'];
unset($_REQUEST['promote_id']);
}
// $map['type'] = 1;
// $map['login_time'] = ['exp', 'login_time<>0'];
$extend = array();
$extend['map'] = $map;
$count = M('UserLoginRecord','tab_')->field('user_id')->where($extend['map'])->group('user_id')->select(false);
$sql = "select count(user_id) as count from ({$count})t";
$count = M('UserLoginRecord','tab_')->query($sql);
$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']);

15
Application/Admin/View/Spend/lists.html
Unescape Escape View File

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

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

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

Write Preview
Loading…
Cancel
Save