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

master
chenzhi 5 years ago
commit 3c102976eb

@ -319,13 +319,13 @@ class BaseController extends RestController{
} else {
switch ($result['code']) {
case 1021:{
$this->set_message(1010,"fail","验证码已失效,请重新获取");
$this->new_set_message(1010,"验证码已失效,请重新获取");
};break;
case 1022:{
$this->set_message(1022,"fail","验证码不正确,请重新输入");
$this->new_set_message(1022,"验证码不正确,请重新输入");
};break;
default:
$this->set_message($result['code'],"fail",$result['msg']);
$this->new_set_message($result['code'],$result['msg']);
}
}

@ -83,8 +83,10 @@ class ExchangeController extends BaseController{
// $url = C('PAY_DOMAIN') . '/sdk.php?s=/Spend/'.$payPage.'&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1'.'&user_token='.$userToken.'&action=pay';
file_put_contents("./Application/Sdk/OrderNo/".$request['user_id']."-".$request['game_id'].".txt",think_encrypt(json_encode($request)));
$url = C('PAY_DOMAIN') . '/sdk.php?s=/userH/platform_pay/account/'.$request['account'].'&user_token='.$userToken.'&game_id='.$request['game_id'].'&money='.$request['price'].'&action=pay1&api_ver=1';
echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>$url)));
// $url = C('PAY_DOMAIN') . '/sdk.php?s=/userH/platform_pay/account/'.$request['account'].'&user_token='.$userToken.'&game_id='.$request['game_id'].'&money='.$request['price'].'&action=pay1&api_ver=1';
// echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>$url)));
echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>C('PAY_DOMAIN').'/sdk.php?s=/Spend/pay_way_v1&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1'.'&user_token='.$userToken)));exit;
exit;
} else {

@ -46,7 +46,7 @@ class NoticeController extends BaseController{
$notice_list = $notice
->field('id as notice_id,title,start_time as create_time,1 as type')
->where($map)
->order('level desc')
->order('level desc,create_time desc')
->select();
$notice_read_model = M('notice_read', 'tab_');
$notice_read = M('notice_read', 'tab_')

@ -622,7 +622,7 @@ ADD COLUMN `pay_url` text NULL AFTER `check_sign`;
$is_pay = json_decode($weixn->weixin_pay("充值", $request['pay_order_number'], $pay_amount, 'MWEB'), true);
if($is_pay['status']==1){
$json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/user_token/".$this->userToken."/paytype/weixinpay";
$json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/user_token/".$this->userToken."/paytype/weixinpay/game_id/{$game_id}";
$request['pay_url'] = $json_data['url'];
$this->add_deposit($request, 1);
// .(is_ssl()?'https%3A%2F%2F':'http%3A%2F%2F'). $_SERVER ['HTTP_HOST'] . "%2Fsdk.php%2FSpend%2Fpay_success%2Forderno%2F".$request['pay_order_number'].'%2Fgame_id%2F'.$request['game_id'] ;

@ -112,6 +112,44 @@ class SpendController extends Controller {
}
public function pay_way_v1() {
$user_id = I ('user_id');
$game_id = I ('game_id');
$file = file_get_contents ( "./Application/Sdk/OrderNo/" . $user_id . "-" . $game_id . ".txt" );
$request = json_decode ( think_decrypt ( $file ), true );
$data = array(
'coin' => $request ['body'],
'price' => $request ['price'],
'game_name' => $request ['game_name'],
'code' => $request ['code']
);
$balance = M ( 'user', 'tab_' )->where ( array (
'id' => $user_id
) )->getField ( 'balance' );
$bind_balance = M ( 'user_play', 'tab_' )->where ( array (
'user_id' => $user_id,
'game_id' => $game_id
) )->getField ( 'bind_balance' );
// $data['price'] = 1;
$this->assign ( 'balance', $balance );
$this->assign ( 'bind_balance', $bind_balance );
$this->assign ( 'data', $data );
$this->assign ( 'btncolor', $request ['btncolor'] );
if ($balance + $bind_balance > $data['price']) {
$this->assign ('pay_price', 0); // 是否第三方支付
} else {
$payPrice = $data['price'] - $balance - $bind_balance;
$this->assign ('pay_price', $payPrice ? $payPrice : 0);
}
/* $this->assign ( 'alipayurl', $ret[0]['payURL']);
header("Access-Control-Allow-Origin: *"); */
$this->display ();
}
/**
* 支付页面
*

@ -0,0 +1,249 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<title></title>
<link href="__CSS__/index.css" rel="stylesheet" />
<style>input{outline:none;-webkit-appearance:none;}
html{font-size:12px;}
body {background:#F3F2F7;font-size:inherit;}
i{font-style:normal;font-weight:normal;}
.recharge_table {display:table;width:100%;}
.recharge_table .recharge_cell {display:table-cell;vertical-align:middle;text-align:center;}
.recharge_content {margin:0 auto;}
.recharge_content span {display:block;}
.recharge_money {height:5.818rem;background:#FFF;}
.recharge_content_number {color:#01B1EC;font-size:1.3rem;}
.recharge_content_coin,.recharge_game_name {color:#999;}
.recharge_content_number i {font-size:1.636rem;}
.recharge_game {background:#FFF;font-size:1.2rem;height:3.727rem;line-height:3.737rem;border-top:2px solid #DEE2E5;}
.recharge_game .recharge_value {padding:0 1.13rem;}
.recharge_way {height:10.8rem;}
.recharge_way_title {height:2.7rem;line-height:2.7rem;text-align:center;font-size:1.07rem;}
.recharge_way_content,.recharge_way_wrap {height:8rem;}
.recharge_way_btn {height:7.2rem;display:inline-block;}
.recharge_way_btn img{width:6.84rem;height:6.84rem;display:inline-block;margin-top:.18rem;}
.recharge_way_btn_alipay img{width:6.84rem;height:6.84rem;margin-top:0;}
.platform_pop {position:absolute;top:0;left:0;width:100%;height:100%;display:none;}
.platform_pop_table {width:100%;height:100%;}
.platform_box {color:#999;position:relative;top:0;left:auto;right:auto;width:24rem;display:block;margin:0 auto;background:#FFF;border-radius:.3rem;}
.platform_pop_close {position:absolute;top:0.8rem;right:0.8rem;color:#999;}
.platform_pop_close img {width:1.7rem;height:1.7rem;}
.platform_title {line-height:3.4rem;font-size:1.8rem;}
.platform_content {padding:0 0.8rem;text-align:left;font-size:1.5rem;}
.platform_notice {color:#333;line-height:1.4;}
.platform_notice span {color:red;}
.platform_radio {padding-top:.2rem;padding-bottom:0.2rem;}
.platform_radio .platform_radio_item {display:block;line-height:1.8;position:relative;}
.platform_radio_item input {position:absolute;top:0;left:0;z-index:-1;width:1.8rem;height:1.8rem;}
.platform_radio_item input~i{width:1.6rem;height:1.6rem;background:url(__IMG__/btn_check_n.png) center center no-repeat;background-size:100% 100%;display:inline-block;vertical-align:middle;margin-top:-.3rem;margin-right:0.2rem;}
.platform_radio_item input:checked~i{background-image:url(__IMG__/btn_check_s.png);}
.platform_btn {padding:0.2rem .8rem 1rem;}
.platform_btn input {background:#F9AB42;color:#FFF;line-height:1.8;font-size:1.8rem;border:none;width:100%;border-radius:.3rem;}
@media screen and (max-width:400px) {
.recharge_game {border-top-width:1px;}
}
</style>
<script src="__JS__/jquery-1.11.1.min.js"></script>
<script src="__STATIC__/layer_mobile/layer.js"></script>
</head>
<body>
<div class="containers">
<div class="recharge_money recharge_table">
<div class="recharge_cell">
<div class="recharge_content">
<span class="recharge_content_number"><i>{$data.price}</i></span>
<span class="recharge_content_coin">{$data.coin}</span>
</div>
</div>
</div>
<eq name="data.code" value="1">
<div class="recharge_game">
<div class="recharge_value">
<span class="recharge_game_name">游戏名称:</span>
<span>{$data.game_name}</span>
</div>
</div>
</eq>
<div class="recharge_way">
<div class="recharge_way_title">请选择支付方式</div>
<div class="recharge_way_content">
<div class="recharge_way_wrap recharge_table">
<if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1 and C('heepay.wxp') eq 1)">
<div class="recharge_cell">
<a href="{:U('Apple/apple_weixin_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" class="recharge_way_btn recharge_way_btn_wechat"><img src="__IMG__/btn_pay_wechat@3x.png"></a>
</div>
</if>
<if condition="C('alipay.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.zfb') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.zfb') eq 1)">
<div class="recharge_cell">
<!-- <a href="{:U('Apple/apple_alipay_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" class="recharge_way_btn recharge_way_btn_alipay"><img src="__IMG__/btn_pay_alipay@3x.png"></a>
-->
<a href="javascript:;" data-url="/sdk.php?s=/Apple/apple_alipay_pay&user_id={:I('user_id')}&game_id={:I('game_id')}" id="alipaybtn" class="recharge_way_btn recharge_way_btn_alipay"><img src="__IMG__/btn_pay_alipay@3x.png"></a>
<!--
<a href="{$alipayurl}" data-url="" id="alipaybtn" class="recharge_way_btn recharge_way_btn_alipay"><img src="__IMG__/btn_pay_alipay@3x.png"></a>
-->
</div>
</if>
<if condition="C('sqpay.status') eq 1 and C('sqpay.union') eq 1">
<div class="recharge_cell">
<a href="{:U('Apple/apple_union_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" class="recharge_way_btn recharge_way_btn_alipay">
<img src="__IMG__/unionpay.png"></a>
</div>
</if>
<if condition="pay_set_status('ptb_pay') eq 1 and $data['code'] eq 1">
<div class="recharge_cell">
<a href="javascript:;" id="platform_id" class="recharge_way_btn recharge_way_btn_platform"><img src="__IMG__/btn_pay_platform@3x.png"></a>
</div>
</if>
<if condition="pay_set_status('bind_pay') eq 1 and $data['code'] eq 1">
<div class="recharge_cell">
<a href="javascript:;" id="platform_id1" class="recharge_way_btn recharge_way_btn_platform"><img src="__IMG__/icon_bangbi@3x.png"></a>
</div>
</if>
<if condition="C('sqpay.status') eq 1 and C('sqpay.shortcut') eq 1">
<div class="recharge_cell">
<a href="{:U('WapPay/wap_shortcut_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" class="recharge_way_btn recharge_way_btn_alipay">
<img src="__IMG__/unionpay.png"></a>
</div>
</if>
</div>
</div>
</div>
<div class="platform_pop" id="platform_pop">
<div class="platform_pop_table recharge_table">
<div class="recharge_cell">
<form class="platform_box" action="{:U('Apple/apple_platform_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" enctype="multipart/form-data" method="post">
<a href="javascript:;" id="platform_pop_close" class="platform_pop_close"><img src="__IMG__/icon_close@3x.png" ></a>
<div class="platform_title">平台币</div>
<div class="platform_content">
<div class="platform_notice">应付款平台币数量:<span>{$data.price}</span></div>
<div class="platform_radio">
<label class="platform_radio_item"><input type="radio" name="way" value="1" checked><i></i>平台币余额:<span>{$balance}</span></label>
</div>
</div>
<div class="platform_btn">
<input type="submit" value="立即支付" style="background-color:<notempty name='btncolor'>#{$btncolor}<else />#F9AB42</notempty>">
</div>
</form>
</div>
</div>
</div>
<div class="platform_pop" id="platform_pop1">
<div class="platform_pop_table recharge_table">
<div class="recharge_cell">
<form class="platform_box" action="{:U('Apple/apple_platform_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" enctype="multipart/form-data" method="post">
<a href="javascript:;" id="platform_pop_close1" class="platform_pop_close"><img src="__IMG__/icon_close@3x.png" ></a>
<div class="platform_title">绑币平台币</div>
<div class="platform_content">
<div class="platform_notice">应付款绑币数量:<span>{$data.price}</span></div>
<div class="platform_radio">
<label class="platform_radio_item"><input type="radio" name="way" value="2" checked><i></i>绑定平台币余额:<span>{$bind_balance}</span></label>
</div>
</div>
<div class="platform_btn">
<input type="submit" value="立即支付" style="background-color:<notempty name='btncolor'>#{$btncolor}<else />#F9AB42</notempty>">
</div>
</form>
</div>
</div>
</div>
</div>
</body>
<script>
var html=document.getElementsByTagName('html')[0];
function fontsizechange() {
var rate = html.clientWidth/640;
var basesize = 22;
html.style.fontSize = (rate>1?basesize:basesize*rate)+'px';
}
fontsizechange();
window.onresize = function() {
fontsizechange();
}
$(function() {
$(".recharge_way_wrap a").one("click",function(){
$(this).click(function (){return false;});
});
$('#platform_id').on('click',function() {
$('#platform_pop').fadeIn().find('#platform_pop_close').on('click',function() {
$(this).closest('#platform_pop').fadeOut();
return false;
});
return false;
});
$('#platform_id1').on('click',function() {
$('#platform_pop1').fadeIn().find('#platform_pop_close1').on('click',function() {
$(this).closest('#platform_pop1').fadeOut();
return false;
});
return false;
});
$('#alipaybtn').on('click',function() {
var that = $(this),url = $.trim(that.attr('data-url'));
if(that.hasClass('disabledbtn')){return false;}
that.addClass('disabled');
$.ajax({
type:'post',
dataType:'json',
data:{},
url:url,
success:function(result) {
if(result.code==200) {
var data = result.data;
if(data.wap==1) {
location.href = data.url;
} else if (data.wap==1) {
window.webkit.messageHandlers.noticeAppResult.postMessage(data.url);
}
else {
window.webkit.messageHandlers.noticeAppResult.postMessage(data.url);
}
} else {
layer.open({
content: result.msg
,skin: 'msg'
,time: 2 //2秒后自动关闭
});
}
},error:function() {
that.removeClass('disabledbtn');
}
});
return false;
});
});
</script>
</html>
Loading…
Cancel
Save