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

Application/Sdk/Controller/PayH5Controller.class.php

@@ -623,7 +623,7 @@ ADD COLUMN `pay_url`  text NULL AFTER `check_sign`;
            
             if($is_pay['status']==1){
                 $json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.C('PAY_DOMAIN')."sdk.php/Spend/paycallback/orderno/{$request['pay_order_number']}/user_token/".$this->userToken."/paytype/weixinpay/game_id/{$game_id}";
-                $request['pay_url'] = $json_data['url'];
+                $request['pay_url'] = $json_data['url']."&tx_client=hideopen";
                 $this->add_deposit($request, 1);
 //                 		.(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'] ;
 				/* if (I('request.api_ver') == 1) {
@@ -1273,7 +1273,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);
     			}