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

master
zhengyongxing 5 years ago
commit 55918dfc24

@ -227,6 +227,8 @@ class HomeController extends Controller
$this->assign('apply', $apply); $this->assign('apply', $apply);
$this->assign('game', $game); $this->assign('game', $game);
$this->assign('promoteId', $promoteId); $this->assign('promoteId', $promoteId);
$cur_url = base64_encode(base64_encode("http://" . $_SERVER['HTTP_HOST'] . __SELF__));
$this->assign('cur_url', $cur_url);
$this->display('landingPage'); $this->display('landingPage');
} }

@ -198,7 +198,7 @@
<div class="text">• 至尊下载:永不闪退、不丢数据稳定有保障</div> <div class="text">• 至尊下载:永不闪退、不丢数据稳定有保障</div>
<div class="text"> • 同一设备安装一次可在一年内无限次下载重装</div> <div class="text"> • 同一设备安装一次可在一年内无限次下载重装</div>
<div class="blue-btn" onclick="location.href='mobile.php/Ssg/pay/game_id/{$game[\'id\']}/promote_id/{$promoteId}'">¥10至尊下载</div> <div class="blue-btn" onclick="location.href='mobile.php/Ssg/pay/game_id/{$game[\'id\']}/promote_id/{$promoteId}'">¥10至尊下载</div>
<div class="gray-btn" onclick="location.href='{$downloadUrl}'">普通下载</div> <div class="gray-btn down-link" down-link="{$downloadUrl}">普通下载</div>
</div> </div>
</div> </div>
</div> </div>
@ -257,10 +257,46 @@
<div class="blue-btn">点我去信任</div> <div class="blue-btn">点我去信任</div>
</div> </div>
</div> </div>
<?php
?>
<input type="hidden" id="cur_url" name="cur_url" value="{$cur_url}">
</body> </body>
</html> </html>
<script> <script>
$(function(){ $(function(){
$('.down-link').on('click', function () {
// if ($('.bn-rule').length > 0) {
// $('.bn-rule').css('display','block')
// $('.bn-rule').css('z-index','12')
// return
// }
if ($('input[name=isNewIos]').val() == 0 && $('input[name=isIOS13]').val() == 1) {
if (parseInt("{:I('get.status', 0)}") > 0) {
location.href = "{:U('iosDown',array('gid'=>$apply['game_id'],'pid'=>$apply['promote_id'],'status'=>1))}"
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"
});
return
}
}
var downLink = $(this).attr('down-link');
console.log(downLink);
location.href = downLink
});
$('.no-package').click(function() {
layer.msg('暂无下载', {
icon: 7,
time: 2000
})
});
if ($("#brief_introduction").length<80) { if ($("#brief_introduction").length<80) {
$("#look_more").hide(); $("#look_more").hide();
} }
@ -272,13 +308,17 @@
function swiperGet(){ function swiperGet(){
var swiper = new Swiper('.swiper-container', { var swiper = new Swiper('.swiper-container', {
loop: true, loop: true,
// autoplay: img > 1, observer: true,//修改swiper自己或子元素时自动初始化swiper
observeParents: true,//修改swiper的父元素时自动初始化swiper
// autoplayDisableOnInteraction:false,//
lazyLoading:true,//图片延迟加载
lazyLoadingInPrevNext:true,//前一个和后一个延迟加载
pagination: { pagination: {
el: '.swiper-pagination', el: '.swiper-pagination',
clickable: true, clickable: true,
}, },
autoplay: { autoplay: {
delay: 3000, delay: 2000,
stopOnLastSlide: false, stopOnLastSlide: false,
disableOnInteraction: false, disableOnInteraction: false,
}, },
@ -369,4 +409,6 @@
}); });
}); });
} }
</script> </script>

@ -203,16 +203,15 @@ class UserController extends BaseController
} else { } else {
$pid = I('get.pid', 0); $pid = I('get.pid', 0);
$gid = I('get.gid', 0); $gid = I('get.gid', 0);
$from = I('get.from', "");
if ($pid > 0 || $gid > 0) { if ($pid > 0 || $gid > 0) {
cookie('pgInfo', json_encode(['pid' => $pid, 'gid' => $gid]), 3600 * 24); cookie('pgInfo', json_encode(['pid' => $pid, 'gid' => $gid]), 3600 * 24);
} }
if ($_REQUEST['url']) { if ($_REQUEST['url']) {
$this->assign('url', base64_decode(base64_decode($_REQUEST['url']))); $this->assign('url', base64_decode(base64_decode($_REQUEST['url'])));
} else { } else {
$this->assign('url', U('User/index')); $this->assign('url', U('User/index'));
} }
$this->display(); $this->display();
} }
} }

@ -40,7 +40,7 @@
<div class="pop-wrap"></div> <div class="pop-wrap"></div>
</div> </div>
</div> </div>
<input type="hidden" id="from" name="from" value="{$from}">
<div class="popmsg pop-dialog" style="font-size: .28rem"></div> <div class="popmsg pop-dialog" style="font-size: .28rem"></div>
</body> </body>
<script src="__JS__/pop.lwx.min.js"></script> <script src="__JS__/pop.lwx.min.js"></script>

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta http-equiv="X-UA-Compatible" content="ie=edge"> <meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>充值中心</title> <title>充值中心</title>
<script src="__JS__/jquery-1.11.3.min.js"></script> <script src="__JS__/jquery-1.11.3.min.js"></script>
@ -19,14 +19,14 @@
<a href="{:U('/User/index')}" class="arrows"></a> <a href="{:U('/User/index')}" class="arrows"></a>
</div> </div>
<div class="recharge-tabbar"> <div class="recharge-tabbar">
<li class="selected" name="currency">平台币充值</li> <li class="selected" name="currency" style="margin-left:0;">平台币充值</li>
<li name="iscurrency">折扣充值</li> <!-- <li name="iscurrency">折扣充值</li> -->
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div class="recharge-flat" > <div class="recharge-flat" style="">
<form class="" id="form1" action="{:U('User/recharge')}" method="post"> <form class="" id="form1" action="{:U('User/recharge')}" method="post">
<div class="flat-box"> <div class="flat-box">
<div class="flat-info"> <div class="flat-info">
@ -38,13 +38,13 @@
<div class="flat-box"> <div class="flat-box">
<div class="flat-info"> <div class="flat-info">
<div>充值金额</div> <div>充值金额</div>
<input type="text" class="rcmoney1" name="pay_amount" placeholder="请输入金额最低金额1元" style="text-align:right;width: 2.88rem"> <input type="text" class="rcmoney1" name="pay_amount" placeholder="请输入金额最低金额1元" style="text-align:right;width: 2.88rem" oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
</div> </div>
</div> </div>
<div class="flat-box"> <div class="flat-box">
<div class="flat-info"> <div class="flat-info">
<div>获得平台币</div> <div>获得平台币</div>
<input type="text" class="rcplatform" name="balance" readonly placeholder="" value="" style="text-align:right;"> <input type="text" class="rcplatform rcmoney1ptb" name="balance" readonly placeholder="" value="" style="text-align:right;">
</div> </div>
</div> </div>
<div class="recharge-payment"> <div class="recharge-payment">
@ -85,12 +85,12 @@
</div> </div>
</form> </form>
</div> </div>
<div class="recharge-discount" style="display: none;"> <!-- <div class="recharge-discount" style="display: none;">
<form class="" id="form2" action="{:U('User/recharge')}" method="post"> <form class="" id="form2" action="{:U('User/recharge')}" method="post">
<div class="flat-box"> <div class="flat-box">
<div class="flat-info"> <div class="flat-info">
<div>充值账户</div> <div>充值账户</div>
<input type="hidden" class="txt" name="account" value="{:session('suser_auth.account')}" readonly="readonly" placeholder="请输入充值账户"> <input type="hidden" class="txt" name="account" value="{:session('suser_auth.account')}" readonly="readonly" placeholder="请输入充值账户" >
<span>{:session('suser_auth.account')}</span> <span>{:session('suser_auth.account')}</span>
</div> </div>
</div> </div>
@ -108,7 +108,7 @@
<div class="flat-box"> <div class="flat-box">
<div class="flat-info"> <div class="flat-info">
<div>充值金额</div> <div>充值金额</div>
<input type="text" class="txt rcmoney" id="pay_amount" name="pay_amount" placeholder="请输入金额最低金额1元" style="width:2.88rem;text-align:right;"> <input type="text" class="txt rcmoney" id="pay_amount" name="pay_amount" placeholder="请输入金额最低金额1元" style="width:2.88rem;text-align:right;" oninput="this.value=this.value.replace(/[^0-9]+|^0|\d{9}/,'');">
</div> </div>
</div> </div>
<div class="flat-box"> <div class="flat-box">
@ -122,7 +122,7 @@
<div class="flat-box"> <div class="flat-box">
<div class="flat-info"> <div class="flat-info">
<div>实付金额</div> <div>实付金额</div>
<input type="text" class="txt realmoney" name="realmoney" readonly style="text-align:right;"> <input type="text" class="txt rcmoney2bb realmoney" name="realmoney" readonly style="text-align:right;">
</div> </div>
</div> </div>
<div class="flat-box"> <div class="flat-box">
@ -133,7 +133,7 @@
</div> </div>
<div class="recharge-payment"> <div class="recharge-payment">
<div class="title">请选择支付方式</div> <div class="title">请选择支付方式</div>
<div class="alipay"> <div class="alipay bindway">
<div class="alipay_img"> <div class="alipay_img">
<img src="__IMG__/zhifubaozhifu.png" alt=""> <img src="__IMG__/zhifubaozhifu.png" alt="">
<div class="img_text"> <div class="img_text">
@ -143,12 +143,12 @@
</div> </div>
<div class="radio_select"> <div class="radio_select">
<input id="zhifubao1" name="way" type="radio" value="1" checked> <input id="zhifubao1" name="way1" type="radio" value="1" checked>
<label for="zhifubao1" class="radio-label"></label> <label for="zhifubao1" class="radio-label"></label>
</div> </div>
</div> </div>
<div class="alipay" id="ch_weixin1"> <div class="alipay bindway" id="ch_weixin1">
<div class="alipay_img"> <div class="alipay_img">
<img src="__IMG__/weixin.png" alt=""> <img src="__IMG__/weixin.png" alt="">
<div class="img_text"> <div class="img_text">
@ -157,7 +157,7 @@
</div> </div>
</div> </div>
<div class="radio_select"> <div class="radio_select">
<input id="weixin1" name="way" type="radio" value="2" > <input id="weixin1" name="way1" type="radio" value="2" >
<label for="weixin1" class="radio-label"></label> <label for="weixin1" class="radio-label"></label>
</div> </div>
</div> </div>
@ -169,7 +169,7 @@
</div> </div>
</form> </form>
</div> </div>
</div> </div> -->
@ -197,6 +197,14 @@
sib.find('.t-tabpan').eq(index).addClass('active').siblings().removeClass('active'); sib.find('.t-tabpan').eq(index).addClass('active').siblings().removeClass('active');
return false; return false;
}); });
//点击父标签切换radio
$(".alipay").click(function(){
$(this).children(".radio_select").children("input").prop("checked", true);
})
//阻止事件冒泡
$(".radio_select").click(function(){
event.stopPropagation();
})
$('.jssbtn').click(function() { $('.jssbtn').click(function() {
var that = $(this); var that = $(this);
if (that.hasClass('on')) { if (that.hasClass('on')) {
@ -237,7 +245,7 @@
$('.rcmoney').keyup(function() { $('.rcmoney').keyup(function() {
var that = $(this),val = $.trim(that.val()),parent=that.closest('.recharge-discount'),pf=parent.find('.rcplatform'); var that = $(this),val = $.trim(that.val()),parent=that.closest('.recharge-discount'),pf=parent.find('.rcplatform');
var rm = parent.find('.realmoney'); var rm = parent.find('.realmoney');
if(val == ""){return true;} if(val == ""){$(".rcmoney2bb").val(0);$(".rcplatform").val(0);return true;}
if (val) { if (val) {
if (val>0 && /^(0|[1-9][0-9]*)$/.test(val)) { if (val>0 && /^(0|[1-9][0-9]*)$/.test(val)) {
pf.val(val); pf.val(val);
@ -258,7 +266,7 @@
$('.rcmoney1').keyup(function() { $('.rcmoney1').keyup(function() {
var that = $(this),val = $.trim(that.val()),parent=that.closest('.recharge-flat'),pf=parent.find('.rcplatform'); var that = $(this),val = $.trim(that.val()),parent=that.closest('.recharge-flat'),pf=parent.find('.rcplatform');
var rm = parent.find('.realmoney'); var rm = parent.find('.realmoney');
if(val == ""){return true;} if(val == ""){$(".rcmoney1ptb").val(0);return true;}
if (val) { if (val) {
if (val>0 && /^(0|[1-9][0-9]*)$/.test(val)) { if (val>0 && /^(0|[1-9][0-9]*)$/.test(val)) {
pf.val(val); pf.val(val);
@ -360,7 +368,8 @@
popmsg.msg(result.info); popmsg.msg(result.info);
} }
}, },
error:function(){ error:function(res){
console.log(res)
alert("服务端异常"); alert("服务端异常");
} }
}) })

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

After

Width:  |  Height:  |  Size: 8.9 KiB

Loading…
Cancel
Save