Merge branch 'dev_zcl' into dev

Application/Mobile/Controller/SsgController.class.php

@@ -30,11 +30,6 @@ class SsgController extends BaseController {
             redirect(U("ssg/index", array('promete_id' => $promoteId)));
         }
 
-        // /*if (!$promoteId) {
-        // 	echo "链接失效，请重新向推广员索取链接。";
-        // 	exit();
-        // 	$this->error("参数非法");
-        // }*/
         if ($promoteId) {
             $exists = M("promote", "tab_")->where(array('id' => $promoteId))->find();
             if (!$exists) {
@@ -456,6 +451,7 @@ class SsgController extends BaseController {
         if($payLog && $payLog['pay_status']==1){
             $this->assign("error","亲~您已购买过了~请到【订单查询】查看订单信息哟~");
             $this->display('blank');
+            //redirect("/mobile.php/Ssg/install_show/user_id/$userId/game_id/$gameId/order_id/".$payLog['order_id']);
         }else{
             if (!$gameInfo['supersign_token']) {
                 //$this->error("超级签token未填写！");
@@ -567,7 +563,8 @@ class SsgController extends BaseController {
             $weixn = new Weixin();
             $wx_pay = json_decode($weixn->weixin_pay('超级签消费', $orderId, $price, 'MWEB', 4), true);
             if($wx_pay['status']==1){
-                redirect($wx_pay['mweb_url']);
+                $redirect_url = $_SERVER['HTTP_HOST']."/mobile.php/Ssg/install_show/user_id/{$userId}/game_id/{$gameId}/order_id/{$orderId}";
+                redirect($wx_pay['mweb_url']."&redirect_url=".urlencode($redirect_url));
             }else{
                 $this->assign("error",$wx_pay['return_msg']);
                 $this->display('blank');