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

master
tpingzhang 5 years ago
commit 68089d10d2

@ -42,4 +42,10 @@ class ChangyanController extends Controller {
);
}
}
public function test()
{
$this->assign('pay_amount',"0.01");
$this->display("WapPay/wap_shortcut_pay");
# code...
}
}

@ -9,7 +9,7 @@
<title>支付回调</title>
</head>
<body>
<div class="callback-box">
<div class="callback-box" style="padding-top: 100px;box-sizing: border-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="sdk_version" id="sdk_version" class="sdk_version" value="{$sdk_version}">
@ -25,7 +25,7 @@
<img src="__IMG__/callback/close.png">
</a>
</div> -->
<div class="wxicon" style="margin-top: 100px;">
<div class="wxicon">
<eq name="paytype" value="weixinpay">
<img src="__IMG__/wxpay2x.png">
<else />

@ -115,7 +115,7 @@
z-index: 2;
}
.paypage{
padding: 0 .3rem 1.2rem;margin-top:-1.8rem;
padding: 0 .3rem .5rem;margin-top:-1.8rem;
}
.bottombutton{
height:1rem;background-color: #21B1EB;color: #ffffff;font-size: .32rem;text-align: center;line-height:1rem;bottom: 0px;
@ -131,6 +131,21 @@
.paypage{
padding: 0 .3rem .3rem;margin-top:-1.8rem;
}
.bottombutton{
width: 100%;
}
}
@media screen and (orientation:portrait) {
.weui-footer_fixed-bottom{
position: relative;
bottom: 0px;
border-radius:35px;
}
.bottombutton{
width:5rem;
margin: auto;
}
}
/* new */
.weui-dialog{
@ -185,7 +200,14 @@ function getSms() {
'phoneNo' : $("#phoneNo").val()
},
success:function(res){
// 返回列表数组,构造数据流模块
// 返回列表数组,构造数据流模块
if(res.status == 0){
$("#tipmsg").html(res.info);
$("#msgdialog").show();
sms.innerText="获取验证码";
smsstatus = true;
return ;
}
if (res.status == 1) {
var time=60;
if (validCode) {
@ -196,27 +218,21 @@ function getSms() {
if (time==0) {
clearInterval(t);
sms.innerText="获取短信验证码";
sms.innerText="获取验证码";
validCode=true;
smsstatus = true;
}
},1000);
}
}
else {
if (res.status== 2) { // 未签约
// 展示未签约页面
$("#sign_mibile").html($("#phoneNo").val());
$("#bankdialog").show();
}
sms.innerText="获取短信验证码";
// $("#tipmsg").html(res.info);
// $("#msgdialog").show();
smsstatus = true;
}
if (res.status == 2) {
// 未签约
// 展示未签约页面
$("#sign_mibile").html($("#phoneNo").val());
$("#bankdialog").show();
sms.innerText="获取验证码";
smsstatus = true;
}
}
});
}
@ -265,7 +281,7 @@ function getSignSms() {
if (time==0) {
clearInterval(t);
sms.innerText="获取短信验证码";
sms.innerText="获取验证码";
validCode=true;
signsmsstatus = true;
@ -279,7 +295,7 @@ function getSignSms() {
$("#tipmsg").html(res.info);
$("#msgdialog").show();
$("#bankdialog").hide();
$("#sign_sms").html("获取短信验证码");
$("#sign_sms").html("获取验证码");
signsmsstatus = true;
}
}
@ -372,7 +388,7 @@ $(function() {
if (tiptype == 1) {
$("#msgdialog").hide();
$("#bankdialog").hide();
$("#sign_sms").html("获取短信验证码");
$("#sign_sms").html("获取验证码");
signsmsstatus = true;
tiptype = 0;
}
@ -380,16 +396,35 @@ $(function() {
$("#msgdialog").hide();
$("#bankdialog").show();
}
});
});
$("#close_doalog").click(function(){
$("#Dialog").hide();
})
});
//
</script>
<body>
<!--加载提示框-->
<div class="js_dialog" id="Dialog" style="display: none">
<div class="weui-mask"></div>
<div class="weui-dialog" style="width: 4.2rem;max-width: 4.2rem;display: flex;">
<img src="__IMG__/load.gif" style="width: 4.2rem;height: 3.2rem;">
<div class="weui-dialog" style="width: 4.5rem;max-width: 4.5rem;display: flex;flex-direction:column;padding-bottom: .3rem;">
<div id="close_doalog" style="width: 100%;text-align: left;height: .6rem;display: flex;">
<img src="__IMG__/close-black.png" style="width: .3rem;height: .3rem;margin: .3rem 0 0 .3rem;">
</div>
<div style="width: 100%;text-align: center;">
<img src="__IMG__/load.gif" style="width:2.18rem;height:2.04rem;">
</div>
<p style="text-align: center;font-size: .24rem;margin:auto;line-height: 1.5;color:#292929;margin-top: -.5rem;">
支付结果将在两分钟内反馈<br/>请稍后在游戏内查看
</p>
<div style="width: 100%;text-align: center;display: flex;justify-content:center;margin-top:.5rem;">
<div style="width: 3.3rem;height: .6rem;background-color: #21B1EB;color: #ffffff;font-size: .28rem;border-radius:30px;line-height: .6rem;">
返回游戏
</div>
</div>
</div>
</div>
<!--提醒信息弹窗-->
@ -443,9 +478,11 @@ $(function() {
</div>
<div
style="height: 3.1rem;background-color: #21B1EB;color: #fff;border-bottom-left-radius:40%;border-bottom-right-radius:40%;padding: .43rem .3rem;line-height: 1.5;">
style="height: 3.1rem;background-color: #21B1EB;color: #fff;border-bottom-left-radius:30%;border-bottom-right-radius:30%;padding: .43rem .3rem .6rem;line-height: 1.5;">
<p style="font-size: .4rem;">待支付……</p>
<p style="font-size: .24rem;margin-top:.32rem;">订单超过30分钟自动取消请在20分钟18秒内完成支付</p>
<p style="font-size: .24rem;margin-top:.3rem;">订单超过30分钟自动取消请在20分钟18秒内完成支付</p>
<p style="font-size: .24rem;">支付结果将在两分钟内反馈,请稍后在游戏内查看</p>
</div>
<form id="wfform" name="wfform" method="post" action="{:U('WapPay/shortcut_pay')}" target="_parent">
<input type="hidden" id="wfddll" name="wfddll" value="wfddll" />
@ -508,8 +545,9 @@ $(function() {
</div>
</div>
<!-- -->
<div style="width: 100%;border: 0;" name="wfsubmit" class="weui-footer_fixed-bottom bottombutton">
<input style="width: 100%;border: 0;" onclick="return sendform()" type="submit" id="wfsubmit" name="wfsubmit" value="立即提交订单" class="weui-footer_fixed-bottom bottombutton"/>
<div 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>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 65 KiB

Loading…
Cancel
Save