From bd7aa6e744a64e943fdce1c227f587a33bf4f7d0 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 13 Mar 2020 16:55:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=94=AF=E4=BB=98bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/View/default/Shortcut/yee_step2.html | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Application/Sdk/View/default/Shortcut/yee_step2.html b/Application/Sdk/View/default/Shortcut/yee_step2.html index 6718d258..b56a57e6 100644 --- a/Application/Sdk/View/default/Shortcut/yee_step2.html +++ b/Application/Sdk/View/default/Shortcut/yee_step2.html @@ -350,7 +350,6 @@ @@ -376,7 +375,7 @@
银行卡签约
该银行卡未签约，无法进行充值，请获取短信验证进行签约
- +
手机号：18000000000
获取验证码
@@ -690,7 +689,6 @@ @@ -920,15 +918,15 @@ $(function (){ $(".bank_mode").hide(); }); - // $("#phoneNo").blur(function(){ - // $(".phone").children().text($(this).val()); - // $('.payment_input_phone').children().text($("#phoneNo").val()); - // }); - // - // $("#phoneNo_heng").blur(function(){ - // $(".phone_heng").children().text($(this).val()); - // $('.payment_input_phone').children().text($("#phoneNo_heng").val()); - // }); + $("#phoneNo").blur(function(){ + $(".phone").children().text($(this).val()); + // $('.payment_input_phone').children().text($("#phoneNo").val()); + }); + + $("#phoneNo_heng").blur(function(){ + $(".phone_heng").children().text($(this).val()); + // $('.payment_input_phone').children().text($("#phoneNo_heng").val()); + }); $(".bank_select_box").click(function(){ @@ -1027,6 +1025,7 @@ $(function (){ }); $('.forbid_confirm').click(function() { + $('.bank_mode').hide(); $('.forbid_model').hide(); $('.forbid_window').hide(); }); @@ -1141,6 +1140,7 @@ function getSms() { // $("#tipmsg").html(res.info); // $("#msgdialog").show(); Tip.msgShow(res.info); + $('.payment_code').hide(); sms.innerText="获取验证码"; smsstatus = true; return ; @@ -1221,6 +1221,7 @@ function getSms_heng() { Tip.msgShow(res.info); sms.innerText="获取验证码"; smsstatus = true; + $('.payment_code').hide(); return ; } if (res.status == 1) { @@ -1315,6 +1316,7 @@ $(".payment_input_phone_btn").click(function(){ //处理结果 if(result.status == 0){ Tip.msgShow(result.info); + $('.payment_code').hide(); }else if(result.status == 1){ Tip.tipShow("充值成功"); $("#tip_window").click(function(){ @@ -1384,6 +1386,7 @@ $(".payment_input_phone_btn_heng").click(function(){ //处理结果 if(result.status == 0){ Tip.msgShow(result.info); + $('.payment_code').hide(); }else if(result.status == 1){ Tip.tipShowHeng("充值成功"); $("#tip_confirm_heng").click(function(){ From 1c613fd48ab6b9df1c0c6d109a5cf186c658727e Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 13 Mar 2020 16:56:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=94=AF=E4=BB=98bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ShortcutController.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Application/Sdk/Controller/ShortcutController.class.php b/Application/Sdk/Controller/ShortcutController.class.php index 1337cc79..6d246ee5 100644 --- a/Application/Sdk/Controller/ShortcutController.class.php +++ b/Application/Sdk/Controller/ShortcutController.class.php @@ -869,15 +869,15 @@ class ShortcutController extends BaseController{ } //0 官方 1双乾 - if (get_shortcut_pay_type() == 0) { - // 暂时只有双乾 - }elseif(get_shortcut_pay_type() == 1){ - if($request['code']==1){ - $this->add_spend($request,1); - }else{ - $this->add_deposit($request,1); - } - } +// if (get_shortcut_pay_type() == 0) { +// // 暂时只有双乾 +// }elseif(get_shortcut_pay_type() == 1){ +// if($request['code']==1){ +// $this->add_spend($request,1); +// }else{ +// $this->add_deposit($request,1); +// } +// } // var_dump($request['goods_info']);die(); $this->assign("pay_amount", $request['actual_amount']?$request['actual_amount']:$request['price']); $this->assign("user_id", $request['user_id']); From e746dc28814f3cd067b87fc938cdba21913f4a5a Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 13 Mar 2020 16:57:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=94=AF=E4=BB=98bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ShortcutController.class.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Application/Sdk/Controller/ShortcutController.class.php b/Application/Sdk/Controller/ShortcutController.class.php index 4fba5365..6d246ee5 100644 --- a/Application/Sdk/Controller/ShortcutController.class.php +++ b/Application/Sdk/Controller/ShortcutController.class.php @@ -724,15 +724,15 @@ class ShortcutController extends BaseController{ } //0 官方 1双乾 -// if (get_shortcut_pay_type() == 0) { -// // 暂时只有双乾 -// }elseif(get_shortcut_pay_type() == 1){ -// if($request['code']==1){ -// $this->add_spend($request,1); -// }else{ -// $this->add_deposit($request,1); -// } -// } + if (get_shortcut_pay_type() == 0) { + // 暂时只有双乾 + }elseif(get_shortcut_pay_type() == 1){ + if($request['code']==1){ + $this->add_spend($request,1); + }else{ + $this->add_deposit($request,1); + } + } $this->assign("pay_amount", $request['actual_amount']?$request['actual_amount']:$request['price']); $this->assign("user_id", $request['user_id']); From 5fcf70a45b255de971658b9be6fe029d08a1372f Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 13 Mar 2020 17:04:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=BF=AB=E6=8D=B7=E6=94=AF=E4=BB=98bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/Controller/ShortcutController.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Application/Sdk/Controller/ShortcutController.class.php b/Application/Sdk/Controller/ShortcutController.class.php index 6d246ee5..545d8392 100644 --- a/Application/Sdk/Controller/ShortcutController.class.php +++ b/Application/Sdk/Controller/ShortcutController.class.php @@ -790,13 +790,13 @@ class ShortcutController extends BaseController{ C(api('Config/lists')); - if (!$is_platform) { - $request['extend'] = I('request.extend'); - $extend_data = M('spend','tab_')->where(array('extend'=>$request['extend'],'game_id'=>$request['game_id']))->find(); - if($extend_data){ - redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'is_platform'=> $is_platform,'msg'=>$request['game_id'].'订单号重复，请关闭支付页面重新支付'.$request['extend'], 'user_token' => $userToken)));exit; - } - } +// if (!$is_platform) { +// $request['extend'] = I('request.extend'); +// $extend_data = M('spend','tab_')->where(array('extend'=>$request['extend'],'game_id'=>$request['game_id']))->find(); +// if($extend_data){ +// redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'is_platform'=> $is_platform,'msg'=>$request['game_id'].'订单号重复，请关闭支付页面重新支付'.$request['extend'], 'user_token' => $userToken)));exit; +// } +// } //折扣 $user = get_user_entity($request['user_id']);