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
master
liuweiwen 5 years ago
parent 587da83973 c6ffac041f
commit 1686c7c3c0
2 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File

23
Application/Common/Common/extend.php
Unescape Escape View File

@ -1691,17 +1691,18 @@ function array_order($arr){
*/ */
function set_show_time($time = null,$type='time',$tab_type=''){ function set_show_time($time = null,$type='time',$tab_type=''){
$date = ""; $date = "";
switch ($type) { // switch ($type) {
case 'date': // case 'date':
$date = date('Y-m-d ',$time); // $date = date('Y-m-d ',$time);
break; // break;
case 'time': // case 'time':
$date = date('Y-m-d H:i',$time); // $date = date('Y-m-d H:i',$time);
break; // break;
default: // default:
$date = date('Y-m-d H:i:s',$time); // $date = date('Y-m-d H:i:s',$time);
break; // break;
} // }
$date = date('Y-m-d H:i:s',$time);
if(empty($time)){//若为空 根据不同情况返回 if(empty($time)){//若为空 根据不同情况返回
if($tab_type==''){ if($tab_type==''){
return "暂无登录"; return "暂无登录";

41
Application/Mobile/View/User/recharge.html
Unescape Escape View File

@ -10,6 +10,33 @@
<link rel="stylesheet" type="text/css" href="__CSS__/reset.css"> <link rel="stylesheet" type="text/css" href="__CSS__/reset.css">
<link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css"> <link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
<link rel="stylesheet" type="text/css" href="__CSS__/recharge.css"> <link rel="stylesheet" type="text/css" href="__CSS__/recharge.css">
<style>
.pop-dialog {
display: none;
position: fixed;
z-index: 1999;
top: 0;
left: 0;
right: 0;
text-align: center;
width: 100vw;
height: 100vh;
}
.pop-dialog span {
background: rgba(0,0,0,.6);
top: 50%;
color: #FFF;
display: inline-block;
line-height: 2;
position: relative;
word-break: break-all;
max-width: 2rem;
font-size: 0.32rem;
border-radius: 5px;
display: block;
margin: auto;
}
</style>
</head> </head>
<body> <body>
<div class="recharge"> <div class="recharge">
@ -175,20 +202,20 @@
</div> </div>
<!--<div class="popmsg pop-dialog"></div>--> <div class="popmsg pop-dialog"></div>
</body> </body>
<script type="text/javascript" src="__JS__/recharge.js"></script> <script type="text/javascript" src="__JS__/recharge.js"></script>
<script src="__JS__/pop.lwx.min.js"></script> <script src="__JS__/pop.lwx.min.js"></script>
<script> <script>
$(function() { $(function() {
//var popmsg = $('.popmsg').pop(); var popmsg = $('.popmsg').pop();
if (isWeiXin() || !is_mobile()) { if (isWeiXin() || !is_mobile()) {
$('#ch_weixin').hide(); $('#ch_weixin').hide();
$("#recharge_weixin").hide(); $("#recharge_weixin").hide();
} }
if(isWeiXin()){ if(isWeiXin()){
//popmsg.msg('请点击右上角按钮，选择在浏览器中打开去充值'); popmsg.msg('请点击右上角按钮，选择在浏览器中打开去充值');
alert('请点击右上角按钮，选择在浏览器中打开去充值'); // alert('请点击右上角按钮，选择在浏览器中打开去充值');
} }
$('.jstab .btn').click(function() { $('.jstab .btn').click(function() {
var that = $(this),parent = that.closest('.jstab'),sib=parent.siblings('.jslist'); var that = $(this),parent = that.closest('.jstab'),sib=parent.siblings('.jslist');
@ -319,11 +346,11 @@
}*/ }*/
if(obj.attr('id') == 'form2' && $.trim(game_id) == ''){ if(obj.attr('id') == 'form2' && $.trim(game_id) == ''){
//popmsg.msg('请选择充值游戏'); //popmsg.msg('请选择充值游戏');
alert("请选择充值游戏"); popmsg.msg("请选择充值游戏");
return false; return false;
} }
if($.trim(pay_amount) == ''){ if($.trim(pay_amount) == ''){
alert("请输入充值金额"); popmsg.msg("请输入充值金额");
//popmsg.msg('请输入充值金额'); //popmsg.msg('请输入充值金额');
return false; return false;
} }
@ -370,7 +397,7 @@
}, },
error:function(res){ error:function(res){
console.log(res) console.log(res)
alert("服务端异常"); popmsg.msg("服务端异常");
} }
}) })
}else{ }else{

Write Preview
Loading…
Cancel
Save