From 91aa10fb8f8b7bbb47580968f85fe2bb9c490365 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Tue, 12 Nov 2019 09:49:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/View/default/Spend/paycallback.html | 4 ++-- .../Sdk/View/default/WapPay/wap_shortcut_pay.html | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Application/Sdk/View/default/Spend/paycallback.html b/Application/Sdk/View/default/Spend/paycallback.html index f03895f3..1943818b 100644 --- a/Application/Sdk/View/default/Spend/paycallback.html +++ b/Application/Sdk/View/default/Spend/paycallback.html @@ -9,7 +9,7 @@ 支付回调 -
+
@@ -25,7 +25,7 @@
--> -
+
diff --git a/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html b/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html index ad9b4c31..6324a2d8 100644 --- a/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html +++ b/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html @@ -196,7 +196,7 @@ function getSms() { if (time==0) { clearInterval(t); - sms.innerText="获取短信验证码"; + sms.innerText="获取验证码"; validCode=true; smsstatus = true; } @@ -211,7 +211,7 @@ function getSms() { $("#bankdialog").show(); } - sms.innerText="获取短信验证码"; + sms.innerText="获取验证码"; // $("#tipmsg").html(res.info); // $("#msgdialog").show(); smsstatus = true; @@ -265,7 +265,7 @@ function getSignSms() { if (time==0) { clearInterval(t); - sms.innerText="获取短信验证码"; + sms.innerText="获取验证码"; validCode=true; signsmsstatus = true; @@ -279,7 +279,7 @@ function getSignSms() { $("#tipmsg").html(res.info); $("#msgdialog").show(); $("#bankdialog").hide(); - $("#sign_sms").html("获取短信验证码"); + $("#sign_sms").html("获取验证码"); signsmsstatus = true; } } @@ -372,7 +372,7 @@ $(function() { if (tiptype == 1) { $("#msgdialog").hide(); $("#bankdialog").hide(); - $("#sign_sms").html("获取短信验证码"); + $("#sign_sms").html("获取验证码"); signsmsstatus = true; tiptype = 0; } From 59de045563a2eada2cdfcc6b3fd72fad89f7dd66 Mon Sep 17 00:00:00 2001 From: chenzhi <“chenzhi063@qq.com> Date: Tue, 12 Nov 2019 11:46:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ChangyanController.class.php | 6 ++ .../View/default/WapPay/wap_shortcut_pay.html | 84 +++++++++++++----- Public/Sdk/images/load.gif | Bin 66965 -> 66152 bytes 3 files changed, 67 insertions(+), 23 deletions(-) diff --git a/Application/Sdk/Controller/ChangyanController.class.php b/Application/Sdk/Controller/ChangyanController.class.php index 1a78f194..53581211 100644 --- a/Application/Sdk/Controller/ChangyanController.class.php +++ b/Application/Sdk/Controller/ChangyanController.class.php @@ -42,4 +42,10 @@ class ChangyanController extends Controller { ); } } + public function test() + { + $this->assign('pay_amount',"0.01"); + $this->display("WapPay/wap_shortcut_pay"); + # code... + } } diff --git a/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html b/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html index 6324a2d8..0716fb9c 100644 --- a/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html +++ b/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html @@ -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) { @@ -201,22 +223,16 @@ function getSms() { 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; + } } }); } @@ -380,16 +396,35 @@ $(function() { $("#msgdialog").hide(); $("#bankdialog").show(); } - }); + }); + $("#close_doalog").click(function(){ + $("#Dialog").hide(); + }) }); + +// +
+ 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;">

待支付……

-

订单超过30分钟自动取消,请在20分钟18秒内完成支付

+

订单超过30分钟自动取消,请在20分钟18秒内完成支付

+

支付结果将在两分钟内反馈,请稍后在游戏内查看

+
@@ -508,8 +545,9 @@ $(function() {
-