From 74050f139547769fca66a2e712560ef08bee0b28 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Fri, 1 Nov 2019 15:10:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?ios=20=E5=BA=94=E7=94=A8=E5=A4=96=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/View/default/Spend/paycallback.html | 3 +++ Application/Sdk/View/default/UserH/platform_pay_show.html | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Application/Sdk/View/default/Spend/paycallback.html b/Application/Sdk/View/default/Spend/paycallback.html index 7512d894..19ba00bc 100644 --- a/Application/Sdk/View/default/Spend/paycallback.html +++ b/Application/Sdk/View/default/Spend/paycallback.html @@ -50,6 +50,7 @@ $(function() { $("#payed").click(function() { var orderno=$('.orderno').val(); var device=$('.device').val(); + var Scheme=$('.Scheme').val(); $.ajax({ type: "post", @@ -79,12 +80,14 @@ $(function() { window.mengchuang.getPayResult('succeed'); } else { window.webkit.messageHandlers.exchangeResult.postMessage(1); + window.location.href = Scheme+"://1&back"; } } else { if (isAndroid) { window.mengchuang.getPayResult('fail'); } else { window.webkit.messageHandlers.exchangeResult.postMessage(0); + window.location.href = Scheme+"://0&back"; } } } diff --git a/Application/Sdk/View/default/UserH/platform_pay_show.html b/Application/Sdk/View/default/UserH/platform_pay_show.html index 5bbd4dbc..df68635a 100644 --- a/Application/Sdk/View/default/UserH/platform_pay_show.html +++ b/Application/Sdk/View/default/UserH/platform_pay_show.html @@ -51,10 +51,12 @@ $(function() { $("#pay").click(function() { if (!$("#money").val()) { - alert('金额不能为空') + alert('金额不能为空'); + return ; } if (!$("#money").val() < 0) { - alert('金额有误') + alert('金额有误'); + return ; } var money = $("#money").val(); From c785cea3604c9ad5b0cca95fe5138e64a6f70280 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Fri, 1 Nov 2019 15:25:02 +0800 Subject: [PATCH 2/5] ios alipay --- Application/Sdk/Controller/SpendController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php index 13b60ba9..09f22109 100644 --- a/Application/Sdk/Controller/SpendController.class.php +++ b/Application/Sdk/Controller/SpendController.class.php @@ -265,7 +265,7 @@ ADD COLUMN `pay_url` varchar(255) NOT NULL DEFAULT '' AFTER `check_sign`; } // 支付成功跳转页面 if ($result['pay_status'] == 1) { - $this->success("支付成功", U("userH/get_user_money", ['user_token' => $userToken])); + // $this->success("支付成功", U("userH/get_user_money", ['user_token' => $userToken])); } // 微信 支付宝 快捷 From 363f2fa279f732817fc77e37f42486995f708f02 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Fri, 1 Nov 2019 15:38:59 +0800 Subject: [PATCH 3/5] ios WXpay --- Application/Sdk/Controller/PayH5Controller.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php index e768a922..4fa18b6b 100644 --- a/Application/Sdk/Controller/PayH5Controller.class.php +++ b/Application/Sdk/Controller/PayH5Controller.class.php @@ -1159,14 +1159,15 @@ ADD COLUMN `pay_url` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER $is_pay = json_decode($weixn->weixin_pay("充值", $request['pay_order_number'], $pay_amount, 'MWEB'), true); if($is_pay['status']==1){ + if($request['code']==1){ - $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/user_token/".I('request.user_token'); + $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/game_id/{$request['game_id']}"; $request['pay_url'] = $json_data['url']; $this->add_spend($request,1); } - $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/game_id/{$request['game_id']}"; +// $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/game_id/{$request['game_id']}"; // (is_ssl()?'https%3A%2F%2F':'http%3A%2F%2F'). $_SERVER ['HTTP_HOST'] . "%2Fsdk.php%2FSpend%2Fpay_success%2Forderno%2F".$request['pay_order_number'].'%2Fgame_id%2F'.$request['game_id'] ; }else{ redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'支付失败', 'user_token' => $this->userToken)));exit; From fa2c127d73f68a265470deef0c5498bf9489f440 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Fri, 1 Nov 2019 15:40:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?ios=20=E5=BA=94=E7=94=A8=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Sdk/View/default/Spend/paycallback.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Application/Sdk/View/default/Spend/paycallback.html b/Application/Sdk/View/default/Spend/paycallback.html index 19ba00bc..cc01c719 100644 --- a/Application/Sdk/View/default/Spend/paycallback.html +++ b/Application/Sdk/View/default/Spend/paycallback.html @@ -79,15 +79,21 @@ $(function() { if (isAndroid) { window.mengchuang.getPayResult('succeed'); } else { - window.webkit.messageHandlers.exchangeResult.postMessage(1); - window.location.href = Scheme+"://1&back"; + try { + window.webkit.messageHandlers.exchangeResult.postMessage(1); + } catch() { + window.location.href = Scheme+"://1&back"; + } } } else { if (isAndroid) { window.mengchuang.getPayResult('fail'); } else { - window.webkit.messageHandlers.exchangeResult.postMessage(0); - window.location.href = Scheme+"://0&back"; + try { + window.webkit.messageHandlers.exchangeResult.postMessage(0); + } catch() { + window.location.href = Scheme+"://0&back"; + } } } } From 936f69062295a305ec9d5dba67603fa92d383edf Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Fri, 1 Nov 2019 15:41:53 +0800 Subject: [PATCH 5/5] =?UTF-8?q?ios=20=E5=BA=94=E7=94=A8=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/View/default/Spend/paycallback.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Sdk/View/default/Spend/paycallback.html b/Application/Sdk/View/default/Spend/paycallback.html index cc01c719..6feaee87 100644 --- a/Application/Sdk/View/default/Spend/paycallback.html +++ b/Application/Sdk/View/default/Spend/paycallback.html @@ -81,7 +81,7 @@ $(function() { } else { try { window.webkit.messageHandlers.exchangeResult.postMessage(1); - } catch() { + } catch(err) { window.location.href = Scheme+"://1&back"; } } @@ -91,7 +91,7 @@ $(function() { } else { try { window.webkit.messageHandlers.exchangeResult.postMessage(0); - } catch() { + } catch(err) { window.location.href = Scheme+"://0&back"; } }