From 57f1929bf9d8e039f0020bc0adb7410fb9ee5cab Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Mon, 30 Sep 2019 17:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=94=AF=E4=BB=98=E5=AE=9Dwa?=
 =?UTF-8?q?p=20=E6=94=AF=E4=BB=98=E8=BF=94=E5=9B=9E=20bug=E3=80=82android?=
 =?UTF-8?q?=20=20ios=20=E9=83=BD=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/SpendController.class.php  |  3 +++
 .../Sdk/View/default/Spend/pay_error.html     | 20 ++++++++++++++++---
 .../Library/Think/Pay/Driver/Alipay.class.php |  2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Application/Sdk/Controller/SpendController.class.php b/Application/Sdk/Controller/SpendController.class.php
index 45e606255..3ab04ae10 100644
--- a/Application/Sdk/Controller/SpendController.class.php
+++ b/Application/Sdk/Controller/SpendController.class.php
@@ -146,6 +146,9 @@ class SpendController extends Controller {
 		$this->display ( 'pay_success' );
 	}
 	public function pay_error() {
+		$Scheme = file_get_contents ( "./Application/Sdk/Scheme/" . $_GET ['game_id'] . ".txt" );
+		
+		$this->assign ('Scheme', $Scheme?$Scheme:'txplatformsdk');
 		$this->display ();
 	}
 	public function notice($user_id = 0, $game_id = 0, $msg = '') {
diff --git a/Application/Sdk/View/default/Spend/pay_error.html b/Application/Sdk/View/default/Spend/pay_error.html
index e044ca8a7..380872648 100644
--- a/Application/Sdk/View/default/Spend/pay_error.html
+++ b/Application/Sdk/View/default/Spend/pay_error.html
@@ -41,6 +41,7 @@ border: 1px solid #999;
 
 </style>
 <div class="news_area" style="padding:0px;">
+<input type="hidden" value="{$Scheme}" id="scheme"/>
 
 <!--未绑定-->
 <div class="pay_suc">
@@ -48,7 +49,7 @@ border: 1px solid #999;
 <h3>支付失败</h3>
 <!-- <p>商品名称: 赤月传说</p> -->
 <!-- <p>商品金额: 8887845</p> -->
-<a href="mengchuang://showWapPayResult_btnType_?0&back">返回</a>
+<a href="{$Scheme}://showWapPayResult_btnType_?0&back">返回</a>
 </div>
 <!--未绑定结束-->
 
@@ -62,8 +63,21 @@ border: 1px solid #999;
 <script type="text/javascript">
 
 $(function(){
-location.href = "mengchuang://showWapPayResult_btnType_?0&ss";
-
+	var u = navigator.userAgent;
+	var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
+	try{
+	    if(isAndroid){
+	        window.mengchuang.getPayResult('fail');
+	    }else{
+	         window.webkit.messageHandlers.exchangeResult.postMessage(0);
+	    }
+	}catch(err){
+	    /* setTimeout(function () {
+	        window.location.href= "/mobile.php?s=/User/index.html";
+	    },1000) */
+	}
+	
+	// location.href = $("#scheme").val()+"://showWapPayResult_btnType_?0&ss";
 })
 </script>
 
diff --git a/ThinkPHP/Library/Think/Pay/Driver/Alipay.class.php b/ThinkPHP/Library/Think/Pay/Driver/Alipay.class.php
index 26fa0e91e..76dff8521 100644
--- a/ThinkPHP/Library/Think/Pay/Driver/Alipay.class.php
+++ b/ThinkPHP/Library/Think/Pay/Driver/Alipay.class.php
@@ -66,7 +66,7 @@ class Alipay extends \Think\Pay\Pay
                 	$param['return_url'] = $returnUrl;
                 else
                 	$param['return_url']='http://' . $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_success";
-                $param['show_url'] = 'http://' . $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_error";
+                $param['show_url'] = 'http://' . $_SERVER ['HTTP_HOST'] . "/sdk.php/Spend/pay_error/game_id/".$vo->getGameId();
                 break;
             case 'refund':
                 $param['seller_email'] = $this->config['email'];