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

Application/Sdk/Controller/PayH5Controller.class.php

@@ -601,6 +601,7 @@ ADD COLUMN `pay_url`  text NULL AFTER `check_sign`;
     	
         C(api('Config/lists'));
         $request['price'] = I('request.price');
+        $game_id = I('request.game_id');
         if($request['price']*1<=0 || $request['price'] > C('WX_PAY_LIMIT')) {
             // $this->set_message(0,"fail","充值金额有误");
             redirect(U('Spend/notice',array('user_id'=>$user_id,'game_id'=>$game_id,'msg'=>'充值金额有误', 'user_token' => $this->userToken)));exit;
@@ -624,7 +625,7 @@ ADD COLUMN `pay_url`  text NULL AFTER `check_sign`;
                 $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) {
-               		$json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.(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'] ;
+               		$json_data['url'] = $is_pay['mweb_url'].'&redirect_url='.(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'.$game_id;
                		redirect($json_data['url']);
 				}
             }else{

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 id="wxpay" data-url="{:U('PayH5/platform_weixin_pay',array('price' => $money,'user_token'=>I('user_token'),'api_ver' => $api_ver))}" class="weui-grid js_grid">
+                <a id="wxpay" data-url="{:U('PayH5/platform_weixin_pay',array('price' => $money,'user_token'=>I('user_token'),'api_ver' => $api_ver, 'game_id' => $game_id))}" class="weui-grid js_grid">
                     <div class="weui-grid__icon">
                     <img src="__IMG__/wxpay.png" alt="">
                     </div>