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

master
zhanglingsheng 5 years ago
commit d28ac347dc

@ -44,7 +44,8 @@ class ChangyanController extends Controller {
}
public function test()
{
// $this->assign('pay_amount',"0.01");
$this->assign('user_id',"1");
$this->assign('game_id',"1");
// $this->display("Spend/pay_way");
$this->display("WapPay/wap_shortcut_pay");
# code...

@ -387,6 +387,7 @@ ADD COLUMN `pay_url` varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
}
public function shortcut_notice() {
$status = $_GET['status'];
$orderno = $_GET ['orderno'] == "" ? $_GET ['out_trade_no'] : $_GET ['orderno'];
$pay_where = substr($orderno, 0, 2);
@ -407,7 +408,7 @@ ADD COLUMN `pay_url` varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`;
break;
}
$this->assign('Scheme', $Scheme);
$this->assign('status', $result['pay_status']);
$this->assign('status', $status);
$this->display();
}

@ -324,10 +324,21 @@ class WapPayController extends BaseController{
//echo "发起支付==》".time()."<br>";
if ($rsp['responseCode'] == '88') {
// sleep(5);
redirect(U('Spend/shortcut_notice',array('orderno' => $payInfo['order_id'], 'user_id'=>$param['user_id'],'game_id'=>$param['game_id'])));exit;
echo json_encode([
'status' => 1,
'info' => '请求成功',
'url' => U('Spend/shortcut_notice',array('status'=> 1, 'orderno' => $payInfo['order_id'], 'user_id'=>$param['user_id'],'game_id'=>$param['game_id'])),
]);
exit();
// redirect(U('Spend/shortcut_notice',array('status'=> 1, 'orderno' => $payInfo['order_id'], 'user_id'=>$param['user_id'],'game_id'=>$param['game_id'])));exit;
} else {
// 支付失败
redirect(U('Spend/pay_success',array('orderno' => $payInfo['order_id'], 'user_id'=>$param['user_id'],'game_id'=>$param['game_id'])));exit;
echo json_encode([
'status' => 0,
'info' => $rsp['resMess']
]);
exit();
// redirect(U('Spend/pay_success',array('status'=> 0, 'orderno' => $payInfo['order_id'], 'user_id'=>$param['user_id'],'game_id'=>$param['game_id'])));exit;
}
}

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

@ -0,0 +1,99 @@
<!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}">
<input type="hidden" name="status" class="status" value="{$status}">
<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 status = $('.status').val();
var u = navigator.userAgent;
var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
try{
if(isAndroid){
if (status == 1) {
notice = "succeed";
} else {
notice = "fail";
}
window.txyxsdk.getPayResult(notice);
}else{
window.webkit.messageHandlers.exchangeResult.postMessage(status);
}
}catch(err){
/* setTimeout(function () {
window.location.href= "/mobile.php?s=/User/index.html";
},1000) */
}
</script>
</div>
</div>
</body>
</html>

@ -171,17 +171,13 @@
border: 0px !important;
}
/* new */
/* canvas{
width: 2.18rem;
height:2.04rem;
} */
</style>
<body>
<!--加载提示框-->
<div class="js_dialog" id="Dialog" style="display: none">
<div class="js_dialog" id="Dialog" style="display: none;">
<div class="weui-mask"></div>
<div class="weui-dialog" style="width: 4.5rem;max-width: 4.5rem;display: flex;flex-direction:column;padding:.4rem .2rem;">
<!-- <div id="close_doalog" style="width: 100%;text-align: left;height: .6rem;display: flex;">
@ -321,11 +317,9 @@
<!-- -->
<div id="wfsubmit" style="border: 0;" class="weui-footer_fixed-bottom bottombutton">
立即提交订单
<!-- <input style="width: 100%;border: 0;margin: auto;position: absolute;top: 0;left: 0;opacity: 0;" onclick="return sendform()" type="submit" id="wfsubmit" name="wfsubmit" class="bottombutton"/> -->
</div>
</form>
</body>
<script type="text/javascript">
var validCode=true;
var smsstatus = true;
@ -536,7 +530,29 @@
if(isok){
btnpay = true;
Tip.loadShow();
$("#wfform").submit();
//更换表单提交方式
$.ajax({
type: "POST",
dataType: "json",
url: "{:U('WapPay/shortcut_pay')}" ,
data: $('#wfform').serialize(),
success: function (result) {
btnpay = false;
//处理结果
if(result.status == 0){
Tip.msgShow(result.info);
}else if(result.status == 1){
window.location.href = result.url;
}else{
Tip.msgShow('未知信息');
}
},
error: function() {
btnpay = false;
Tip.msgShow('网络请求异常,请稍后再试');
}
});
// $("#wfform").submit();
}
})

Loading…
Cancel
Save