Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

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() {
+	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');
+		}
+		
+	});
+	
 	if ($("#pay_price").data("pay_price") == 0) {
 		$("#platform_pay").show();
 		$(".paylist").hide();
@@ -246,6 +258,9 @@ $(function() {
 	});
 	
 	$('#alipaybtn').on('click',function() {
+		if (flag) return ;
+		flag = true;
+		
 		var that = $(this),url = $.trim(that.attr('data-url'));
 		if(that.hasClass('disabledbtn')){return false;}
 		that.addClass('disabled');

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);
-			}
-		} */
 	});
 	
 

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(){
+	var flag = false;
+	$("#wxpay").on('click', function() {
+		if (flag) return ;
+		flag = true;
+		window.location.href = $(this).data('url');
+	});
+	
 	$('#alipaybtn').on('click',function() {
+		if (flag) return ;
+		flag = true;
+		
 		var that = $(this),url = $.trim(that.attr('data-url'));
 		if(that.hasClass('disabledbtn')){return false;}
 		that.addClass('disabled');
@@ -82,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({