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

Application/Home/Controller/ApplyController.class.php

@@ -519,7 +519,7 @@ class ApplyController extends BaseController
 
         $data = M("game", "tab_")
             /* 查询指定字段，不指定则查询所有字段 */
-            ->field("tab_game.id,tab_game.game_size,tab_game.game_name,tab_game.features,tab_game.money,tab_game.sdk_version,tab_game.ratio,tab_game.icon,tab_game.game_type_name,tab_game.recommend_status,promote_id,status,tab_apply.dow_status,tab_apply.plist_url,tab_apply.id as applyid,enable_status,tab_game.sort,tab_game.relation_game_id,tab_game.relation_game_name,tab_game.material_url,dispose_time,tab_apply.promote_money as applymoney,tab_apply.promote_ratio as applyratio,apply_time,tab_apply.status as applystatus,tab_game.and_dow_address,tab_game.ios_dow_address,tab_game.add_game_address,tab_game.ios_game_address")
+            ->field("tab_game.id,tab_game.game_size,tab_game.game_name,tab_game.features,tab_game.money,tab_game.sdk_version,tab_game.ratio,tab_game.icon,tab_game.game_type_name,tab_game.recommend_status,promote_id,status,tab_apply.dow_status,tab_apply.plist_url,tab_apply.id as applyid,tab_apply.enable_status,tab_game.sort,tab_game.relation_game_id,tab_game.relation_game_name,tab_game.material_url,dispose_time,tab_apply.promote_money as applymoney,tab_apply.promote_ratio as applyratio,apply_time,tab_apply.status as applystatus,tab_game.and_dow_address,tab_game.ios_dow_address,tab_game.add_game_address,tab_game.ios_game_address")
             ->join("tab_apply ON tab_game.id = tab_apply.game_id and tab_apply.promote_id = " . $promoteId)
 //            ->join("left join tab_game as tg ON (tab_game.id = tg.relation_game_id and tg.game_status = 1 and tab_game.id!=tab_game.relation_game_id) or (tab_game.id = tg.relation_game_id  and tab_game.id!=tg.id and tg.game_status = 1) or (tab_game.id!=tab_game.relation_game_id and tab_game.relation_game_id=tg.id and tab_game.game_status=1)")
             // 查询条件
@@ -564,6 +564,7 @@ class ApplyController extends BaseController
         $this->assign('model', $model);
         $this->assign('promoteId', $promoteId);
         $this->assign('thisParentPromoteId', getParentPromoteId(PID));
+        $this->assign('parentPromoteId', getParentPromoteId($promoteId));
         $this->assign('pID', PID);
         $this->assign('promoteRole', $promoteRole);
         $this->assign('promoteData', getAllPromoteListByType($promoteRole));

Application/Home/View/default/Apply/my_game.html

@@ -265,7 +265,9 @@
                     ?>
 										<div class="game-operating" data-url="{$qrcodes}" style="width: 35%;">
                       <if condition="$promoteRole == 1">
-                        <span class="add-game" game-id="{$vo.id}" promote-type="2" style="cursor: pointer;margin-right: 10px;"><u>添加组长游戏</u></span>
+                        <if condition="$parentPromoteId == 0">
+                          <span class="add-game" game-id="{$vo.id}" promote-type="2" style="cursor: pointer;margin-right: 10px;"><u>添加组长游戏</u></span>
+                        </if>
                         <span class="add-game" game-id="{$vo.id}" promote-type="3" style="cursor: pointer;margin-right: 10px;"><u>添加推广员游戏</u></span>
                       </if>
                       <?php $downloadUrl = get_apply_dow_url($vo['id'],$vo['promote_id']);?>