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

master
Your Name 5 years ago
commit c08cc909d7

@ -294,7 +294,8 @@ class PayH5Controller extends BaseController{
$pay_url=$this->pay($request);
$request['pay_url'] = $pay_url['url'];
$orderno = $pay_url['out_trade_no'];
// echo json_encode(['code'=>200,'msg'=>'','data'=>['url'=>$pay_url['url'],'wap'=>1]]);exit;
// pp($request['pay_url']); todo: 又问提 死循环。。。
//echo json_encode(['code'=>200,'msg'=>'','data'=>['url'=>$pay_url['url'],'wap'=>1]]);exit;
} else {/* app */
$game_set_data = get_game_set_info($request['game_id']);
$request['apitype'] = "alipay";
@ -302,19 +303,20 @@ class PayH5Controller extends BaseController{
$request['signtype'] = "MD5";
$request['server'] = "mobile.securitypay.pay";
$request['payway'] = 1;
file_put_contents(dirname(__FILE__) .'/alipay.txt',json_encode($request));
// file_put_contents(dirname(__FILE__) .'/alipay.txt',json_encode($request));
$data = $this->alipay_app_pay($request);
$md5_sign = $this->encrypt_md5(base64_encode($data['arg']), $game_set_data["access_key"]);
$data = array("orderInfo" => base64_encode($data['arg']), "out_trade_no" => $data['out_trade_no'], "order_sign" => $data['sign'], "md5_sign" => $md5_sign);
$request['pay_url'] = json_encode($data);
$orderno = $data['out_trade_no'];
// echo json_encode(['code'=>200,'msg'=>'','data'=>['url'=>json_encode($data),'wap'=>0]]);exit;
//echo json_encode(['code'=>200,'msg'=>'','data'=>['url'=>json_encode($data),'wap'=>0]]);exit;
}
// 存入pay_url 继续支付
M("spend", "tab_")->where([
'extend' => $request['extend'],
'game_id' => $request['game_id'],
'pay_order_number' => $pay_url['out_trade_no']
'pay_order_number' => $orderno
])->save([
'pay_url' => $request['pay_url']
]);
@ -402,14 +404,22 @@ class PayH5Controller extends BaseController{
echo json_encode(['code'=>200,'msg'=>'','data'=>['url'=>$pay_url['msg'],'wap'=>1]]);exit;
}
}
redirect(U('spend/paycallback', array(
'sdk_version' => $request['sdk_version'],
/* $url = U('spend/paycallback', array(
'sdk_version' => $request['sdk_version'],
'paytype' => 'alipay',
'orderno' => $orderno,
'game_id' => $game_id,
'gopay' => 1 // 立即支付
)));
));
redirect($url); */
echo json_encode(['code' => 200, 'url' => U('spend/paycallback', array(
'sdk_version' => $request['sdk_version'],
'paytype' => 'alipay',
'orderno' => $orderno,
'game_id' => $game_id,
'gopay' => 1 // 立即支付
))]);
exit;
}
private function alipay_app_pay($param = array())

@ -221,7 +221,7 @@ class SpendController extends Controller {
$result = M ( 'Spend', 'tab_' )->field ( "pay_status" )->where ( $map )->find ();
$this->assign ( 'paystatus', $result ['pay_status'] );
$this->display ( 'pay_success' );
$this->display ( 'pay_success3' );
}
public function pay_error() {
$Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" );
@ -297,7 +297,7 @@ ADD COLUMN `pay_url` varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
$this->assign("orderno", $orderno);
$this->assign("paytype", $paytype);
$this->assign ('pay_url', $result['pay_url']);
$this->assign("device", $result['sdk_version']?:0);
$this->assign("sdk_version", $result['sdk_version']?:0);
$this->assign ('Scheme', $Scheme);
$this->assign ('gopay', $gopay);

@ -99,7 +99,7 @@ var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
try{
if(isAndroid){
window.mengchuang.getPayResult('fail');
window.txyxsdk.getPayResult('fail');
}else{
window.webkit.messageHandlers.exchangeResult.postMessage(0);
}

@ -0,0 +1,195 @@
<!DOCTYPE HTML>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1,minimal-ui">
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
<title>充值</title>
</head>
<body>
<style>
html{ background: #E2E2E2; height:100%;}
body {letter-spacing: 0.05em; padding-top:1px; background:#fff; min-height:100%; font-family: -apple-system, BlinkMacSystemFont, "PingFang SC","Helvetica Neue",STHeiti,"Microsoft Yahei",Tahoma,Simsun,sans-serif; position:relative; max-width:650px;min-width:320px; margin:0 auto; font-family: arial,"微软雅黑",STHeiti,"Microsoft Yahei",tahoma,'Hiragino Sans GB',sans-serif;}
a{ text-decoration:none;}
.pay_suc{}
.pay_suc{ text-align:center; width:80%; padding:40px 0px; margin:0 auto;}
.pay_suc img{ width:30%; max-width:150px;}
.pay_suc span{ font-size:18px; color:#333; width:90%; display:block; margin: 20px auto; line-height:25px;}
.pay_suc h3{ font-size:20px; color:#333; font-weight:bold; height:50px; margin-top:30px; border-bottom:1px dashed #e7e7e7; color:#0bc8a6;}
.pay_suc p{ color: #999;
height: 30px;
line-height: 30px;
text-align: center;
width: 80%;
max-width:210px!important;
font-size: 0.8em;
display: block;
margin: 0 auto;}
.pay_suc a{width: 80%;
max-width:300px;
border: 1px solid #999;
color: #999;
border-radius: 3px;
height: 45px;
line-height: 45px;
display: block;
margin: 0 auto; margin-top:40px;}
.pay_suc a:hover{ background:#999; color:#fff;}
</style>
<div class="news_area" style="padding:0px;">
<input type="hidden" name="pay_order_number" class="orderno" value="{:I('pay_order_number')}">
<input type="hidden" name="Scheme" class="Scheme" value="{$Scheme}">
<br/><br/><br/><br/><br/>
<style>
.notice {
margin: 0 auto;
padding: 0;
font-size: 1.2rem;
background: rgba(25,177,234);
color: #fff;
line-height: 3.2rem;
width: 80%;
border-radius: 0.7rem;
}
</style>
<!--未绑定-->
<div class="pay_suc">
<if condition="$paystatus eq 1">
<img src="__IMG__/my_suc.png">
<h3>支付成功</h3>
<button class="notice" id="back_success">点击返回</button>
<script src="__JS__/jquery-1.11.1.min.js"></script>
<script type="text/javascript">
var orderno=$('.orderno').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
try{
if(isAndroid){
window.mengchuang.getPayResult('succeed');
}else{
window.webkit.messageHandlers.exchangeResult.postMessage(1);
}
}catch(err){
/* setTimeout(function () {
window.location.href= "/mobile.php?s=/User/index.html";
},1000) */
}
</script>
<else/>
<img src="__IMG__/my_fail.png">
<h3>支付失败{$paystatus}</h3>
<button class="notice" id="back_error">点击返回</button>
<script src="__JS__/jquery-1.11.1.min.js"></script>
<script type="text/javascript">
var orderno=$('.orderno').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
try{
if(isAndroid){
window.txyxsdk.getPayResult('fail');
}else{
window.webkit.messageHandlers.exchangeResult.postMessage(0);
}
}catch(err){
/* setTimeout(function () {
window.location.href= "/mobile.php?s=/User/index.html";
},1000) */
}
</script>
</if>
<!-- <p>商品名称: 赤月传说</p> -->
<!-- <p>商品金额: 8887845</p> -->
<!-- <a href="mengchuang://showWapPayResult_btnType_?1&back">返回</a> -->
</div>
<!--未绑定结束-->
</div>
<script>
$("#back_success").click(function() {
/* var orderno=$('.orderno').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
try{
if(isAndroid){
window.mengchuang.getPayResult('succeed');
}else{
window.webkit.messageHandlers.exchangeResult.postMessage(1);
}
}catch(err){
} */
var Scheme=$('.Scheme').val();
var orderno=$('.orderno').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
if(isAndroid){
window.txyxsdk.getPayResult('succeed');
}else{
<if condition="get_wx_type() neq 1">
window.location.href = Scheme+"://1&back";
<else/>
window.location.href = "mengchuang://showWapPayResult_btnType_?1&back";
</if>
}
});
$("#back_error").click(function() {
/* var orderno=$('.orderno').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
try{
if(isAndroid){
window.mengchuang.getPayResult('fail');
}else{
window.webkit.messageHandlers.exchangeResult.postMessage(0);
}
}catch(err){
} */
var Scheme=$('.Scheme').val();
var orderno=$('.orderno').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
if(isAndroid){
window.txyxsdk.getPayResult('fail');
}else{
<if condition="get_wx_type() neq 1">
if (!Scheme)
;
else
window.location.href = Scheme+"://0&back";
<else/>
window. location.href = "mengchuang://showWapPayResult_btnType_?0&back";
</if>
}
});
</script>
</body>
</html>

@ -271,15 +271,27 @@ $(function() {
})
$("#platform_pay").click(function() {
var url = "{:U('Apple/platform_coin_deduction',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}";
var url = "{:U('PayH5/platform_coin_deduction',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}";
window.location.href = url;
});
$('#alipaybtn').on('click',function() {
if (flag) return ;
flag = true;
var url = $(this).data('url');
$.ajax({
type:'post',
dataType:'json',
data:{},
url:url,
success:function(result) {
if(result.code==200) {
window.location.href = result.url;
}
}
});
window.location.href = $(this).data('url');
return false;
});

@ -12,9 +12,9 @@
<div class="callback-box">
<input type="hidden" name="pay_order_number" class="orderno" value="{$orderno}">
<input type="hidden" name="Scheme" class="Scheme" value="{$Scheme}">
<input type="hidden" name="device" class="device" value="{$device}">
<input type="hidden" name="sdk_version" id="sdk_version" class="sdk_version" value="{$sdk_version}">
<input type="hidden" name="at_once" class="at_once" value="{$at_once}">
<input type="hidden" name="gopay_url" class="gopay_url" value="{$gopay_url}">
<input type="hidden" name="gopay_url" class="gopay_url" value='{$gopay_url}'>
<input type="hidden" name="gopay" class="gopay" value="{$gopay}">
<input type="hidden" name="aliapp" class="aliapp" value="{$aliapp}">
@ -40,7 +40,7 @@
</eq>
<eq name="paytype" value="alipay">
<a id="alipay" data-url="{$gopay_url}" style="background:url('__IMG__/callback/btn1.png') no-repeat center center/100% 100%;">
<a id="alipay" data-url='{$gopay_url}' style="background:url('__IMG__/callback/btn1.png') no-repeat center center/100% 100%;">
继续支付
</a>
</eq>

Loading…
Cancel
Save