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

Application/Home/Controller/HomeController.class.php

@@ -149,7 +149,7 @@ class HomeController extends Controller
         }
 
         if ($status == 1) {
-            $downLink = 'itms-services://?action=download-manifest&url=' . 'https://' . C('APPLY_DOWN_DOMAIN') . M('Apply', 'tab_')->where(array('promote_id'=>$promoteId,'game_id'=>$gameId))->getField('original_url');
+            $downLink = 'itms-services://?action=download-manifest&url=' . "https://" . $_SERVER["HTTP_HOST"] . M('Apply', 'tab_')->where(array('promote_id'=>$promoteId,'game_id'=>$gameId))->getField('org_plist_url');
         } else {
             $downLink = get_apply_dow_url($gameId, $promoteId);
         }

Application/Home/View/default/Home/iosDown.html

@@ -120,8 +120,6 @@
 
         setTimeout(function () {
             var url = "{$downLink}";
-            console.log(url);
-            return false;
             window.location.href = url;
          }, 500);
     }

Application/Home/View/default/Home/promitionofregestion.html

@@ -209,14 +209,15 @@
               }
           } else {
               if (is_ios()) {
-                  if (!Boolean(navigator.userAgent.match(/OS [1][3]_[1][_\d]* like Mac OS X/i)) && !parseInt("{:I('get.status')}")) {
-                      if (!parseInt("{:I('get.status')}")) {
+                  if (Boolean(navigator.userAgent.match(/OS [1][3]_[1][_\d]* like Mac OS X/i))) {
+                      if (parseInt("{:I('get.status')}") > 0) {
+                          location.href = "{:U('iosDown',array('gid'=>$gameId,'pid'=>I('get.pid'),'status'=>1))}";
+                          return false;
+                      } else {
                           layer.confirm('请先到官网注册',{title:''} , function () {
                               location.href = "/mobile.php?s=/User/login/pid/" + "{:I('get.pid')}" + "/gid/" + "{:I('get.gid')}" + ".html";
                           });
                           return false;
-                      } else {
-                          location.href = "{:U('iosDown',array('gid'=>$gameId,'pid'=>I('get.pid'),'status'=>1))}";
                       }
                   }