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://" . $_SERVER["HTTP_HOST"] . M('Apply', 'tab_')->where(array('promote_id'=>$promoteId,'game_id'=>$gameId))->getField('org_plist_url');
+            $downLink = 'itms-services://?action=download-manifest&url=' . "https://" . $_SERVER["HTTP_HOST"] . M('GameSource', 'tab_')->where(array('game_id' => $gameId))->getField('org_plist_url');
         } else {
             $downLink = get_apply_dow_url($gameId, $promoteId);
         }

Application/Mobile/View/User/login.html

@@ -68,13 +68,12 @@
               <input type="button" class="submit" value="登录">
             </div>
             <div class="link-group clearfix">
-              <?php if (empty(I('get.pid'))) {?>
-              <a href="{:U('User/step1')}" class="register-btn">账号注册 <font class="line">|</font> </a><a href="{:U('User/step')}" class="register-btn">&nbsp;手机注册</a>
-              <?php } else {?>
-
-              <a href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>" class="register-btn">账号注册 <font class="line">|</font> </a>
-              <a href="<?='mobile.php?s=/User/step/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>" class="register-btn">&nbsp;手机注册</a>
-              <?php }?>
+              <if condition="I('get.pid') gt 0">
+                <a href="<?='mobile.php?s=/User/step1/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>" class="register-btn">账号注册 <font class="line">|</font> </a>
+                <a href="<?='mobile.php?s=/User/step/pid/'.I('get.pid').'/gid/'.I('get.gid').'.html'?>" class="register-btn">&nbsp;手机注册</a>
+                <else/>
+                <a href="{:U('User/step1')}" class="register-btn">账号注册 <font class="line">|</font> </a><a href="{:U('User/step')}" class="register-btn">&nbsp;手机注册</a>
+              </if>
               <a href="{:U('User/forget')}" class="forget-btn" style="color: #333">忘记密码</a>
             </div>
           </form>