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

5 years ago · 07c908f832
parent 8ca13df134 f6f2d1f1e0
commit 07c908f832
5 changed files with 14 additions and 10 deletions
--- a/Application/Sdk/Controller/PayH5Controller.class.php
+++ b/Application/Sdk/Controller/PayH5Controller.class.php
@ -1207,7 +1207,7 @@ ADD COLUMN `pay_url`  text CHARACTER SET utf8 COLLATE utf8_general_ci NULL AFTER
    			
    			if($request['code']==1){
    				$json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.urlencode(C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/game_id/{$request['game_id']}/paytype/weixinpay");
-    				$request['pay_url'] = $json_data['url'] . "&tx_client=hideopen";
+    				$request['pay_url'] = $json_data['url'];// . "&tx_client=hideopen";
    				
    				$this->add_spend($request,1);
    			}
--- a/Application/Sdk/View/default/Spend/paycallback.html
+++ b/Application/Sdk/View/default/Spend/paycallback.html
@ -73,10 +73,6 @@ $(function() {
 		} 
 	});
 		
-	if ($("#.sqzfb").val() == 1) {
-		window.txyxsdk.sqzfbcallback($('.orderno').val());
-	}
-		
 	$("#payed").click(function() {
 		var orderno=$('.orderno').val();
 		var device=$('.device').val();
--- a/Application/Sdk/View/default/UserH/platform_pay.html
+++ b/Application/Sdk/View/default/UserH/platform_pay.html
@ -83,13 +83,12 @@ $(function(){
 				if(result.code==200) {
 					var data = result.data;
 					if(data.wap==1) {
-					
+						/* if () {
+							window.txyxsdk.sqzfbcallback();
+						} */
 						location.href = data.url;
 						
-					} else if (data.wap==1) {
-						window.webkit.messageHandlers.noticeAppResult.postMessage(data.url);
-					} 
-					else {
+					} else {
 						var u = navigator.userAgent;
 						var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1; //android终端
 						if (isAndroid) {
--- a/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html
+++ b/Application/Sdk/View/default/WapPay/wap_shortcut_pay.html
@ -194,12 +194,21 @@ function sendform()  {
 		btnpay = false;
 		alert('参数不能为空');
 	}
+    if(isok){
+        $("#Dialog").show();
+    }
 	return isok;
 }

 </script>

 <body>
+    <div class="js_dialog" id="Dialog" style="display: none">
+        <div class="weui-mask"></div>
+        <div class="weui-dialog" style="width: 4.2rem;max-width: 4.2rem;display: flex;">
+            <img src="__IMG__/load.gif" style="width: 4.2rem;height: auto;">
+        </div>
+    </div>
    <div
        style="height: 3.1rem;background-color: #21B1EB;color: #fff;border-bottom-left-radius:40%;border-bottom-right-radius:40%;padding: .43rem .3rem;">
        <p style="font-size: .4rem;">待支付……</p>
--- a/Public/Sdk/images/load.gif
+++ b/Public/Sdk/images/load.gif