Merge branch 'dev' of 47.111.118.107:/srv/git/platform

Application/Mobile/View/User/login.html

@@ -184,7 +184,7 @@
 
                         setTimeout(function(){
                             if (data.status == 2) {
-                                window.location.href = 'http://' + "{:C('APPLY_DOWN_DOMAIN')}" + "/index.php?s=/Home/Home/promitionofregestion/gid/" + gameId + "/pid/" + promoteId + "/status/" + "1" + ".html";
+                                window.location.href = 'http://' + "{$_SERVER['HTTP_HOST']}" + "/index.php?s=/Home/Home/promitionofregestion/gid/" + gameId + "/pid/" + promoteId + "/status/" + "1" + ".html";
                             } else {
                                 if (url) {
                                     window.location.href = url;

Application/Sdk/Controller/Ipa365Controller.class.php

@@ -268,7 +268,7 @@ class Ipa365Controller extends BaseController{
      * 用户点击安装
      */
     public function install() {
-    	$userId = $_SESSION['user_id'];
+    	$userId = I('user_id', 0);
     	if (!$userId ) {
     		$this->error("请登入", "/mobile.php/ssg/login");
     	}