From 3afd3583843684ccc8dc5473c695cc3d301e240a Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Fri, 1 Nov 2019 16:25:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/View/default/Spend/pay_way.html       | 21 ++++++++++++++++---
 .../Sdk/View/default/UserH/platform_pay.html  | 14 +++++++++++--
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Application/Sdk/View/default/Spend/pay_way.html b/Application/Sdk/View/default/Spend/pay_way.html
index 4f98abf4..2ac76dc4 100644
--- a/Application/Sdk/View/default/Spend/pay_way.html
+++ b/Application/Sdk/View/default/Spend/pay_way.html
@@ -179,7 +179,7 @@
                 </if>
                 <if condition="$pay_price elt C('WX_PAY_LIMIT')">
 	                <if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1 and C('heepay.wxp') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.wx_small') eq 1)">
-	                <a class="weui-cell" onclick="return small_program({:C('sqpay.wx_small')});" href="{:U('PayH5/weixin_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}" class="recharge_way_btn recharge_way_btn_wechat">
+	                <a id="wxpay" class="weui-cell" data-url="{:U('PayH5/weixin_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id'),'user_token'=>I('user_token')))}" class="recharge_way_btn recharge_way_btn_wechat">
 	                    <div class="weui-cell__hd"><img src="__IMG__/wxpay.png"></div>
 	                    <div class="weui-cell__bd">
 	                        <p style="color: #292929;font-size:.28rem;">微信支付</p>
@@ -219,7 +219,7 @@
 
 function small_program(status) {
 	//alert(status);
-	if (status == 1) { // 小程序
+	if (status == "1") { // 小程序
 		if ($('#sdk_version').val() == 1) { // android
 			window.txyxsdk.getSmallRoutine($('#small_json').val());
 		} else {
@@ -228,11 +228,23 @@ function small_program(status) {
 		
 		return false;
 	}
+	$(this).removeAttr("onclick", "");
 	
 	return true;
 }
 
 $(function() {
+	$("#wxpay").one('click', function() {
+		$(this).removeAttr("one", "");
+		$("#alipaybtn").removeAttr("one", "");
+		
+		$r = small_program("{:C('sqpay.wx_small')}");
+		if ($r) {
+			window.location.href = $(this).data('url');
+		}
+		
+	});
+	
 	if ($("#pay_price").data("pay_price") == 0) {
 		$("#platform_pay").show();
 		$(".paylist").hide();
@@ -245,7 +257,10 @@ $(function() {
 		window.location.href = url;
 	});
 	
-	$('#alipaybtn').on('click',function() {
+	$('#alipaybtn').one('click',function() {
+		$(this).removeAttr("one", "");
+		$("#wxpay").removeAttr("one", "");
+		
 		var that = $(this),url = $.trim(that.attr('data-url'));
 		if(that.hasClass('disabledbtn')){return false;}
 		that.addClass('disabled');
diff --git a/Application/Sdk/View/default/UserH/platform_pay.html b/Application/Sdk/View/default/UserH/platform_pay.html
index f81b3f06..c9fbba87 100644
--- a/Application/Sdk/View/default/UserH/platform_pay.html
+++ b/Application/Sdk/View/default/UserH/platform_pay.html
@@ -33,7 +33,7 @@
     <div class="ptbboxpad" style="padding-top:0;">
         <div class="ptbbox">
             <div class="weui-grids bordergirid">
-                <a href="{:U('PayH5/platform_weixin_pay',array('price' => $money,'user_token'=>I('user_token')))}" class="weui-grid js_grid">
+                <a id="wxpay" data-url="{:U('PayH5/platform_weixin_pay',array('price' => $money,'user_token'=>I('user_token')))}" class="weui-grid js_grid">
                     <div class="weui-grid__icon">
                     <img src="__IMG__/wxpay.png" alt="">
                     </div>
@@ -60,7 +60,17 @@
 
 <script>
 $(function(){
-	$('#alipaybtn').on('click',function() {
+	
+	$("#wxpay").one('click', function() {
+		$(this).removeAttr("one", "");
+		$("#alipaybtn").removeAttr("one", "");
+		window.location.href = $(this).data('url');
+	});
+	
+	$('#alipaybtn').one('click',function() {
+		$(this).removeAttr("one", "");
+		$("#wxpay").removeAttr("one", "");
+		
 		var that = $(this),url = $.trim(that.attr('data-url'));
 		if(that.hasClass('disabledbtn')){return false;}
 		that.addClass('disabled');

From 64aba79409efe6cc2481debd2f590ce74393183f Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Fri, 1 Nov 2019 16:42:01 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/View/default/Spend/pay_way.html       | 14 ++++++------
 .../Sdk/View/default/UserH/platform_pay.html  | 22 +++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Application/Sdk/View/default/Spend/pay_way.html b/Application/Sdk/View/default/Spend/pay_way.html
index 2ac76dc4..8d61b5b9 100644
--- a/Application/Sdk/View/default/Spend/pay_way.html
+++ b/Application/Sdk/View/default/Spend/pay_way.html
@@ -234,10 +234,10 @@ function small_program(status) {
 }
 
 $(function() {
-	$("#wxpay").one('click', function() {
-		$(this).removeAttr("one", "");
-		$("#alipaybtn").removeAttr("one", "");
-		
+	var flag = false;
+	$("#wxpay").on('click', function() {
+		if (flag) return ;
+		flag = true;
 		$r = small_program("{:C('sqpay.wx_small')}");
 		if ($r) {
 			window.location.href = $(this).data('url');
@@ -257,9 +257,9 @@ $(function() {
 		window.location.href = url;
 	});
 	
-	$('#alipaybtn').one('click',function() {
-		$(this).removeAttr("one", "");
-		$("#wxpay").removeAttr("one", "");
+	$('#alipaybtn').on('click',function() {
+		if (flag) return ;
+		flag = true;
 		
 		var that = $(this),url = $.trim(that.attr('data-url'));
 		if(that.hasClass('disabledbtn')){return false;}
diff --git a/Application/Sdk/View/default/UserH/platform_pay.html b/Application/Sdk/View/default/UserH/platform_pay.html
index c9fbba87..78d52a41 100644
--- a/Application/Sdk/View/default/UserH/platform_pay.html
+++ b/Application/Sdk/View/default/UserH/platform_pay.html
@@ -60,16 +60,16 @@
 
 <script>
 $(function(){
-	
-	$("#wxpay").one('click', function() {
-		$(this).removeAttr("one", "");
-		$("#alipaybtn").removeAttr("one", "");
+	var flag = false;
+	$("#wxpay").on('click', function() {
+		if (flag) return ;
+		flag = true;
 		window.location.href = $(this).data('url');
 	});
 	
-	$('#alipaybtn').one('click',function() {
-		$(this).removeAttr("one", "");
-		$("#wxpay").removeAttr("one", "");
+	$('#alipaybtn').on('click',function() {
+		if (flag) return ;
+		flag = true;
 		
 		var that = $(this),url = $.trim(that.attr('data-url'));
 		if(that.hasClass('disabledbtn')){return false;}
@@ -92,10 +92,14 @@ $(function(){
 					else {
 						var u = navigator.userAgent;
 						var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
-						if (isAndroid)
+						if (isAndroid) {
 							window.txyxsdk.getZFBPay(data.url);
-						else
+						} else {
+							try {
 							window.webkit.messageHandlers.noticeAppResult.postMessage(data.url);
+							} catch(err) {
+							}
+						}
 					}
 				} else {
 					layer.open({

From 980b00627e30f67504fc154019107b178b6a56d4 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Fri, 1 Nov 2019 16:56:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?android=20js=20mengchuang=E6=94=B9=20txyxsd?=
 =?UTF-8?q?k?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/View/default/Spend/paycallback.html   | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/Application/Sdk/View/default/Spend/paycallback.html b/Application/Sdk/View/default/Spend/paycallback.html
index 6feaee87..df5709bd 100644
--- a/Application/Sdk/View/default/Spend/paycallback.html
+++ b/Application/Sdk/View/default/Spend/paycallback.html
@@ -77,7 +77,7 @@ $(function() {
 			        var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
 			       	if (r.payStatus == '1') {
 				        if (isAndroid) {
-				        	window.mengchuang.getPayResult('succeed');
+				        	window.txyxsdk.getPayResult('succeed');
 				        } else {
 				        	try {
 				        		window.webkit.messageHandlers.exchangeResult.postMessage(1);
@@ -87,7 +87,7 @@ $(function() {
 				        }
 			       	} else {
 			       		if (isAndroid) {
-				        	window.mengchuang.getPayResult('fail');
+				        	window.txyxsdk.getPayResult('fail');
 				        } else {
 				        	try {
 				        		window.webkit.messageHandlers.exchangeResult.postMessage(0);
@@ -99,22 +99,7 @@ $(function() {
 				}
 			}
 		});
-		/* if (1) {
-			if (!device) {
-				var u = navigator.userAgent;
-		        var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
-		        if (isAndroid) 
-		        	device =1;
-		        else 
-		        	device =2;
-			}
-			// android
-			if (device == 1) {
-				window.mengchuang.getPayResult('succeed');
-			} else {
-				window.webkit.messageHandlers.exchangeResult.postMessage(1);
-			}
-		} */
+		
 	});