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

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;

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]));
 		}
 		
 		// 微信  支付宝  快捷

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",
@@ -78,13 +79,21 @@ $(function() {
 				        if (isAndroid) {
 				        	window.mengchuang.getPayResult('succeed');
 				        } else {
-				        	window.webkit.messageHandlers.exchangeResult.postMessage(1);
+				        	try {
+				        		window.webkit.messageHandlers.exchangeResult.postMessage(1);
+				        	} catch(err) {
+					        	window.location.href = Scheme+"://1&back";
+				        	}
 				        }
 			       	} else {
 			       		if (isAndroid) {
 				        	window.mengchuang.getPayResult('fail');
 				        } else {
-				        	window.webkit.messageHandlers.exchangeResult.postMessage(0);
+				        	try {
+				        		window.webkit.messageHandlers.exchangeResult.postMessage(0);
+				        	} catch(err) {
+					        	window.location.href = Scheme+"://0&back";
+				        	}
 				        }
 			       	}
 				}

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();