diff --git a/Application/Base/Service/ApplyService.class.php b/Application/Base/Service/ApplyService.class.php
index fc5fb7926..2d627ca40 100644
--- a/Application/Base/Service/ApplyService.class.php
+++ b/Application/Base/Service/ApplyService.class.php
@@ -50,14 +50,17 @@ class ApplyService {
         ];
     }
 
-    public function cancelGame($gameId, $promoteId) {
-        $ids = [$promoteId];
-        $list = M('promote', 'tab_')->field('id')->where('parent_id=' . $promoteId . ' or grand_id=' . $promoteId)->select();
-        $ids = array_merge($ids, array_column($list, 'id'));
-
-        $save['offline_status'] = 1;
-
-        M('apply', 'tab_')->where(['game_id' => $gameId, 'promote_id' => ['in', $ids]])->save($save);
+    public function offlineGame($game, $promote = null)
+    {
+        $conditions = ['game_id' => $game['id']];
+        if ($promote) {
+            $promoteService = new PromoteService();
+            $children = $promoteService->getAllChildren($promote, 0, ['id']);
+            $promoteIds = [$promote['id']];
+            $promoteIds = array_merge($promoteIds, array_column($children, 'id'));
+            $conditions['promote_id'] = ['in', $promoteIds];
+        }
+        M('apply', 'tab_')->where($conditions)->save(['offline_status' => 1]);
     }
 
     public function updateAfterPack($apply, $packageUrl, $plistUrl)
@@ -90,25 +93,56 @@ class ApplyService {
         return $host . '/index.php?s=/Home/Home/landingPage/code/' . $code;
     }
 
-    public function encodeApplyCode($apply, $type)
+    public function getApplyData($apply, $type, $version)
     {
+        $data = null;
         $expiresIn = 0;
-        $data = [
-            'promote_id' => $apply['promote_id'],
-            'game_id' => $apply['game_id'],
-            'expires_in' => $expiresIn,
-            'created_at' => date('Y-m-d H:i:s'),
-            'type' => $type
-        ];
+        if ($version == 1) {
+            $data = [
+                'promote_id' => $apply['promote_id'],
+                'game_id' => $apply['game_id'],
+                'expires_in' => $expiresIn,
+                'created_at' => date('Y-m-d H:i:s'),
+                'type' => $type
+            ];
+            $data = json_encode($data);
+        } elseif ($version == 2) {
+            $data = [
+                $apply['promote_id'],
+                $apply['game_id'],
+                $expiresIn,
+                time(),
+                $type
+            ];
+            $data = implode('|', $data);
+        }
+        return $data;
+    }
 
-        $jsonStr = json_encode($data);
-        return base64_encode(openssl_encrypt($jsonStr, self::ENCRYPT_METHOD, self::ENCRYPT_KEY));
+    public function encodeApplyCode($apply, $type, $version = 2)
+    {
+        $data = $this->getApplyData($apply, $type, $version);
+        return base64_encode(openssl_encrypt($data, self::ENCRYPT_METHOD, self::ENCRYPT_KEY));
     }
 
     public function decodeApplyCode($code)
     {
         $decryptStr = openssl_decrypt(base64_decode($code), self::ENCRYPT_METHOD, self::ENCRYPT_KEY);
-        return json_decode($decryptStr, true);
+        $result = json_decode($decryptStr, true);
+        if (is_null($result)) {
+            $items = explode('|', $result);
+            if (count($items) != 5) {
+                return null;
+            }
+            return [
+                'promote_id' => $items[0],
+                'game_id' => $items[1],
+                'expires_in' => $items[2],
+                'created_at' => date('Y-m-d H:i:s', $items[3]),
+                'type' => $items[4],
+            ];
+        }
+        return $result;
     }
 
     public function checkApplyCode($data, $type)
diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php
index 30f8b41b7..b2874ad86 100644
--- a/Application/Base/Service/PromoteService.class.php
+++ b/Application/Base/Service/PromoteService.class.php
@@ -835,6 +835,18 @@ class PromoteService {
         }
     }
 
+    /**
+     * 获取所有下级推广员
+     */
+    public function getAllChildren($promote, $level = 0, $fields = '*')
+    {
+        $conditions = ['chain' => ['like', $promote['chain'] . $promote['id'] . '/%']];
+        if ($level != 0) {
+            $conditions['level'] = $level;
+        }
+        return M('promote', 'tab_')->field($fields)->where($conditions)->select();
+    }
+
     public function getLevelName($level)
     {
         return self::$levels[$level] ?? '未知';
diff --git a/Application/Home/Controller/GameController.class.php b/Application/Home/Controller/GameController.class.php
new file mode 100644
index 000000000..c7e2bca5c
--- /dev/null
+++ b/Application/Home/Controller/GameController.class.php
@@ -0,0 +1,2092 @@
+<?php
+
+namespace Home\Controller;
+
+use OT\DataDictionary;
+use Admin\Model\ApplyModel;
+use Think\Model;
+use Base\Facade\Request;
+use Base\Service\ApplyService;
+use Base\Service\PromoteService;
+
+
+/**
+ * 前台首页控制器
+ * 主要获取首页聚合数据
+ */
+class GameController extends BaseController
+{
+    public function index()
+    {
+        $this->list(1);
+    }
+
+    public function mix()
+    {
+        $this->list(2);
+    }
+
+    public function list($serverType)
+    {
+        // $serverType = I('server_type', 1);
+        $promoteId = I('promote_id', 0);
+        $promoteLevel = I('promote_level', 0);
+        $loginPromote = $this->getLoginPromote();
+        $baseGameId = I('base_game_id', 0);
+        $isMine = I('is_mine', 0);
+
+        if ($promoteLevel != 0 && $promoteId == 0) {
+            $this->assign('count', 0);
+            $this->assign('pagination', '');
+            $this->assign('records', []);
+            return $this->display('index');
+        }
+
+        if ($promoteLevel == 0 && $promoteId == 0) {
+            $promoteId = $loginPromote['id'];
+        }
+
+        $gameIds = [];
+        if ($baseGameId > 0) {
+            $baseGame = M('base_game', 'tab_')->where('id', $baseGameId)->find();
+            if ($baseGame['android_game_id'] > 0) {
+                $gameIds[] = $baseGame['android_game_id'];
+            }
+            if ($baseGame['ios_game_id'] > 0) {
+                $gameIds[] = $baseGame['ios_game_id'];
+            }
+        }
+
+        if ($isMine) {
+            $applyGameIds = M('apply', 'tab_')->where(['offline_status' => 0, 'promote_id' => $promoteId])->getField('game_id', true);
+            $gameIds = (count($gameIds) == 0 ? $applyGameIds : array_intersect($applyGameIds, $gameIds));
+        }
+
+        $columns = ['id', 'icon', 'game_name', 'features', 'sdk_version', 'game_size', 'game_type_name'];
+
+        $conditions = [];
+        if ($isMine) {
+            $conditions['offline_status'] = 0;
+        }
+
+        $conditions['server_type'] = $serverType;
+        if (count($gameIds) > 0) {
+            $conditions['id'] = ['in', $gameIds];
+        }
+        $query = M('game', 'tab_')->field($columns)->where($conditions)->order('relation_game_id desc');
+        list($games, $pagination, $count) = $this->paginate($query);
+
+        $gameSources = [];
+        if (count($games) > 0) {
+            $gameIds = array_column($games, 'id');
+            $applys = M('apply', 'tab_')->field(['game_id', 'offline_status'])->where(['promote_id' => $promoteId, 'game_id' => ['in', $gameIds]])->select();
+            $applys = index_by_column('game_id', $applys);
+
+            $gameSources = M('game_source', 'tab_')->field(['game_id', 'version'])->where(['game_id' => ['in', $gameIds]])->select();
+            $gameSources = index_by_column('game_id', $gameSources);
+        }
+
+        $records = [];
+        foreach ($games as $game) {
+            $gameId = $game['id'];
+            $records[] = [
+                'id' => $game['id'],
+                'offline_status' => isset($applys[$gameId]) ? $applys[$gameId]['offline_status'] : 1,
+                'icon' => $game['icon'],
+                'game_name' => $game['game_name'],
+                'features' => $game['features'],
+                'sdk_version' => $game['sdk_version'],
+                'version' => isset($gameSources[$gameId]) ? $gameSources[$gameId]['version'] : '--',
+                'game_size' => $game['game_size'],
+                'game_type_name' => $game['game_type_name'],
+            ];
+        }
+
+        $this->assign('serverType', $serverType);
+        $this->assign('promoteId', $promoteId);
+        $this->assign('count', $count);
+        $this->assign('pagination', $pagination);
+        $this->assign('records', $records);
+        $this->display('index');
+    }
+
+    public function apply()
+    {
+        $gameId = I('game_id', 0);
+        $promoteId = I('promote_id', 0);
+        $loginPromote = $this->getLoginPromote();
+
+        if ($gameId == 0) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '数据有误']);
+        }
+
+        $promoteService = new PromoteService();
+        if (!$promoteService->canPresidentApplyGame($loginPromote)) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '请联系市场专员开启']);
+        }
+
+        $promote = null;
+        if ($promoteId != 0) {
+            $promote = M('promote', 'tab_')->field(['id', 'chain', 'account'])->where(['id' => $promoteId])->find();
+            if (!$promote || strpos($promote['chain'], '/'. $loginPromote['id'] . '/') === false) {
+                return $this->ajaxReturn(['status' => 0, 'message' => '推广员不存在']);
+            }
+        } else {
+            $promote = $loginPromote;
+        }
+
+        $game = M('game', 'tab_')->field(['id', 'game_name', 'money', 'ratio', 'sdk_version'])->where(['id' => $gameId])->find();
+        if (!$game) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '游戏不存在']);
+        }
+
+        $apply = M('apply', 'tab_')->where(['game_id' => $gameId, 'promote_id' => $promote['id']])->find();
+        if ($apply && $apply['offline_status'] == 0) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '该游戏已添加']);
+        }
+
+        $data = [];
+        $data['ratio'] = $game['ratio'];
+        $data['money'] = $game['money'];
+        $data['promote_account'] = $promote['account'];
+        $data['apply_time'] = NOW_TIME;
+        $data['offline_status'] = 0;
+
+        $status = false;
+        if (!$apply) {
+            $data['sdk_version'] = $game['sdk_version'];
+            $data['game_id'] = $game['id'];
+            $data['game_name'] = $game['game_name'];
+            $data['promote_id'] = $promote['id'];
+            $data['status'] = C('SET_AUTO_PACK');
+            $status = M('apply', 'tab_')->add($data);
+        } else {
+            $status = M('apply', 'tab_')->where('id = ' . $apply['id'])->save($data);
+        }
+        if ($status) {
+            // recordPromoteLogs('游戏管理', '添加游戏');
+            return $this->ajaxReturn(['status' => 1, 'message' => '添加成功']);
+        } else {
+            return $this->ajaxReturn(['status' => 0, 'message' => '系统异常']);
+        }
+    }
+
+    public function batchApply()
+    {
+        $gameId = I('game_id', 0);
+        $promoteIds = I('promote_ids', []);
+        if ($gameId == 0) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '数据有误']);
+        }
+
+        if (count($promoteIds) == 0) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '请选择要添加游戏的下级人员']);
+        }
+
+        $loginPromote = $this->getLoginPromote();
+        $promoteService = new PromoteService();
+        if (!$promoteService->canPresidentApplyGame($loginPromote)) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '请联系市场专员开启']);
+        }
+
+        $game = M('game', 'tab_')->field(['id', 'game_name', 'money', 'ratio', 'sdk_version'])->where(['id' => $gameId])->find();
+        if (!$game) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '游戏不存在']);
+        }
+
+        $applys = M('apply', 'tab_')->where(['game_id' => $gameId, 'promote_id' => ['in', $promoteIds]])->select();
+        $appliedPromoteIds = array_column($applys, 'promote_id');
+        
+        $newPromoteIds = array_diff($promoteIds, $appliedPromoteIds);
+
+        // 添加申请表中还未含有记录的推广员
+        if (count($newPromoteIds) > 0) {
+            $newApplys = [];
+            foreach ($newPromoteIds as $promoteId) {
+                $newApplys[] = [
+                    'ratio' => $game['ratio'],
+                    'money' => $game['money'],
+                    'promote_account' => $loginPromote['account'],
+                    'apply_time' => NOW_TIME,
+                    'offline_status' => 0,
+                    'sdk_version' => $game['sdk_version'],
+                    'game_id' => $game['id'],
+                    'game_name' => $game['game_name'],
+                    'promote_id' => $promoteId,
+                    'status' => C('SET_AUTO_PACK'),
+                ];
+            }
+            M('apply', 'tab_')->addAll($newApplys);
+        }
+
+        // 更改表中含有记录的推广员申请状态
+        if (count($appliedPromoteIds) > 0) {
+            $data = [];
+            $data['ratio'] = $game['ratio'];
+            $data['money'] = $game['money'];
+            $data['promote_account'] = $loginPromote['account'];
+            $data['apply_time'] = NOW_TIME;
+            $data['offline_status'] = 0;
+            M('apply', 'tab_')->where(['game_id' => $gameId, 'promote_id' => ['in', $appliedPromoteIds]])->save($data);
+        }
+
+        // recordPromoteLogs('游戏管理', '批量添加游戏');
+        return $this->ajaxReturn(['status' => 1, 'message' => '添加成功']);
+    }
+
+    public function offline()
+    {
+        $gameId = I('game_id', 0);
+        $promoteId = I('promote_id', 0);
+        $loginPromote = $this->getLoginPromote();
+
+        if ($gameId == 0) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '请选择游戏']);
+        }
+
+        $game = M('game', 'tab_')->field(['id'])->where(['id' => $gameId])->find();
+        if (!$game) {
+            return $this->ajaxReturn(['status' => 0, 'message' => '游戏不存在']);
+        }
+
+        $promote = null;
+        if ($promtoeId > 0) {
+            $promote = M('promote', 'tab_')->where(['id' => $promoteId])->find();
+            if (!$promote) {
+                return $this->ajaxReturn(['status' => 0, 'message' => '推广员不存在']);
+            }
+        } else {
+            $promote = $loginPromote;
+        }
+
+        $applyService = new ApplyService();
+        $applyService->offlineGame($game, $promote);
+        // recordPromoteLogs('游戏管理','下架游戏');
+        $this->ajaxReturn(['status' => true, 'msg' => '下架成功']);
+    }
+
+    public function getMineBaseGames()
+    {
+        $gameIds = M('apply', 'tab_')->where(['promote_id' => $promoteId])->getField('game_id', true);
+        $games = [];
+        if (count($gameIds) > 0) {
+            $games = M('base_game', 'tab_')->where(['_logic' => 'or', 'android_game_id' => ['in', $gameIds], 'ios_game_id' => ['in', $gameIds]])->select();
+        }
+        
+        return $this->ajaxReturn([
+            'status' => true,
+            'message' => '获取成功',
+            'data' => [
+                'games' => $games
+            ]
+        ]);
+    }
+
+    public function getUnApplyPromotes()
+    {
+        $gameId = I('game_id', 0);
+        $level = I('level', 0);
+        $loginPromote = $this->getLoginPromote();
+
+        $promoteService = new PromoteService();
+        $promotes = $promoteService->getAllChildren($loginPromote, $level, ['id', 'account', 'real_name']);
+        $promoteIds = array_column($promotes, 'id');
+
+        $appliedPromoteIds = M('apply', 'tab_')->where(['offline_status' => 0, 'game_id' => $gameId, 'promote_id' => ['in', $promoteIds]])->getField('promote_id', true);
+
+        $unApplyPromotes = [];
+        foreach ($promotes as $promote) {
+            if (!in_array($promote['id'], $appliedPromoteIds)) {
+                $unApplyPromotes[] = $promote;
+            }
+        }
+
+        return $this->ajaxReturn([
+            'status' => true,
+            'message' => '获取成功',
+            'data' => [
+                'promotes' => $unApplyPromotes
+            ]
+        ]);
+    }
+
+    public function jion_list($model = array(), $p, $map = array())
+    {
+
+        $page = intval($p);
+        $page = $page ? $page : 1; //默认显示第一页数据
+        $name = $model['name'];
+        $row = empty($model['list_row']) ? 15 : $model['list_row'];
+        $data = M($name, 'tab_')
+            /* 查询指定字段，不指定则查询所有字段 */
+            ->field(empty($fields) ? true : $fields)
+            ->join($model['jion'])
+            // 查询条件
+            ->where($map)
+            /* 默认通过id逆序排列 */
+            ->order($model['need_pk'] ? 'id DESC' : '')
+            /* 数据分页 */
+            ->page($page, $row)
+            /* 执行查询 */
+            ->select();
+
+        /* 查询记录总数 */
+        $count = M($name, "tab_")->where($map)->count();
+
+        //分页
+        if ($count > $row) {
+            $page = new \Think\Page($count, $row);
+            $page->setConfig('theme', '%FIRST% %UP_PAGE% %LINK_PAGE% %DOWN_PAGE% %END% %HEADER%');
+            $this->assign('_page', $page->show());
+        }
+
+        $this->assign('list_data', $data);
+        $this->meta_title = $model['title'];
+        $this->display($model['tem_list']);
+    }
+
+    public function gameSpecialList()
+    {
+        $this->index(1);
+    }
+
+    public function gameList()
+    {
+        $this->index(2);
+    }
+
+    //首页 $type-查询的游戏平台类型 0-全部 10-安卓+ios 2-ios 1-安卓
+    public function t($serverType = 1)
+    {
+        $loginPromote = $this->getLoginPromote();
+
+        $promoteId = empty(I('promote_id')) ? $loginPromote['id'] : I('promote_id'); //搜索的渠道ID
+        $promoteRole = empty(I('promote_role')) ? 1 : I('promote_role'); //渠道角色
+        $parentPromoteId = getParentPromoteId($promoteId); //上级渠道ID
+        $grandPromoteId = getGrandPromoteId($promoteId); //本账号会长渠道ID
+        $childGameAddPermission = getChildGameAddPermission($grandPromoteId); //游戏添加权限
+
+        $map['tab_game.online_status'] = 1;//开发者游戏上线状态
+        $map['tab_game.down_port'] = 1;//游戏端口 第三方接口不能申请
+        $map['tab_game.game_status'] = 1;//游戏状态
+        $map['tab_game.server_type'] = $serverType;//专服游戏
+
+        if (!empty(I('game_id'))) {
+            $thisRelationGameName = M('Game', 'tab_')->where(array('id' => I('game_id')))->getField('relation_game_name');
+
+            $map['tab_game.relation_game_name'] = ['like', $thisRelationGameName];
+        }
+
+        $type = I('get.type', 0);
+        $group = '';
+        switch ($type) {
+            case 1:
+            case 2:
+                $gameIdList = M('Game', 'tab_')->group('relation_game_id')->having('count(id) = 1')->getField('id', true);
+
+                $map['tab_game.sdk_version'] = $type;
+
+                $applyService = new ApplyService();
+                $tempIds = $applyService->getSociatyGameIds($loginPromote);
+                $gameIdList = array_intersect($gameIdList, $tempIds);
+
+                if (count($gameIdList) > 0) {
+                    $gameIds = implode(',', $gameIdList);
+
+                    $map['tab_game.id'] = ['in', $gameIds];
+                } else {
+                    $map = '1 = 2';
+                }
+                break;
+            case 10:
+                $group = 'tab_game.relation_game_id';
+
+                if ($parentPromoteId > 0 && $childGameAddPermission == 0) {
+                    $gameRelationGameIdList = M('Game', 'tab_')->group('relation_game_id')->having('count(id) = 2')->getField('relation_game_id', true);
+                    if (count($gameRelationGameIdList) > 0) {
+                        $gameRelationGameIdList = implode(',', $gameRelationGameIdList);
+
+                        $where['tab_game.relation_game_id'] = ['in', $gameRelationGameIdList];
+                    } else {
+                        $where = '1 = 2';
+                    }
+                } else {
+                    $gameIdList = M('Game', 'tab_')->group('relation_game_id')->having('count(id) = 2')->getField('id', true);
+
+                    $applyService = new ApplyService();
+                    $tempIds = $applyService->getSociatyGameIds($loginPromote);
+                    $gameIdList = array_intersect($gameIdList, $tempIds);
+
+                    if (count($gameIdList) > 0) {
+                        $gameIds = implode(',', $gameIdList);
+                        $map['tab_game.id'] = ['in', $gameIds];
+                    } else {
+                        $map = '1 = 2';
+                    }
+                }
+                break;
+            case 0:
+                $applyService = new ApplyService();
+                $gameIdList = $applyService->getSociatyGameIds($loginPromote);
+                if (count($gameIdList) > 0) {
+                    $gameIds = implode(',', $gameIdList);
+                    $map['tab_game.id'] = ['in', $gameIds];
+                } else {
+                    $map = '1 = 2';
+                }
+        }
+
+        $page = intval(I('get.p', 0));
+        $page = $page ? $page : 1; //默认显示第一页数据
+
+        if (isset($_REQUEST['row'])) {
+            $row = $_REQUEST['row'];
+        } else {
+            $row = 10;
+        }
+
+        $join = '';
+        if ($parentPromoteId > 0 && $childGameAddPermission == 0) {
+            $map['tab_apply.promote_id'] = $grandPromoteId;
+            if (!empty($where)) {
+                $map['_logic'] = 'and';
+                $map['_complex'] = $where;
+            }
+
+            $join = 'tab_apply on tab_game.id = tab_apply.game_id and tab_apply.offline_status = 0';//查询上级游戏
+        }
+
+        $data = M('Game', 'tab_')
+            ->field('tab_game.id,tab_game.icon,tab_game.game_name,tab_game.features,tab_game.sdk_version,tab_game.game_size,tab_game.game_type_name,tab_game.relation_game_name,ta_1.id as apply_id_1,ta_2.id as apply_id_2')
+            ->join($join)
+            ->join('left join tab_apply as ta_1 on tab_game.id = ta_1.game_id and ta_1.offline_status = 0 and ta_1.promote_id = ' . $promoteId)//查询是否拥有该游戏
+            ->join('left join tab_apply as ta_2 on tab_game.relation_game_id = ta_2.game_id and ta_2.offline_status = 0 and tab_game.id != tab_game.relation_game_id and ta_2.promote_id = ' . $promoteId)//查询是否拥有关联游戏
+            ->join('left join tab_game_source on tab_game.id = tab_game_source.game_id')//查询游戏版本
+            ->where($map)
+            ->group($group)
+            ->order('tab_game.sort desc,tab_game.id desc')
+//            ->fetchSql(true)
+            ->page($page, $row)
+            ->select();
+
+//        var_dump($data);
+//        die;
+
+        /* 查询记录总数 */
+        $count = M("Game", "tab_")
+            ->field('tab_game.id')
+            ->join($join)//查询上级游戏
+            ->where($map)
+            ->group($group)
+            ->select();
+        $count = count($count);
+
+        //分页
+        $parameter['p'] = I('get.p', 1);
+        $parameter['row'] = I('get.row');
+        $parameter['type'] = $type;
+        $parameter['promote_role'] = $promoteRole;
+        empty(I('promote_id')) || $parameter['promote_id'] = I('promote_id');
+
+        $page = set_pagination($count, $row, $parameter);
+        if ($page) {
+            $this->assign('_page', $page);
+        }
+
+        $this->assign('list_data', $data);
+        $this->assign("count", $count);
+        $this->assign('loginPromote', $loginPromote);
+        $this->assign("promoteId", $promoteId);
+        $this->assign('promoteRole', $promoteRole);
+        $this->assign('promoteData', getAllPromoteListByType($promoteRole));
+        $this->assign('type', $type);
+        $this->assign('myGame', ($serverType == 1) ? 'specialMyGameList' : 'myGameList');
+        $this->assign('game', ($serverType == 1) ? 'gameSpecialList' : 'gameList');
+        $this->assign('position', ($serverType == 1) ? '专服管理' : '混服管理');
+        $this->meta_title = "申请游戏";
+        $this->display('index');
+    }
+
+    //查看游戏资料专区
+    public function feature($p = 0, $type = 0)
+    {
+        $promoteId = empty(I('promote_id')) ? PID : I('promote_id');//搜索的渠道ID
+        $promoteRole = empty(I('promote_role')) ? 1 : I('promote_role');//渠道角色
+        //$parentPromoteId = getParentPromoteId($promoteId);//上级渠道ID
+        $thisParentPromoteId = getParentPromoteId(PID);//本账号上级渠道ID
+
+//        $addPermission = 1;//是否有添加游戏权限
+//        if ($thisParentPromoteId == 0 && $promoteRole == 3) {
+//            $addPermission = 0;
+//        }
+
+        $map['tab_game.online_status'] = 1;//开发者游戏上线状态
+        $map['tab_game.down_port'] = 1;//游戏端口 第三方接口不能申请
+        $map['tab_game.game_status'] = 1;//游戏状态
+        $map['tab_game.developers'] = 0; //平台游戏(官网游戏，非开发者游戏)
+
+        $applyPromote = M('apply', 'tab_')->field('game_id')->where(['promote_id' => $promoteId])->select();
+        $noDeveloperGameArr = array();
+
+        foreach ($applyPromote as $key => $value) {
+            $applyPromoteGameId = $value['game_id'];
+            $gameInfo = M('Game', 'tab_')
+                ->field('id,icon,game_name,features,sdk_version,game_size,game_type_name,relation_game_name,developers')
+                ->where(['id' => $applyPromoteGameId])->select();
+            if ($gameInfo[0]['developers'] > 0) {
+                unset($gameInfo[0]['developers']);
+                $noDeveloperGameArr[] = $gameInfo[0]['id'];        //非开发者游戏
+            }
+        }
+
+
+        $page = intval($p);
+        $page = $page ? $page : 1; //默认显示第一页数据
+
+        if (isset($_REQUEST['row'])) {
+            $row = $_REQUEST['row'];
+        } else {
+            $row = 10;
+        }
+        $map['_logic'] = 'and';
+        if (!empty(I('game_id'))) {
+            $thisRelationGameName = M('Game', 'tab_')->where(array('id' => I('game_id')))->getField('relation_game_name');
+
+            $map['tab_game.relation_game_name'] = ['like', $thisRelationGameName];
+            $where['_complex'] = $map;
+            // $where['tab_game.id'] = ['in',$noDeveloperGameArr];
+            // $where['_logic']='or';
+        } else {
+            $where['_complex'] = $map;
+            if (empty($noDeveloperGameArr)) {
+                $where['tab_game.id'] = ['in', '-100'];
+            } else {
+                $where['tab_game.id'] = ['in', $noDeveloperGameArr];
+            }
+
+            $where['_logic'] = 'or';
+        }
+
+        $data = M('Game', 'tab_')
+            ->field('tab_game.id,tab_game.icon,tab_game.game_name,tab_game.features,tab_game.sdk_version,tab_game.game_size,tab_game.game_type_name,tab_game.relation_game_name,ta_1.id as apply_id_1')
+            ->join('left join tab_apply as ta_1 on tab_game.id = ta_1.game_id and ta_1.offline_status = 0 and ta_1.promote_id = ' . $promoteId)//查询是否拥有该游戏
+            ->where($where)
+            ->order('tab_game.developers desc,tab_game.sort desc,tab_game.id desc')
+            ->page($page, $row)
+            ->select();
+        //$AllData = array_merge($noDeveloperGameArr,$data);
+
+        /* 查询记录总数 */
+        $count = M("Game", "tab_")
+            ->field('tab_game.id')
+            ->where($map)
+            ->select();
+        $count = count($count);
+
+        //分页
+        $parameter['p'] = I('get.p', 1);
+        $parameter['row'] = I('get.row');
+        $parameter['type'] = $type;
+        $parameter['promote_role'] = $promoteRole;
+        empty(I('promote_id')) || $parameter['promote_id'] = I('promote_id');
+
+        $page = set_pagination($count, $row, $parameter);
+        if ($page) {
+            $this->assign('_page', $page);
+        }
+
+        $this->assign('list_data', $data);
+        $this->assign("count", $count);
+        $this->assign("promoteId", $promoteId);
+        //  $this->assign('parentPromoteId', $parentPromoteId);
+        $this->assign('thisParentPromoteId', $thisParentPromoteId);
+        // $this->assign('promoteRole', $promoteRole);
+        $this->assign('pID', PID);
+        //$this->assign('promoteData', getAllPromoteListByType($promoteRole));
+//        $this->assign('addPermission', $addPermission);
+        //  $this->assign('type', $type);
+
+        $this->meta_title = "申请游戏";
+
+        $this->display();
+    }
+
+    //查看游戏详情
+    public function getDetail()
+    {
+        $id = I('id', 0);
+        $gameData = [];
+
+        if ($id > 0) {
+            $map['tab_game.id'] = $id;
+
+            $gameData = M('Game', 'tab_')
+                ->join('left join tab_game_source on tab_game.id = tab_game_source.game_id')
+                ->where($map)
+                ->field('tab_game.*,tab_game_source.version,tab_game_source.create_time')
+                ->find();
+
+            if (!empty($gameData['create_time'])) {
+                $gameData['create_time'] = date('Y-m-d H:i:s', $gameData['create_time']);
+            }
+
+            $gameData['icon'] = __ROOT__ . get_cover($gameData['icon'], 'path');
+            $gameData['screenshot'] = explode(',', $gameData['screenshot']);
+
+            foreach ($gameData['screenshot'] as $value) {
+                $gameData['screenshot_url'][] = get_cover($value, 'path');
+            }
+        }
+
+        $this->ajaxReturn($gameData);
+    }
+
+    public function gapply()
+    {
+        $map1['relation_game_id'] = array('in', $_REQUEST['game_id']);
+        $res = M('game', 'tab_')->field('id')->where($map1)->select();
+        $res = array_map('array_shift', $res);
+        $_REQUEST['game_id'] = implode(',', $res);
+
+        $model = new ApplyModel(); //D('Apply');
+        $map['game_id'] = array('in', $_REQUEST['game_id']);
+        $map['promote_id'] = session("promote_auth.pid");
+        $c = $model->where($map)->select();
+        $_REQUEST['game_id'] = explode(',', $_REQUEST['game_id']);
+        foreach ($c as $key => $value) {
+            $va[] = $value['game_id'];
+        }
+        if (!empty($va)) {
+            $game_id = array_diff($_REQUEST['game_id'], $va);
+        } else {
+            $game_id = $_REQUEST['game_id'];
+        }
+
+        if (empty($game_id)) {
+            $this->ajaxReturn(array("status" => "0", "msg" => "游戏已申请过，请勿重复申请"));
+            exit;
+        }
+        $_REQUEST['game_id'] = implode(',', $game_id);
+        $data['game_id'] = array('in', $_REQUEST['game_id']);
+        $data['promote_id'] = session("promote_auth.pid");
+        $data['promote_account'] = session("promote_auth.account");
+        $data['apply_time'] = NOW_TIME;
+        $data['status'] = 0;
+        $game = M('Game', 'tab_');
+        foreach ($game_id as $key => $value) {
+            $data['game_id'] = $value;
+            $gdata = $game->where(array('id' => $value))->find();
+            $data['game_name'] = get_game_name($value);
+            $data['ratio'] = $gdata['ratio'];
+            $data['money'] = $gdata['money'];
+            $data['sdk_version'] = $gdata['sdk_version'];
+            // $data['pattern']=current($pattern);
+            // next($pattern);
+            $res = $model->add($data);
+        }
+        if ($res) {
+            $this->ajaxReturn(array("status" => "1", "msg" => "申请成功"));
+        } else {
+            $this->ajaxReturn(array("status" => "0", "msg" => "申请失败"));
+        }
+    }
+
+    /**
+     * 批量添加投放申请
+     * @author 鹿文学
+     */
+    public function batch_apply_game()
+    {
+        if (IS_POST) {
+            $relation_game_ids = $_POST['game_id'];
+            $platform_id = $_POST['platform_id'];
+            $platform_name = $_POST['platform_name'];
+            $remark = $_POST['remark'];
+            $promote_id = is_login_promote();
+
+            if ($promote_id < 1) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '请登录后再操作'], 'json');
+            }
+
+            if (empty($relation_game_ids)) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '你还没有选择任何内容！'], 'json');
+            }
+
+            if ((!is_numeric($platform_id) || $platform_id < 1) && empty($platform_name)) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '投放平台不能为空'], 'json');
+            }
+
+            $gamemodel = M('Game', 'tab_');
+
+            $game = $gamemodel->field('id,game_name,sdk_version,ratio,money')->where(['relation_game_id' => ['in', $relation_game_ids]])->select();
+
+            if (!is_array($game) || empty($game[0])) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '游戏不存在'], 'json');
+            }
+
+            $game_id = array_column($game, 'id');
+
+
+            // 先查投放平台，如有渠道输入则先判断平台是否存在，不存在则添加，存在则获取信息；没有趣的输入，则判断选择平台是否存在，不存在返回
+
+            $platformmodel = M('launch_platform', 'tab_');
+
+
+            if ($platform_name) {
+                $platform = $platformmodel->where(['name' => $platform_name])->find();
+
+                if (empty($platform)) {
+                    $platform_id = $platformmodel->add(['create_time' => time(), 'update_time' => time(), 'name' => $platform_name, 'promote_id' => $promote_id, 'promote_account' => get_promote_account($promote_id), 'mark' => 1]);
+                } else {
+                    $platform_id = $platform['id'];
+                }
+
+            } else {
+
+                $platform = $platformmodel->where(['id' => $platform_id])->find();
+                if (empty($platform)) {
+                    $this->ajaxReturn(['status' => 0, 'msg' => '投放平台选择有误，请重新选择'], 'json');
+                }
+
+            }
+
+            // 再查申请表，数据是否存在，存在则不予理会，不存在则添加
+
+            $applymodel = M('Apply', 'tab_');
+
+            $apply = $applymodel->field('id,game_id,status')->where(['promote_id' => $promote_id, 'game_id' => ['in', $game_id]])->select();
+
+            $exist = 1;
+
+            if (empty($apply)) {
+
+                $apply = $this->add_apply($applymodel, $game, $promote_id, $game_id);
+
+                $exist = C('SET_AUTO_PACK');
+
+            }
+
+            foreach ($apply as $k => $v) {
+                foreach ($game as $m => $n) {
+                    if ($v['game_id'] == $n['id']) {
+                        unset($game[$m]);
+                    }
+                }
+            }
+
+            if (!empty($game)) {
+                $apply = $this->add_apply($applymodel, $game, $promote_id, $game_id);
+            }
+
+            $apply_ids = array_column($apply, 'id');
+
+            if ($platform_id > 0 && is_array($apply_ids)) {
+
+                $launchmodel = M('apply_launch', 'tab_');
+
+                $launch = $launchmodel->field('platform_id,apply_id,max(position) as position')->where(['platform_id' => $platform_id, 'apply_id' => ['in', $apply_ids]])->group('platform_id,apply_id')->order('launch_time desc')->select();
+
+                if (empty($launch)) {
+
+                    foreach ($apply as $k => $v) {
+                        $data[] = array(
+                            'platform_id' => $platform_id,
+                            'apply_id' => $v['id'],
+                            'launch_game_id' => $v['game_id'],
+                            'launch_time' => time(),
+                            'position' => 1,
+                            'remark' => $remark,
+                        );
+
+                    }
+
+                } else {
+
+                    foreach ($apply as $k => $v) {
+                        $flag = true;
+                        foreach ($launch as $m => $n) {
+
+                            if ($n['apply_id'] == $v['id']) {
+                                if ($v['status'] == 1) {
+                                    $data[$k] = array(
+                                        'platform_id' => $platform_id,
+                                        'apply_id' => $v['id'],
+                                        'launch_game_id' => $v['game_id'],
+                                        'launch_time' => time(),
+                                        'position' => $n['position'] > 0 ? (intval($n['position']) + 1) : 1,
+                                        'remark' => $remark,
+                                    );
+                                    break;
+                                } else {
+                                    $flag = false;
+                                }
+                            }
+
+                        }
+                        if (!$data[$k] && $flag) {
+                            $data[$k] = array(
+                                'platform_id' => $platform_id,
+                                'apply_id' => $v['id'],
+                                'launch_game_id' => $v['game_id'],
+                                'launch_time' => time(),
+                                'position' => 1,
+                                'remark' => $remark,
+                            );
+                        }
+
+                    }
+
+                }
+
+                $res = $launchmodel->addAll($data);
+
+                if ($res > 0) {
+                    $this->ajaxReturn(['status' => 1, 'msg' => '申请成功', 'exist' => $exist], 'json');
+                } else {
+                    $this->ajaxReturn(['status' => 0, 'msg' => '申请失败'], 'json');
+                }
+
+            } else {
+                $this->ajaxReturn(['status' => 0, 'msg' => '申请失败，请重新申请'], 'json');
+            }
+
+        } else {
+
+            $this->ajaxReturn(['status' => 0, 'msg' => '请求有误'], 'json');
+
+        }
+
+    }
+
+    /**
+     * 批量添加申请并返回符合条件的申请信息
+     * @param object $applymodel 申请表模型对象
+     * @param array $game 游戏数组对象
+     * @param integer $promote_id 渠道编号
+     * @param array $game_id 要查找的游戏编号数组
+     * @param string $fields 查询字段
+     * @param array            根据条件获取的申请信息数组
+     * @author 鹿文学
+     */
+    private function add_apply($applymodel, $game, $promote_id, $game_id, $fields = 'id,game_id,status')
+    {
+
+        foreach ($game as $k => $v) {
+            $data[] = array(
+                'game_id' => $v['id'],
+                'game_name' => $v['game_name'],
+                'promote_id' => $promote_id,
+                'promote_account' => session("promote_auth.account"),
+                'apply_time' => time(),
+                'status' => C('SET_AUTO_PACK'),
+                'dispose_time' => C('SET_AUTO_PACK') ? time() : '',
+                'sdk_version' => $v['sdk_version'],
+                'ratio' => $v['ratio'],
+                'money' => $v['money'],
+            );
+
+        }
+
+
+        $applymodel->addAll($data);
+
+        $apply = $applymodel->field($fields)->where(['promote_id' => $promote_id, 'game_id' => ['in', $game_id]])->select();
+
+        return $apply;
+
+    }
+
+    public function specialMyGameList()
+    {
+        $this->my_game(1);
+    }
+
+    public function myGameList()
+    {
+        $this->my_game(2);
+    }
+
+    public function my_game($serverType = 1)
+    {
+        $loginPromote = $this->getLoginPromote();
+
+        //渠道可申请游戏
+        if (empty($_REQUEST['promote_id'])) {
+            $promoteId = $loginPromote['id'];
+        } else {
+            $promoteId = $_REQUEST['promote_id'];
+        }
+
+        $applyService = new ApplyService();
+        $gameIdList = $applyService->getSociatyGameIds($loginPromote);
+
+        $applyMap['promote_id'] = $promoteId;
+        $applyMap['offline_status'] = 0;
+        $applyMap['game_id'] = ['in', $gameIdList];
+
+        $gameIds = M('Apply', 'tab_')->where($applyMap)->getField('game_id', true);
+        $gameIds = implode(',', $gameIds);
+
+        if (empty($gameIds)) {
+            $map['_string'] = '1 = 2';
+        } else {
+            $map['tab_game.id'] = ['in', $gameIds];
+        }
+
+        $map['tab_apply.promote_id'] = $promoteId;
+        $map['tab_game.online_status'] = 1;//开发者游戏上线状态
+        $map['tab_game.down_port'] = 1;//游戏端口 第三方接口不能申请
+        $map['tab_game.game_status'] = 1;//游戏状态
+        $map['tab_game.server_type'] = $serverType;//游戏服务器类型
+
+        if ($_REQUEST['game_id'] != null) {
+            $relationGameName = M('Game', 'tab_')->where(array('id' => $_REQUEST['game_id']))->getField('relation_game_name');
+            if ($relationGameName) {
+                $map['tab_game.relation_game_name'] = ['like', $relationGameName];
+            } else {
+                $map['tab_apply.game_id'] = $_REQUEST['game_id'];
+            }
+        }
+        if ($_REQUEST['pattern'] != null) {
+            $map['tab_apply.pattern'] = $_REQUEST['pattern'];
+        }
+
+        $page = intval(I('get.p', 0));
+        $page = $page ? $page : 1; //默认显示第一页数据
+
+        if (isset($_REQUEST['row'])) {
+            $row = $_REQUEST['row'];
+        } else {
+            $row = 10;
+        }
+
+        $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,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)")
+            // 查询条件
+            ->where($map)
+            /* 默认通过id逆序排列 */
+            ->order("apply_time desc,id desc")
+            /* 数据分页 */
+            ->page($page, $row)
+            /* 执行查询 */
+            ->select();
+
+        /* 查询记录总数 */
+        $count = count(M("game", "tab_")
+            /* 查询指定字段，不指定则查询所有字段 */
+            ->field("tab_game.*,tab_apply.promote_id,tab_apply.status")
+            ->join("tab_apply ON tab_game.id = tab_apply.game_id and tab_apply.promote_id = " . $promoteId)
+            // 查询条件
+            ->where($map)
+            ->select());
+        //分页
+
+        $parameter = array(
+            'row' => I('get.row'),
+            'sdk_version' => I('request.sdk_version'),
+            'p' => I('p', 1),
+            'type' => I('request.type'),
+            'enable_status' => I('request.enable_status'),
+            'game_id' => I('request.game_id'),
+        );
+
+        $page = set_pagination($count, $row, $parameter);
+        if ($page) {
+            $this->assign('_page', $page);
+        }
+
+        $promoteRole = empty(I('promote_role')) ? 1 : I('promote_role');
+
+        $url = "http://" . $_SERVER['HTTP_HOST'] . __ROOT__ . "/media.php/member/preg/pid/" . session("promote_auth.pid");
+        $this->assign("url", $url);
+        $this->assign("count", $count);
+        $this->assign("row", $row);
+        $this->assign('loginPromote', $loginPromote);
+        $this->assign('promoteId', $promoteId);
+        $this->assign('promoteRole', $promoteRole);
+        $this->assign('promoteData', getAllPromoteListByType($promoteRole));
+        $this->assign('list_data', $data);
+        $this->assign('serverType', $serverType);
+        $this->assign('myGame', ($serverType == 1) ? 'specialMyGameList' : 'myGameList');
+        $this->assign('game', ($serverType == 1) ? 'gameSpecialList' : 'gameList');
+        $this->assign('position', ($serverType == 1) ? '专服管理' : '混服管理');
+        $this->meta_title = "我的游戏";
+        $this->display('my_game');
+    }
+
+
+    public function my_game_ch($type = -1, $p = 0)
+    {
+        //渠道可申请游戏
+        $game_ids = M('promote', 'tab_')->where(['id' => get_pid()])->getField('game_ids');
+        if (!empty($game_ids) || $game_ids === '0') {
+            $game_ids = explode(',', $game_ids);
+            $map['tab_game.id'] = ['in', $game_ids];
+        }
+        $map['promote_id'] = session("promote_auth.pid");
+        $map['tab_game.game_status'] = 1;//游戏状态
+
+        if ($_REQUEST['game_id'] != null) {
+            $map['tab_game.relation_game_id'] = $_REQUEST['game_id'];
+        }
+        $res = M('game', 'tab_')->where(['relation_game_id' => $_REQUEST['game_id']])->find();
+        if (empty($res) && $_REQUEST['game_id']) {
+            $res_ = M('game', 'tab_')->find($_REQUEST['game_id']);
+            $map['tab_game.relation_game_id'] = $res_['relation_game_id'];
+        }
+        $map['tab_apply.status'] = 0;
+
+        $page = intval($p);
+        $page = $page ? $page : 1; //默认显示第一页数据
+
+        $row = 6;
+
+        if (isset($_REQUEST['row'])) {
+            $row = $_REQUEST['row'];
+        } else {
+            $row = 10;
+        }
+
+        $data = M("game", "tab_")
+            /* 查询指定字段，不指定则查询所有字段 */
+            ->field("tab_game.id,tab_game.game_size,tab_game.game_name,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,tg.relation_game_id as trelation_game_id,tg.id as tid,tg.sdk_version as tsdk_version,tg.game_size as tgame_size,tg.money as tmoney,tg.ratio as tratio,tg.material_url as tmaterial_url,dispose_time,apply_time,tab_apply.promote_money as applymoney,tab_apply.promote_ratio as applyratio,tab_apply.status as applystatus")
+            ->join("tab_apply ON tab_game.id = tab_apply.game_id and tab_apply.promote_id = " . session('promote_auth.pid'))
+            ->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)")
+            // 查询条件
+            ->where($map)
+            /* 默认通过id逆序排列 */
+            ->order("id desc")
+            ->group("relation_game_id")
+            /* 数据分页 */
+            ->page($page, $row)
+            /* 执行查询 */
+            ->select();
+        $applymodel = M('apply', 'tab_');
+        $launchmodel = M('apply_launch', 'tab_');
+        foreach ($data as $key => $value) {
+
+            if ($value['sdk_version'] == 2 && $value['tsdk_version'] == 1) {
+                $game_ios = get_game_info($value['id']);
+                $game_and = get_game_info($value['tid']);
+                $data[$key] = $game_and;
+                $data[$key]['tid'] = $game_ios['id'];
+                $data[$key]['tsdk_version'] = $game_ios['sdk_version'];
+                $data[$key]['tgame_size'] = $game_ios['game_size'];
+                $data[$key]['tmoney'] = $game_ios['money'];
+                $data[$key]['tratio'] = $game_ios['ratio'];
+                $data[$key]['dispose_time'] = $game_ios['dispose_time'];
+                $data[$key]['tapplymoney'] = $apply_info['promote_money'];
+                $data[$key]['tapplyratio'] = $apply_info['promote_ratio'];
+            }
+        }
+
+        foreach ($data as $key => $value) {
+            $apply = $applymodel->field('id,status')->where(['promote_id' => get_pid(), 'game_id' => $value['tid']])->find();
+
+            if ($value['applyid']) {
+                $platform = $launchmodel->field('platform_id')->where(['apply_id' => $value['applyid']])->find();
+                $data[$key]['platform_id'] = $platform['platform_id'];
+            } else {
+                $data[$key]['applyid'] = 0;
+            }
+
+            if ($apply['id']) {
+                $data[$key]['tapplyid'] = $apply['id'];
+                $tplatform = $launchmodel->field('platform_id')->where(['apply_id' => $apply['id']])->find();
+                $data[$key]['tplatform_id'] = $tplatform['platform_id'];
+                $data[$key]['tapplystatus'] = $apply['status'];
+            } else {
+                $data[$key]['tapplyid'] = 0;
+                $data[$key]['tapplystatus'] = 0;
+            }
+        }
+
+        /* 查询记录总数 */
+        $count = count(M("game", "tab_")
+            /* 查询指定字段，不指定则查询所有字段 */
+            ->field("tab_game.*,tab_apply.promote_id,tab_apply.status")
+            ->join("tab_apply ON tab_game.id = tab_apply.game_id and tab_apply.promote_id = " . session('promote_auth.pid'))
+            // 查询条件
+            ->where($map)
+            ->group("relation_game_id")
+            ->select());
+
+        //分页
+
+        $parameter = array(
+            'row' => I('get.row'),
+            'sdk_version' => I('request.sdk_version'),
+            'p' => I('p', 1),
+            'type' => I('request.type'),
+            'enable_status' => I('request.enable_status'),
+            'game_id' => I('request.game_id'),
+        );
+
+        $page = set_pagination($count, $row, $parameter);
+        if ($page) {
+            $this->assign('_page', $page);
+        }
+
+
+        $url = "http://" . $_SERVER['HTTP_HOST'] . __ROOT__ . "/media.php/member/preg/pid/" . session("promote_auth.pid");
+        $this->assign("url", $url);
+        $this->assign("count", $count);
+        $this->assign('model', $model);
+        $this->assign('list_data', $data);
+        $this->meta_title = "我的游戏";
+        $this->display();
+    }
+
+
+    public function child_game($p = 0)
+    {
+        $loginPromote = $this->getLoginPromote();
+        if ($loginPromote['level'] > 3) {
+            echo '<script>window.location.go(-1);</script>';
+            exit;
+        }
+
+        if (!empty($_REQUEST['game_id'])) {
+            $map['tab_apply.game_id'] = $_REQUEST['game_id'];
+        }
+        if (!empty($_REQUEST['promote_id'])) {
+            $map['tab_apply.promote_id'] = $_REQUEST['promote_id'];
+        } else {
+            $sid = M('Promote', 'tab_')->field('id')->where(array('parent_id' => PID, 'status' => 1))->select();
+            if ($sid) {
+                $map['tab_apply.promote_id'] = array('in', array_column($sid, 'id'));
+            } else {
+                $map['tab_apply.promote_id'] = -1;
+            }
+        }
+        $map['tab_game.game_status'] = 1;//游戏状态
+        $start_time = strtotime(I('time_start'));
+        $end_time = strtotime(I('time_end'));
+        if (!empty($start_time) && !empty($end_time)) {
+            $map['tab_apply.dispose_time'] = ['BETWEEN', [$start_time, $end_time + 24 * 60 * 60 - 1]];
+            unset($_REQUEST['time_start']);
+            unset($_REQUEST['time_end']);
+        } else if (!empty($start_time)) {
+            $map['tab_apply.dispose_time'] = array('gt', $start_time);
+        } else if (!empty($end_time)) {
+            $map['tab_apply.dispose_time'] = array('lt', $end_time + 24 * 60 * 60 - 1);
+        }
+        $map['tab_apply.status'] = 1;
+
+        $page = intval($p);
+        $page = $page ? $page : 1; //默认显示第一页数据
+
+
+        if (isset($_REQUEST['row'])) {
+            $row = $_REQUEST['row'];
+        } else {
+            $row = 10;
+        }
+
+        $data = M("game", "tab_")
+            /* 查询指定字段，不指定则查询所有字段 */
+            ->field("tab_game.id,tab_game.game_size,tab_game.game_name,tab_game.money,tab_game.sdk_version,tab_game.ratio,tab_game.icon,tab_game.game_type_name,tab_game.recommend_status,promote_id,promote_account,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,tg.relation_game_id as trelation_game_id,tg.id as tid,tg.game_name as tgame_name,tg.sdk_version as tsdk_version,tg.game_size as tgame_size,tg.money as tmoney,tg.ratio as tratio,tg.material_url as tmaterial_url,dispose_time,apply_time,promote_account,tab_apply.promote_money as applymoney,tab_apply.promote_ratio as applyratio,tab_apply.status as applystatus")
+            ->join("tab_apply ON tab_game.id = tab_apply.game_id ")
+            ->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)")
+            // 查询条件
+            ->where($map)
+            /* 默认通过id逆序排列 */
+            ->order("id desc")
+            ->group("tab_apply.promote_id,relation_game_id")
+            /* 数据分页 */
+            ->page($page, $row)
+            /* 执行查询 */
+            ->select();
+        $count = count(M("game", "tab_")
+            /* 查询指定字段，不指定则查询所有字段 */
+            ->field("tab_game.*,tab_apply.promote_id,tab_apply.status")
+            ->join("tab_apply ON tab_game.id = tab_apply.game_id ")
+            // 查询条件
+            ->where($map)
+            ->group("tab_apply.promote_id,relation_game_id")
+            ->select());
+        $applymodel = M('apply', 'tab_');
+        $launchmodel = M('apply_launch', 'tab_');
+        foreach ($data as $key => $value) {
+            if ($value['sdk_version'] == 2 && $value['tsdk_version'] == 1) {
+                $game_ios = get_game_info($value['id']);
+                $game_and = get_game_info($value['tid']);
+                $apply_info = M('apply', 'tab_')->where(['game_id' => $value['id'], 'promote_account' => $value['promote_account']])->find();
+                $data[$key] = $game_and;
+                $data[$key]['tid'] = $game_ios['id'];
+                $data[$key]['tsdk_version'] = $game_ios['sdk_version'];
+                $data[$key]['tgame_size'] = $game_ios['game_size'];
+                $data[$key]['tmoney'] = $game_ios['money'];
+                $data[$key]['tratio'] = $game_ios['ratio'];
+                $data[$key]['applyid'] = $apply_info['id'];
+                $data[$key]['enable_status'] = $apply_info['enable_status'];
+                $data[$key]['promote_id'] = $apply_info['promote_id'];
+                $data[$key]['promote_account'] = $apply_info['promote_account'];
+                $data[$key]['applymoney'] = $apply_info['promote_money'];
+                $data[$key]['tapplyratio'] = $apply_info['promote_ratio'];
+                $data[$key]['tapply_time'] = $apply_info['apply_time'];
+                $data[$key]['dispose_time'] = $apply_info['apply_time'];
+            }
+        }
+
+        foreach ($data as $key => $value) {
+            $apply = $applymodel->field('id,status')->where(['promote_id' => $value['promote_id'], 'game_id' => $value['tid']])->find();
+
+            if ($value['applyid']) {
+                $data[$key]['launch_count'] = $launchmodel->where(['apply_id' => $value['applyid']])->count();
+            } else {
+                $data[$key]['applyid'] = 0;
+            }
+
+            if ($apply['id']) {
+                $data[$key]['tapplyid'] = $apply['id'];
+                $data[$key]['tlaunch_count'] = $launchmodel->where(['apply_id' => $apply['id']])->count();
+                $data[$key]['tapplystatus'] = $apply['status'];
+            } else {
+                $data[$key]['tapplyid'] = 0;
+                $data[$key]['tapplystatus'] = 0;
+            }
+        }
+
+        //分页
+
+
+        $parameter = $_POST;
+        $parameter['p'] = I('get.p', 1);
+        $parameter['row'] = I('get.row');
+
+
+        $page = set_pagination($count, $row, $parameter);
+        if ($page) {
+            $this->assign('_page', $page);
+        }
+
+
+        $this->assign("count", $count);
+        $this->assign('model', $model);
+        $this->assign('list_data', $data);
+        $this->meta_title = "子渠道游戏";
+        $this->display();
+    }
+
+
+    public function changevalue()
+    {
+        if (IS_POST) {
+            if (!is_numeric($_REQUEST['id']) || $_REQUEST['id'] <= 0) {
+                echo json_encode(array('status' => 0, 'info' => '数据有误'));
+                exit;
+            }
+            if (!is_numeric($_REQUEST['value']) || $_REQUEST['value'] < 0) {
+                echo json_encode(array('status' => 0, 'info' => '数据有误'));
+                exit;
+            }
+            $apply = M('apply', 'tab_');
+            if ($_REQUEST['type'] == 1) {
+                $res = $apply->where(array('id' => $_REQUEST['id']))->setField(array('promote_money' => $_REQUEST['value']));
+                if ($res) {
+                    echo json_encode(array('status' => 1, 'info' => '注册单价修改成功'));
+                    exit;
+                } else {
+                    echo json_encode(array('status' => 0, 'info' => '注册单价修改失败'));
+                    exit;
+                }
+            } elseif ($_REQUEST['type'] == 2) {
+                $res = $apply->where(array('id' => $_REQUEST['id']))->setField(array('promote_ratio' => $_REQUEST['value']));
+                if ($res) {
+                    echo json_encode(array('status' => 1, 'info' => '分成比例修改成功'));
+                    exit;
+                } else {
+                    echo json_encode(array('status' => 0, 'info' => '分成比例修改失败'));
+                    exit;
+                }
+            } else {
+                echo json_encode(array('status' => 0, 'info' => '数据有误'));
+                exit;
+            }
+        } else {
+            echo json_encode(array('status' => 0, 'info' => '数据有误'));
+            exit;
+        }
+    }
+
+    public function apply_game()
+    {
+        if (IS_POST) {
+            $relation_game_id = $_POST['game_id'];
+            $sdk_version = $_POST['sdk_version'];
+            $platform_id = $_POST['platform_id'];
+            $platform_name = $_POST['platform_name'];
+            $remark = $_POST['remark'];
+            $promote_id = is_login_promote();
+            if ($promote_id < 1) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '请登录后再操作'], 'json');
+            }
+
+            if (!is_numeric($relation_game_id) || $relation_game_id < 1) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '缺少游戏'], 'json');
+            }
+            if (!is_numeric($sdk_version) || $sdk_version < 1 || $sdk_version > 2) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '缺少版本'], 'json');
+            }
+            if ((!is_numeric($platform_id) || $platform_id < 1) && empty($platform_name)) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '投放平台不能为空'], 'json');
+            }
+
+
+            $gamemodel = M('Game', 'tab_');
+
+            $game = $gamemodel->where(['relation_game_id' => $relation_game_id, 'sdk_version' => $sdk_version])->find();
+
+            if (!is_array($game)) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '此游戏不存在'], 'json');
+            }
+
+            $game_id = $game['id'];
+
+            // 先查投放平台，如有渠道输入则先判断平台是否存在，不存在则添加，存在则获取信息；没有趣的输入，则判断选择平台是否存在，不存在返回
+
+            $platformmodel = M('launch_platform', 'tab_');
+
+
+            if ($platform_name) {
+                $platform = $platformmodel->where(['name' => $platform_name])->find();
+
+                if (empty($platform)) {
+                    $platform_id = $platformmodel->add(['create_time' => time(), 'update_time' => time(), 'name' => $platform_name, 'promote_id' => $promote_id, 'promote_account' => get_promote_account($promote_id), 'mark' => 1]);
+                } else {
+                    $platform_id = $platform['id'];
+                }
+
+            } else {
+
+                $platform = $platformmodel->where(['id' => $platform_id])->find();
+                if (empty($platform)) {
+                    $this->ajaxReturn(['status' => 0, 'msg' => '投放平台选择有误，请重新选择'], 'json');
+                }
+
+            }
+
+
+            // 再查申请表，数据是否存在，存在则不予理会，不存在则添加
+
+            $applymodel = M('Apply', 'tab_');
+
+            $apply = $applymodel->field('id')->where(['promote_id' => $promote_id, 'game_id' => $game_id])->find();
+            if (empty($apply)) {
+                $data = array(
+                    'game_id' => $game_id,
+                    'game_name' => $game['game_name'],
+                    'promote_id' => $promote_id,
+                    'promote_account' => session("promote_auth.account"),
+                    'apply_time' => time(),
+                    'status' => C('SET_AUTO_PACK'),
+                    'dispose_time' => C('SET_AUTO_PACK') ? time() : '',
+                    'sdk_version' => $sdk_version,
+                    'ratio' => $game['ratio'],
+                    'money' => $game['money'],
+                );
+
+                $exist = C('SET_AUTO_PACK');
+
+                $apply_id = $applymodel->add($data);
+            } else {
+                $apply_id = $apply['id'];
+                $exist = 1;
+            }
+
+            if ($platform_id > 0 && $apply_id > 0) {
+
+                $launchmodel = M('apply_launch', 'tab_');
+
+                $launch = $launchmodel->field('position')->where(['platform_id' => $platform_id, 'apply_id' => $apply_id])->order('launch_time desc')->find();
+
+
+                $data = array(
+                    'platform_id' => $platform_id,
+                    'apply_id' => $apply_id,
+                    'launch_game_id' => $game_id,
+                    'launch_time' => time(),
+                    'position' => $launch['position'] > 0 ? (intval($launch['position']) + 1) : 1,
+                    'remark' => $remark,
+                );
+
+                $res = $launchmodel->add($data);
+
+                if ($res > 0) {
+                    $this->ajaxReturn(['status' => 1, 'msg' => '申请成功', 'exist' => $exist], 'json');
+                } else {
+                    $this->ajaxReturn(['status' => 0, 'msg' => '申请失败'], 'json');
+                }
+
+
+            } else {
+                $this->ajaxReturn(['status' => 0, 'msg' => '申请失败，请重新申请'], 'json');
+            }
+        } else {
+            $this->ajaxReturn(['status' => 0, 'msg' => '请求有误'], 'json');
+        }
+    }
+
+    /*
+     * APP申请
+     */
+    public function app_index()
+    {
+
+        $map['tab_app.type'] = 1;
+        empty(I('version')) || $map['tab_app.version'] = I('version');
+        $promote_id = PID;
+        $data = M('app', 'tab_')
+            ->field('tab_app.*,p.status as apply_status,p.dow_url,p.enable_status,p.promote_id')
+            ->join("left join tab_app_apply p on p.app_id = tab_app.id and p.promote_id = {$promote_id}")
+            ->where($map)
+            ->select();
+        $this->assign('data', $data);
+        $this->meta_title = "APP申请";
+        $this->display();
+    }
+
+    //app申请
+    public function apply_app($app_id)
+    {
+        $app = M('app', 'tab_')->find($app_id);
+        $map['app_id'] = $app_id;
+        $map['promote_id'] = PID;
+        $data = M('app_apply', 'tab_')->where($map)->find();
+        if (!empty($data)) {
+            $res['status'] = 2;
+            $res['msg'] = '该渠道已经申请过此APP！';
+        } else {
+            $data['promote_id'] = PID;
+            $data['app_id'] = $app_id;
+            $data['app_name'] = $app['name'];
+            $data['app_version'] = $app['version'];
+            $data['apply_time'] = time();
+            $data['status'] = 0;
+
+            $result = M('app_apply', 'tab_')->add($data);
+            if ($result !== false) {
+                $res['status'] = 1;
+                $res['msg'] = '申请成功';
+            } else {
+                $res['status'] = 2;
+                $res['msg'] = '申请失败';
+            }
+        }
+        $this->ajaxReturn($res);
+    }
+
+    //打包
+    public function allpackage($ids = null, $game_id = 0)
+    {
+        if (empty($ids)) {
+            $gameData = M('Game', 'tab_')->find($game_id);
+            $model = new ApplyModel(); //D('Apply');
+            $data['game_id'] = $_POST['game_id'];
+            $data['game_name'] = get_game_name($game_id);
+            $data['promote_id'] = session("promote_auth.pid");
+            $data['promote_account'] = session("promote_auth.account");
+            $data['apply_time'] = NOW_TIME;
+            $data['status'] = 1;
+            $data['enable_status'] = 2;
+            $data['dispose_id'] = 0;
+            $data['dispose_time'] = NOW_TIME;
+            $data['sdk_version'] = $gameData['sdk_version'];
+            $data['ratio'] = $gameData['ratio'];
+            $data['money'] = $gameData['money'];
+            $result = $model->add($data);
+            if ($result > 0) {
+                $this->success("已加入打包队列,刷新此页面可查看当前打包状态");
+            } else {
+                $this->error('打包失败');
+            }
+        } else {
+            $map['id'] = $ids;
+            $data = array('status' => 1, 'enable_status' => 2);
+            M('apply', 'tab_')->where($map)->setField($data);
+            $this->success("已加入打包队列,刷新此页面可查看当前打包状态");
+            exit;
+        }
+    }
+
+    /**
+     *APP打包
+     */
+    public function app_package($appid = null)
+    {
+        $appData = M('app', 'tab_')->find($appid);
+        $map['app_id'] = $appid;
+        $map['promote_id'] = PID;
+        $ids = 0;
+        $data = M('app_apply', 'tab_')->where($map)->find();
+        if (empty($data)) {
+            $data['promote_id'] = PID;
+            $data['app_id'] = $appid;
+            $data['app_name'] = $appData['name'];
+            $data['app_version'] = $appData['version'];
+            $data['apply_time'] = time();
+            $data['status'] = 1;
+            $data['enable_status'] = 1;
+            $data['dispose_id'] = 0;
+            $data['dispose_time'] = NOW_TIME;
+            $result = M('app_apply', 'tab_')->add($data);
+            $ids = $result;
+        } else {
+            $ids = $data['id'];
+        }
+        try {
+            $apply_data = M('app_apply', 'tab_')->find($ids);
+            #获取原包数据
+            $source_file = M('app', 'tab_')->find($apply_data['app_id']);
+
+            if ($apply_data['app_version'] == 1) {
+                $app_type = ".apk";
+                $url_ver = "META-INF/mch.properties";
+            } else {
+                $app_type = ".ipa";
+                $url_ver = "Payload/XiGuMobileGame.app/_CodeSignature/mch.txt";
+            }
+            $newname = "app_package" . $apply_data["app_id"] . "-" . $apply_data['promote_id'] . $app_type;
+            $to = "./Uploads/GamePack/" . $newname;
+            copy($source_file['file_url'], $to);
+            #打包新路径
+            $zip = new \ZipArchive;
+            $res = $zip->open($to, \ZipArchive::CREATE);
+            if ($res == TRUE) {
+                #打包数据
+                $pack_data = array(
+                    "promote_id" => $apply_data['promote_id'],
+                    "promote_account" => get_promote_name($apply_data["promote_id"]),
+                );
+                $zip->addFromString($url_ver, json_encode($pack_data));
+                $zip->close();
+                if (get_tool_status("oss_storage") == 1) {
+                    $to = "http://" . C("oss_storage.bucket") . "." . C("oss_storage.domain") . "/GamePack/" . $newname;
+                    $to = str_replace('-internal', '', $to);
+                    $new_to = "./Uploads/GamePack/" . $newname;
+                    $updata['savename'] = $newname;
+                    $updata['path'] = $new_to;
+
+                    $this->upload_game_pak_oss($updata);
+                    @unlink($new_to);
+                } elseif (get_tool_status("qiniu_storage") == 1) {
+                    $this->dleteQiNiuFile($newname);
+                    $url = $this->upQiNiuFile($newname, $to);
+                    @unlink($to);
+                    $to = "http://" . $url;
+                } elseif (get_tool_status("cos_storage") == 1) {
+                    $cos = A('Cos');
+                    $cos->cosupload("", "/App/" . $newname, 2);
+                    $cos_res = $cos->cosupload($to, "/App/" . $newname);
+                    if (strlen($cos_res) > 10) {
+                        @unlink($to);
+                        $to = $cos_res;
+
+                    } else {
+                        $this->error("Cos参数错误");
+                    }
+                }
+
+                if ($apply_data['app_version'] == 2) {
+                    $plist_url = A('Plist')->create_plist_app('1', $apply_data['promote_id'], 'app', $to);
+                    $apply_data['plist_url'] = $plist_url;
+                }
+                $apply_data['dow_url'] = $to;
+                $apply_data['enable_status'] = 1;
+                $apply_data['status'] = 1;
+                $res = M('app_apply', 'tab_')->save($apply_data);
+            } else {
+                $this->error('解压文件失败');
+            }
+            $this->success('打包成功');
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+        }
+    }
+
+    public function promitionofregestion()
+    {
+        $map['relation_game_id'] = $_GET['gid'];
+        $data = M('game', 'tab_')->field('id,sdk_version,icon,screenshot,relation_game_id,relation_game_name')->where($map)->select();
+        $this->assign('data', $data);
+        $this->display();
+    }
+
+    public function qrcode($url = '', $logo = '', $level = 3, $size = 4)
+    {
+        $url = base64_decode(base64_decode($url));
+        $logo = base64_decode(base64_decode($logo));
+        Vendor('phpqrcode.phpqrcode');
+        $errorCorrectionLevel = intval($level);//容错级别
+        $matrixPointSize = intval($size);//生成图片大小
+        //生成二维码图片
+//        echo $_SERVER['REQUEST_URI'];
+        ob_clean();
+        echo \QRcode::png($url, false, $errorCorrectionLevel, $matrixPointSize, 2, false, $logo);
+    }
+
+    /**
+     *上传到OSS
+     */
+    public function upload_game_pak_oss($return_data = null)
+    {
+        /**
+         * 根据Config配置，得到一个OssClient实例
+         */
+        try {
+            Vendor('OSS.autoload');
+            $ossClient = new \OSS\OssClient(C("oss_storage.accesskeyid"), C("oss_storage.accesskeysecr"), C("oss_storage.domain"));
+        } catch (OssException $e) {
+            $this->error($e->getMessage());
+        }
+
+        $bucket = C('oss_storage.bucket');
+
+        // if(preg_match('/.apk/',$return_data['savename']) ){
+        $oss_name = "GamePack";
+        // }else{
+        //       $oss_name="IosGamePack";
+        // }
+        $oss_file_path = $oss_name . "/" . $return_data["savename"];
+
+
+        $avatar = $return_data["path"];
+        try {
+
+            $this->multiuploadFile($ossClient, $bucket, $oss_file_path, $avatar);
+            return true;
+        } catch (OssException $e) {
+            /* 返回JSON数据 */
+            $this->error($e->getMessage());
+        }
+    }
+
+    public function multiuploadFile($ossClient, $bucket, $url, $file)
+    {
+        //$file = __FILE__;
+        $options = array();
+        try {
+            #初始化分片上传文件
+            $uploadId = $ossClient->initiateMultipartUpload($bucket, $url);
+            //$ossClient->multiuploadFile($bucket, $url, $file, $options);
+        } catch (OssException $e) {
+            printf(__FUNCTION__ . ": initiateMultipartUpload FAILED\n");
+            printf($e->getMessage() . "\n");
+            return;
+        }
+        /*
+         * step 2. 上传分片
+         */
+        $partSize = 5 * 1000 * 1024;
+        $uploadFile = $file;
+        $uploadFileSize = filesize($uploadFile);
+        $pieces = $ossClient->generateMultiuploadParts($uploadFileSize, $partSize);
+        $responseUploadPart = array();
+        $uploadPosition = 0;
+        $isCheckMd5 = true;
+        foreach ($pieces as $i => $piece) {
+            $fromPos = $uploadPosition + (integer)$piece[$ossClient::OSS_SEEK_TO];
+            $toPos = (integer)$piece[$ossClient::OSS_LENGTH] + $fromPos - 1;
+            $upOptions = array(
+                $ossClient::OSS_FILE_UPLOAD => $uploadFile,
+                $ossClient::OSS_PART_NUM => ($i + 1),
+                $ossClient::OSS_SEEK_TO => $fromPos,
+                $ossClient::OSS_LENGTH => $toPos - $fromPos + 1,
+                $ossClient::OSS_CHECK_MD5 => $isCheckMd5,
+            );
+            if ($isCheckMd5) {
+                $contentMd5 = \OSS\Core\OssUtil::getMd5SumForFile($uploadFile, $fromPos, $toPos);
+                $upOptions[$ossClient::OSS_CONTENT_MD5] = $contentMd5;
+            }
+            //2. 将每一分片上传到OSS
+            try {
+                $responseUploadPart[] = $ossClient->uploadPart($bucket, $url, $uploadId, $upOptions);
+            } catch (OssException $e) {
+                printf(__FUNCTION__ . ": initiateMultipartUpload, uploadPart - part#{$i} FAILED\n");
+                printf($e->getMessage() . "\n");
+                return;
+            }
+        }
+        $uploadParts = array();
+        foreach ($responseUploadPart as $i => $eTag) {
+            $uploadParts[] = array(
+                'PartNumber' => ($i + 1),
+                'ETag' => $eTag,
+            );
+        }
+        /**
+         * step 3. 完成上传
+         */
+        try {
+            $ossClient->completeMultipartUpload($bucket, $url, $uploadId, $uploadParts);
+        } catch (OssException $e) {
+            printf(__FUNCTION__ . ": completeMultipartUpload FAILED\n");
+            printf($e->getMessage() . "\n");
+            return;
+        }
+    }
+
+
+    /**
+     * 投放平台列表
+     * @param integer $applyid 申请表编号
+     * @author  鹿文学
+     */
+    public function launch($applyid = 0, $p = 1)
+    {
+
+        if (is_numeric($applyid) && $applyid > 0) {
+            $launchmodel = M('apply_launch', 'tab_');
+            $page = intval($p);
+            $page = $page ? $page : 1; //默认显示第一页数据
+            $map = ['apply_id' => $applyid];
+            $count = $launchmodel->alias('l')
+                ->join('tab_apply as a on(a.id=l.apply_id) ')
+                ->where($map)->count();
+            if ($count > 0) {
+                if (isset($_REQUEST['row'])) {
+                    $row = $_REQUEST['row'];
+                } else {
+                    $row = 10;
+                }
+
+                $list = $launchmodel->alias('l')->field('l.*,a.game_id,a.promote_id,a.promote_id,a.sdk_version,a.enable_status')
+                    ->join('tab_apply as a on(a.id=l.apply_id) ')
+                    ->where($map)->page($page, $row)->select();
+                $game = M('game', 'tab_')->where(['id' => $list[0]['launch_game_id']])->field('game_status,dow_status')->find();
+                if ($game['dow_status'] == 0 || $game['game_status'] == 0) {
+                    foreach ($list as $key => $v) {
+                        unset($list[$key]['launch_down_url']);
+                        unset($list[$key]['launch_plist_url']);
+                    }
+                }
+                $page = set_pagination($count, $row);
+                if ($page) {
+                    $this->assign('_page', $page);
+                }
+                $this->assign('list_data', $list);
+                $this->assign('is_launch', 1);
+            } else {
+                $list = M('apply', 'tab_')->where(['id' => $applyid])->find();
+                $game = M('game', 'tab_')->where(['id' => $list['game_id']])->field('game_status,dow_status')->find();
+                if ($game['dow_status'] == 0 || $game['game_status'] == 0) {
+                    unset($list['pack_url']);
+                    unset($list['plist_url']);
+                }
+                $this->assign('list_data', [$list]);
+                $this->assign('is_launch', 0);
+            }
+        }
+        $this->assign('relation_game_id', I('get.rgid', ''));
+        $this->assign('notchild', stripos($_SERVER['HTTP_REFERER'], 'child_game') ? 0 : 1);
+        $this->display();
+
+    }
+
+    function getPromoteListByRole()
+    {
+        $promoteRole = I('promote_role');
+        $data = array();
+
+        switch ($promoteRole) {
+            case 2:
+            case 3:
+            case 4:
+                $data = getAllPromoteListByType($promoteRole);
+                break;
+        }
+
+        $this->ajaxReturn($data);
+    }
+
+    public function getGameInfo()
+    {
+        $promote = $this->getLoginPromote();
+        $promoteService = new PromoteService();
+        if (!$promoteService->canPresidentApplyGame($promote)) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => '请联系市场专员开启',
+                'data' => [
+                ]
+            ]);
+        }
+
+        $gameId = I('game_id');
+        $promoteType = I('promote_type');
+        $gameData = array();
+
+        if ($gameId > 0) {
+            $map['id'] = $gameId;
+
+            $gameData = M('Game', 'tab_')
+                ->where($map)
+                ->find();
+        }
+
+        $gameData['sdk_name'] = getSDKTypeName($gameData['sdk_version']);
+
+        $promotes = getAllPromoteListByType($promoteType);
+
+        $newPromoteData = [];
+        if (count($promotes) > 0) {
+
+            $promoteIds = array_column($promotes, 'id');
+            $oldIds = M('apply', 'tab_')->where(['game_id' => $gameId, 'promote_id' => ['in', $promoteIds], 'offline_status' => 0])->getField('id', true);
+            $newPromoteIds = array_diff($promoteIds, $oldIds);
+            foreach ($promotes as $promote) {
+                if (in_array($promote['id'], $newPromoteIds)) {
+                    $newPromoteData[] = $promote;
+                }
+            }
+        }
+
+        $data['game_data'] = $gameData;
+        $data['promote_data'] = $newPromoteData;
+
+        $this->ajaxReturn([
+            'status' => 1, 
+            'message' => '获取成功',
+            'data' => $data
+        ]);
+    }
+
+    function addGameToPromote()
+    {
+        $loginPromote = $this->getLoginPromote();
+        $gameId = I('game_id');
+        $promoteIds = I('promote_ids');
+
+        if (empty($gameId)) {
+            $data['status'] = -1;
+            $data['msg'] = '游戏id错误';
+
+            $this->ajaxReturn($data);
+        }
+
+        if (empty($promoteIds)) {
+            $data['status'] = -1;
+            $data['msg'] = '未选择渠道';
+
+            $this->ajaxReturn($data);
+        }
+
+        $gameData = M('Game', 'tab_')->where(array('id' => $gameId))->find();
+
+        foreach ($promoteIds as $value) {
+            $thisPromoteData = D('Promote')->where(array('id' => $value))->find();
+
+            if (empty($thisPromoteData) || !hasPromotePermission($loginPromote['id'], $value)) {
+                $data['status'] = -1;
+                $data['msg'] = '渠道权限异常';
+
+                $this->ajaxReturn($data);
+            }
+
+            $map['game_id'] = $gameId;
+            $map['promote_id'] = $value;
+            $applyData = M('apply', 'tab_')->field('id,offline_status')->where($map)->find();
+
+            $updateStatus = 0;
+            if (!empty($applyData)) {
+                if ($applyData['offline_status'] == 0) {
+                    continue;
+                } else {
+                    $updateStatus = 1;
+                }
+            }
+
+            $save['promote_account'] = $thisPromoteData['account'];
+            $save['apply_time'] = NOW_TIME;
+            $save['ratio'] = $gameData['ratio'];
+            $save['money'] = $gameData['money'];
+            $save['offline_status'] = 0;
+
+            $gameSource = M('Game_source', 'tab_')->field('id,source_version')->where(['game_id' => $gameId])->find();
+            if (!file_exists(get_game_source_file_url($gameId)) || null == $gameSource) {
+                $save['enable_status'] = -1;
+            } else {
+                $save['enable_status'] = 2;
+            }
+
+            if ($updateStatus == 0) {
+                $save['sdk_version'] = $gameData['sdk_version'];
+                $save['game_id'] = $gameId;
+                $save['game_name'] = get_game_name($gameId);
+                $save['promote_id'] = $value;
+                $save['status'] = C('SET_AUTO_PACK');
+
+                $res = M('Apply', 'tab_')->add($save);
+            } else {
+                $res = M('Apply', 'tab_')->where('id = ' . $applyData['id'])->save($save);
+            }
+
+            if (!$res) {
+                $this->ajaxReturn(array("status" => -1, "msg" => "添加失败", 'ret' => $res));
+            }
+        }
+
+        $this->ajaxReturn(array("status" => 0, "msg" => "添加成功"));
+    }
+
+    public function getEnableStatus()
+    {
+        $applyId = I('post.apply_id');
+
+        if (empty($applyId)) {
+            $this->ajaxReturn(['status' => 0, 'msg' => '数据异常']);
+        }
+
+        $map['id'] = $applyId;
+        $enableStatus = M('Apply', 'tab_')->where($map)->getField('enable_status');
+
+        $this->ajaxReturn(['status' => 1, 'data' => $enableStatus]);
+    }
+
+    public function backDetailData()
+    {                 //返回详情数据
+        $result = ['code' => 10001, 'msg' => "该游戏信息不存在，请确认！", 'error' => 1, 'info' => ''];
+        $id = $_POST['id'];
+        if (empty($id)) {
+            $this->ajaxReturn($result);
+        }
+        $gameInfo = M('Game', 'tab_')->where(['id' => $id])->getField('detail_content');
+        if (!$gameInfo) {
+            $this->ajaxReturn($result);
+        } else {
+            $result['code'] = 10000;
+            $result['msg'] = "获取信息成功";
+            $result['error'] = -1;
+            $result['info'] = $gameInfo;
+            $this->ajaxReturn($result);
+
+        }
+    }
+
+    public function getDownloadUrl()
+    {
+        $gameId = I('game_id', 0);
+        $promoteId = I('promote_id', 0);
+        $promote = $this->getLoginPromote();
+        if ($promoteId == 0) {
+            $promoteId = $promote['id'];
+        }
+        $apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find();
+        $game = M('game', 'tab_')->field(['id', 'icon', 'apply_auth'])->where(['id' => $gameId])->find();
+        if ($apply == null) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => '游戏不存在',
+                'data' => [
+                ]
+            ]);
+        }
+
+        $applyService = new ApplyService();
+        if (!$applyService->checkSociatyPerm($promote, $game)) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => '该游戏未授权',
+                'data' => [
+                ]
+            ]);
+        }
+
+        $promoteService = new PromoteService();
+        if (!$promoteService->canPresidentApplyGame($promote)) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => '请联系市场专员开启',
+                'data' => [
+                ]
+            ]);
+        }
+        
+        $icon = Request::getHost() . '/' . get_cover($game['icon'], 'path');
+
+        $result = $applyService->checkApplyStatus($apply);
+        if (!$result['status']) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => $result['message'],
+                'data' => [
+                ]
+            ]);
+        }
+        $url = $applyService->getDownloadUrl($apply);
+        $this->ajaxReturn([
+            'status' => 1, 
+            'message' => '获取成功',
+            'data' => [
+                'url' => $url,
+            ]
+        ]);
+    }
+
+    public function getLandingPageUrl()
+    {
+        $gameId = I('game_id', 0);
+        $promoteId = I('promote_id', 0);
+        $promote = $this->getLoginPromote();
+        if ($promoteId == 0) {
+            $promoteId = $promote['id'];
+        }
+
+        $apply = M('apply', 'tab_')->where(['promote_id' => $promoteId, 'game_id' => $gameId])->find();
+        $game = M('game', 'tab_')->field(['icon', 'apply_auth', 'id'])->where(['id' => $gameId])->find();
+
+        if ($apply == null) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => '游戏不存在',
+                'data' => [
+                ]
+            ]);
+        }
+
+        $applyService = new ApplyService();
+        if (!$applyService->checkSociatyPerm($promote, $game)) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => '该游戏未授权',
+                'data' => [
+                ]
+            ]);
+        }
+
+        $promoteService = new PromoteService();
+        if (!$promoteService->canPresidentApplyGame($promote)) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => '请联系市场专员开启',
+                'data' => [
+                ]
+            ]);
+        }
+
+        $icon = Request::getHost() . '/' . get_cover($game['icon'], 'path');
+
+        $result = $applyService->checkApplyStatus($apply);
+        if (!$result['status']) {
+            $this->ajaxReturn([
+                'status' => 0, 
+                'message' => $result['message'],
+                'data' => [
+                ]
+            ]);
+        }
+
+        $url = $applyService->getLandingPageUrl($apply);
+        $this->ajaxReturn([
+            'status' => 1, 
+            'message' => '获取成功',
+            'data' => [
+                'url' => $url,
+            ]
+        ]);
+    }
+}
diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index c6ecc94fa..552a20130 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -2043,7 +2043,7 @@ class PromoteController extends BaseController
         $gameId = $_POST['game_id'];
         $promoteId = $_POST['promote_id'];
         $applyService = new ApplyService();
-        $applyService->cancelGame($gameId, $promoteId);
+        $applyService->offlineGame($gameId, $promoteId);
         recordPromoteLogs('游戏管理','专服管理下架游戏');
         $this->ajaxReturn(['status' => true, 'msg' => '下架成功']);
     }
diff --git a/Application/Home/View/default/Game/index.html b/Application/Home/View/default/Game/index.html
new file mode 100644
index 000000000..b58688ec1
--- /dev/null
+++ b/Application/Home/View/default/Game/index.html
@@ -0,0 +1,815 @@
+<extend name="Public/promote_base"/>
+<block name="css">
+  <link rel="stylesheet" href="__CSS__/20170831/select2.min.css" type="text/css"/>
+  <link href="__CSS__/20180207/data.css" rel="stylesheet">
+  <link href="__CSS__/20180207/game.css" rel="stylesheet">
+  <link href="__CSS__/20180207/finance.css" rel="stylesheet">
+  <link href="__CSS__/game_detailed.css?v=1.3" rel="stylesheet">
+  <link href="__STATIC__/icons_alibaba/iconfont.css" rel="stylesheet">
+  <link href="https://cdn.bootcss.com/twitter-bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+  <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/font-awesome/4.6.0/css/font-awesome.min.css">
+  <link href="__CSS__/transfer.css" rel="stylesheet" >
+
+  <style type="text/css">
+    .trunk-list {
+      position: relative;
+      min-height: 66vh;
+    }
+
+    .pagenation {
+      text-align: center;
+      line-height: 5vh;
+    }
+
+    .lwx_dialog_prompt .layui-layer-content {
+      padding-top: 15px;
+    }
+
+    .lwx_dialog_title {
+      margin: 0;
+      padding: 0;
+    }
+
+    .launch_platform_prompt .layui-layer-input, .lwx_dialog_input, .lwx_dialog_select, .lwx_dialog_textarea {
+      display: block;
+      width: 220px;
+      height: 32px;
+      margin: 0 auto;
+      line-height: 32px;
+      padding: 0 5px;
+      border: 1px solid #ccc;
+      box-shadow: 1px 1px 5px rgba(0, 0, 0, .1) inset;
+      color: #333;
+    }
+
+    .lwx_dialog_select {
+      width: 272px;
+    }
+
+    .lwx_dialog_textarea {
+      height: 64px;
+      width: 260px;
+      margin-top: 10px;
+      resize: none;
+    }
+
+    .lwx_dialog_input {
+      width: 260px;
+      margin-top: 10px;
+    }
+
+    .launch_platform_prompt .layui-layer-btn, .lwx_dialog_prompt .layui-layer-btn {
+      text-align: center;
+      padding-bottom: 25px;
+    }
+
+    .launch_platform_prompt .layui-layer-btn .layui-layer-btn0, .lwx_dialog_prompt .layui-layer-btn .layui-layer-btn0 {
+      width: 81%;
+      line-height: 32px;
+      height: 32px;
+      margin: 0;
+    }
+
+    .lwx_dialog_notice {
+      position: absolute;
+      bottom: 6px;
+      left: 20px;
+      font-size: 12px;
+      color: #999;
+    }
+
+    .lwx_dialog_prompt .select2-container, .select2-container--default .select2-selection--single {
+      width: 272px !important;
+    }
+
+    .applycbtn {
+      display: block;
+      color: #50B370;
+    }
+
+    textarea {
+      font-family: inherit;
+    }
+
+    .trunk-content {
+      margin: 0 2%;
+    }
+
+    .add-disable {
+      color: #999;
+    }
+
+    .btn-role-border {
+      border-left: 0!important;
+    }
+    .game-msg p {
+      margin-bottom: 5px;
+    }
+  </style>
+</block>
+<block name="body">
+  <?php 
+    $promoteLevel = I('promote_level', 0);
+    $isMine = I('is_mine', 0);
+    $promoteId = I('promote_id', 0);
+    $gameId = I('game_id', 0);
+    $curUri = $serverType == 2 ? 'Game/mix' : 'Game/index';
+  ?>
+  <div class="page-list normal_list apply-index-list jssearch">
+    <div class="trunk-title">
+      <div class="location">
+        <div class="location-container">当前位置：<span>游戏管理></span><span>{$position}</span></div>
+      </div>
+      <img src="__IMG__/20180207/icon_normal_game.png"><span class="title_main">游戏列表</span>
+    </div>
+    <div class="trunk-content article">
+      <div class="trunk-search clearfix">
+        <div class="tab">
+          <a class="tab-item <?php if($isMine == 0):?>current<?php endif;?>" href="{:U($curUri)}">全部游戏</a>
+          <a class="tab-item <?php if($isMine == 1):?>current<?php endif;?>" href="{:U($curUri, ['is_mine' => 1])}">我的游戏</a>
+        </div>
+
+        <div class="tab marg_top20" style="clear:both;display: flex;">
+          <div style="display: flex;">
+            <a class="inline-btn btn-role <?php if($promoteLevel==0):?>highlight<?php endif;?>"
+              href="{:U($curUri, ['is_mine' => $isMine, 'promote_level' => 0])}">
+              <p>本账号</p>
+            </a>
+
+            <if condition="$loginer['level'] eq 1">
+              <a class="inline-btn btn-role btn-role-border <?php if($promoteLevel==2):?>highlight<?php endif;?>"
+                href="{:U($curUri, ['is_mine' => $isMine, 'promote_level' => 2])}">
+                <p>部长</p>
+              </a>
+            </if>
+
+            <if condition="$loginer['level'] elt 2">
+              <a class="inline-btn btn-role btn-role-border <?php if($promoteLevel==3):?>highlight<?php endif;?>"
+                href="{:U($curUri, ['is_mine' => $isMine, 'promote_level' => 3])}">
+                <p>组长</p>
+              </a>
+            </if>
+
+            <if condition="$loginer['level'] elt 3">
+              <a class="inline-btn btn-role btn-role-border <?php if($promoteLevel==4):?>highlight<?php endif;?>"
+                href="{:U($curUri, ['is_mine' => $isMine, 'promote_level' => 4])}">
+                <p>推广员</p>
+              </a>
+            </if>
+          </div>
+        </div>
+        <input type="hidden" name="promote_level" value="<?=$promoteLevel?>">
+        <input type="hidden" name="is_mine" value="<?=$isMine?>">
+        <div class="form-group normal_space fr">
+          <input type="submit" class="submit" id='submit' url="{:U($game,array('model'=>$model['name'],'type'=>$type),false)}" value="查询">
+        </div>
+        <div class="form-group normal_space fr">
+          <select id="game_id" name="game_id" class="reselect select_gallery" style="min-width:200px;width: 175px;">
+            <option value="" selected>请选择游戏</option>
+          </select>
+        </div>
+        <div id="promote-select-wrap" class="form-group normal_space fr">
+          <select id="promote_id" name="promote_id" class="reselect select_gallery" style="min-width:200px;width: 175px;">
+            <option value="" selected>请选择渠道</option>
+          </select>
+        </div>
+
+        <div class="form-group normal_space fr" style="display: none;">
+          <input id="promote_role" name="promote_role">
+        </div>
+      </div>
+      <div class="trunk-list">
+        <div class="div_bgtab">
+          <ul class="game-ul">
+            <empty name="records">
+              <ul class="game-ul">
+                <li class="game-li" style="text-align: center;">
+                  <img src="__IMG__/20180207/icon_wushujv2.png"/>
+                  <p style="line-height: 40px;color: #A5A5A5;">
+                    <?php if($promoteLevel != 0 && $promoteId == 0):?>
+                    请选择渠道搜索
+                    <?php else:?>
+                    暂无数据
+                    <?php endif;?>
+                  </p>
+                </li>
+              </ul>
+              <else/>
+              <volist name="records" id="game">
+                <li class="game-li" data-game-id="{$game.id}">
+                  <div class="media">
+                    <div class="img-box" style="cursor: pointer;">
+                      <img src="__ROOT__{$game.icon|get_cover='path'}" />
+                    </div>
+                    <div class="game-msg" style="width: calc(92% - 90px);">
+                      <h5 class="game-title">
+                        {$game.game_name}
+                      </h5>
+                      <p><span class="game-desc">{$game.features}</span><a class="show-detail" href="javascript:;" style="margin-left: 10px;">详情</a></p>
+                      <p class="details">
+                        <span class="game-platform el-tag el-tag-plain el-tag-success el-tag-mini">平台：{:getSDKTypeName($game['sdk_version'])}</span>
+                        <span class="game-version el-tag el-tag-plain el-tag-success el-tag-mini">版本：{$game.version}</span>
+                        <span class="game-size el-tag el-tag-plain el-tag-success el-tag-mini">大小：{$game.game_size}</span>
+                        <span class="game-type el-tag el-tag-plain el-tag-success el-tag-mini">游戏类型：{$game.game_type_name}</span>
+                      </p>
+                    </div>
+                    <div class="game-operating" style="width: 500px;">
+                      <!-- <button class="el-button el-button-primary el-button-mini">游戏详情</button> -->
+                      <!-- <span class="game-link" data-type="landing-page" data-game-id="{$game.id}" style="cursor: pointer;margin-right: 10px;"><u>游戏详情</u></span> -->
+                      <?php if($isMine == 1):?>
+                      <?php if($promoteLevel == 0):?>
+                      <button class="apply-child-btn el-button el-button-success el-button-mini">添加下级游戏</button>
+                      <?php endif;?>
+                      <button class="game-link-btn el-button el-button-primary el-button-mini" data-type="download">下载链接</button>
+                      <button class="game-link-btn el-button el-button-primary el-button-mini" data-type="landing-page">落地页链接</button>
+                      <button class="offline-game-btn el-button el-button-info el-button-mini">下架</button>
+                      <!-- <span class="add-game" game-id="{$game.id}" promote-type="2" style="cursor: pointer;margin-right: 10px;"><u>添加下级游戏</u></span> -->
+                      <!-- <span class="game-link" data-type="download" data-game-id="{$game.id}" style="cursor: pointer;margin-right: 10px;"><u>复制下载链接</u></span> -->
+                      <!-- <span class="game-link" data-type="landing-page" data-game-id="{$game.id}" style="cursor: pointer;margin-right: 10px;"><u>落地页链接</u></span> -->
+                      <?php else:?>
+                        <?php if($game['offline_status'] == 0):?>
+                        <button class="el-button el-button-primary el-button-mini is-disabled">已添加</button>
+                        <!-- <span class="add-disable" style="cursor: pointer;">已添加</span> -->
+                        <?php else:?>
+                        <button class="apply-btn el-button el-button-primary el-button-mini">添加</button>
+                        <!-- <span onclick="commonApply({$game.id},this,0,10)" style="cursor: pointer;"><u>添加</u></span> -->
+                        <?php endif;?>
+                      <?php endif;?>
+                    </div>
+                  </div>
+                </li>
+              </volist>
+            </empty>
+          </ul>
+        </div>
+        <div class="pagenation clearfix">
+          {$pagination}
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div id="platform_list" style="display:none;">
+    <select>
+      <option value="">选择投放平台</option>
+      <volist name=":get_launch_platform_list(0)" id="vo">
+        <option value="{$vo.id}">{$vo.name}</option>
+      </volist>
+    </select>
+  </div>
+
+  <div class="detail-body" style="display: none;">
+    <div class="detail-box">
+      <a href="javascript:;" class="game-detail-close jq-detail-close"><i class="iconfont iconguanbi" style="font-size: 40px;"></i></a>
+      <div class="game-detail-inner">
+        <div class="detail-list">
+          <dl>
+            <dt>
+              <img src="" id="game_icon">
+            </dt>
+            <dd class="game-title" id="game_name"></dd>
+            <dd class="game-word">
+              <span><b>版本：</b><span id="version"></span></span>
+              <span><b>类型：</b><span id="game_type_name"></span></span>
+              <span><b>大小：</b><span id="game_size"></span></span>
+              <span><b>更新时间：</b><span id="create_time"></span></span>
+              <span><b>下载：</b><span id="dow_num"></span></span>
+            </dd>
+            <dd class="game-tab">
+              <i>西游</i>
+              <i>回合</i>
+              <i>回合</i>
+            </dd>
+          </dl>
+        </div>
+
+        <div class="game-detail-outer">
+          <div class="game-detail-left fl">
+            <div class="detail-con game-synopsis panel panel-bordered">
+              <div class="panel-heading"><h3 class="panel-title">游戏简介</h3></div>
+              <p id="features"></p>
+            </div>
+            <div class="detail-con game-pic panel panel-bordered">
+              <div class="panel-heading"><h3 class="panel-title">游戏截图</h3></div>
+              <div class="pic-box">
+                <div class="game-slides">
+                  <ul style="width: 2800px;" class="game-slide-li">
+
+                  </ul>
+                </div>
+                <a href="javascript:;" class="pic-prev" style="left: 10px;">
+                  <i class="iconfont iconfanhui" style="font-size: 30px;margin-left: 4px;color: #fff;"></i>
+                </a>
+                <a href="javascript:;" class="pic-next down-img" style="right: 10px;">
+                  <i class="iconfont icongengduo" style="font-size: 30px;margin-left: -7px;color: #fff;"></i>
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div class="game-window-box" id="game_link">
+    <div class="game-window-title">
+      <p style="width: calc(80% - 20px)">复制结果</p>
+      <p class="add-game-close" style="width: calc(20% - 20px);text-align: right;"><i class="iconfont iconguanbi"></i></p>
+    </div>
+
+    <div class="game-window-content" style="text-align: center;width: auto;padding-bottom: 0px;">
+      <div class="game-window-content-eveyone" style="display: block;color: #3A97FF;font-size: 1.1rem;">
+        <label style="margin-right: 20px;">下载地址:</label>
+        <span id="game_link_address" style="word-wrap: break-word;white-space: normal;"></span>
+      </div>
+    </div>
+
+    <div class="game-window-content" style="text-align: center;width: auto;padding-top: 5px;">
+      <div class="game-window-content-eveyone" style="display: block;color: #999;font-size: 1.1rem;">
+        <span id="copy_msg">复制成功,ctrl+v粘贴即可</span>
+        <button class="clipboard-btn" id="clipboard-btn" style="display: none;" data-text="">复制</button>
+      </div>
+    </div>
+
+    <div class="game-window-content" style="text-align: center;width: auto;padding-bottom: 5px;">
+      <div id="game_link_ercode" class="game-window-content-eveyone" style="display: block;color: #999;font-size: 1.1rem;">
+        <!-- <img id="game_link_ercode" style="width: 200px;height: 200px;"> -->
+      </div>
+    </div>
+
+    <div class="game-window-content" style="text-align: center;width: auto;padding-top: 5px;">
+      <div class="game-window-content-eveyone" style="display: block;color: #999;font-size: 1.1rem;">
+        <span>下载地址二维码</span>
+      </div>
+    </div>
+  </div>
+  <div class="game-window-bg"></div>
+
+  <div id="apply-child-box" class="layer-box" style="display: none;">
+    <form method="post" enctype="multipart/form-data">
+      <div class="form-group">
+        <label>添加游戏</label>
+        <div class="form-item">
+          <p class="static-input show-game-name"></p>
+        </div>
+      </div>
+      <div class="form-group">
+        <label>设备类型</label>
+        <div class="form-item">
+          <p class="static-input show-game-platform"></p>
+        </div>
+      </div>
+      <div class="form-group">
+        <label>人员类型</label>
+        <div class="form-item">
+          <label class="radio-item"><input type="radio" name="level" value="2" checked> 部门长</label>
+          <label class="radio-item"><input type="radio" name="level" value="3"> 组长</label>
+          <label class="radio-item"><input type="radio" name="level" value="4"> 组员</label>
+        </div>
+      </div>
+      <div class="form-group" class="form-group" style="display: block;">
+        <include file="Public/transfer" />
+      </div>
+      <div class="form-group">
+        <label></label>
+        <a id="batch-apply-submit" href="javascript:;" class="btn">确定</a>
+      </div>
+    </form>
+  </div>
+</block>
+<block name="script">
+  <script src="__STATIC__/zeroclipboard/jquery.zclip.min.js"></script>
+  <script type="text/javascript" src="__JS__/20170831/select2.min.js"></script>
+  <script src="__STATIC__/clipboard.min.js"></script>
+  <script type="text/javascript" src="__JS__/jquery.qrcode.min.js"></script>
+  <script src="__STATIC__/vue.js"></script>
+  <script src="__JS__/transfer.js"></script>
+
+  <script type="text/javascript">
+    var gameScreenshotCount = 0;
+
+    var curPromoteLevel = parseInt('{$promoteLevel}')
+    var curIsMine = parseInt('{$isMine}')
+    var curPromoteId = parseInt('{$promoteId}')
+    var curGameId = parseInt('{$gameId}')
+
+    $(function() {
+      $('#promote_id').select2();
+      $('#game_id').select2();
+
+      if (curPromoteLevel == 0) {
+        $('#promote-select-wrap').hide();
+      } else {
+        getPromotesByLevel(curPromoteLevel);
+        $('#promote-select-wrap').show();
+        $('#promote_id').select2();
+      }
+      getMineBaseGames();
+
+      $('.apply-btn').on({
+        click: function() {
+          var gameId = $(this).parents('li').eq(0).attr('data-game-id');
+          apply(gameId, curPromoteId, this);
+        }
+      })
+
+      $('.game-link-btn').on('click', function () {
+        var gameId = $(this).parents('li').eq(0).attr('data-game-id');
+        var type = $(this).attr('data-type')
+        getLink(type, gameId, curPromoteId, this)
+      })
+
+      $('.offline-game-btn').on({
+        click: function() {
+          var gameId = $(this).parents('li').eq(0).attr('data-game-id');
+          layer.confirm('确定要下架游戏?', {icon: 3, title:'提示'}, function(index){
+            offlineGame(gameId, curPromoteId)
+          })
+        }
+      })
+
+      $('.show-detail').on({
+        click: function() {
+          var gameId = $(this).parents('li').eq(0).attr('data-game-id');
+          viewGameDetailed(gameId)
+        }
+      })
+
+      var boxGameId = 0
+      $('[name=level]').on({
+        click: function () {
+          var box = $('#apply-child-box')
+          var level = box.find('[name=level]:checked').val()
+          getUnApplyPromotes({game_id: boxGameId, level: level}, function (response) {
+            var list = new Array()
+            for (var i in response.data.promotes) {
+              var promote = response.data.promotes[i]
+              list.push({id: promote.id, name: promote.account + '(' + promote.real_name + ')', type:false, isSearch:true, number:6})
+            }
+            vm.initList = list
+            vm.targetList = []
+          })
+        }
+      })
+
+      $('.apply-child-btn').on({
+        click: function() {
+          var box = $('#apply-child-box')
+          var liTag = $(this).parents('li').eq(0);
+          boxGameId = liTag.attr('data-game-id');
+          box.find('.show-game-name').html(liTag.find('.game-title').html())
+          box.find('.show-game-platform').html(liTag.find('.game-platform').html())
+          var level = box.find('[name=level]:checked').val()
+
+          getUnApplyPromotes({game_id: boxGameId, level: level}, function (response) {
+            vm.init()
+            vm.leftTitle = '未添加人员'
+            vm.rightTitle = '选中人员'
+            var list = new Array()
+            for (var i in response.data.promotes) {
+              var promote = response.data.promotes[i]
+              list.push({id: promote.id, name: promote.account + '(' + promote.real_name + ')', type:false, isSearch:true, number:6})
+            }
+            vm.initList = list
+            vm.targetList = []
+          })
+          layer.open({
+            title: '添加下级游戏',
+            type: 1,
+            content: box,
+            area: ['600px', '650px'],
+            zIndex: 250,
+          })
+        }
+      })
+
+      $('#batch-apply-submit').on({
+        click: function() {
+          promoteIds = vm.getTargetIds()
+          if (promoteIds.length == 0) {
+            return layer.msg('请选择要添加该游戏的人员')
+          }
+          batchApplyGame(boxGameId, promoteIds)
+        }
+      })
+
+      $('.add-game-close').on('click', function () {
+        $(this).parent().parent('.game-window-box').hide();
+        $('.game-window-bg').hide();
+      });
+
+      highlight_subnav('{:U($curUri)}');
+    })
+
+    function apply(gameId, promoteId, obj) {
+      $.ajax({
+        type: 'post',
+        url: '{:U("apply")}',
+        dataType: 'json',
+        data: { game_id: gameId, promote_id: promoteId },
+        success: function (response) {
+          if (response.status) {
+            disableApplyBtn(obj)
+            layer.msg(response.message, {icon: 1, time: 1500});
+          } else {
+            layer.msg(response.message, {icon: 2, time: 1500});
+          }
+        },
+        error: function () {
+            layer.msg('服务器故障', {icon: 5});
+            that.removeClass('no_submit');
+        }
+      })
+    }
+
+    function disableApplyBtn(obj) {
+      $(obj).removeClass('apply-btn');
+      $(obj).addClass('is-disabled');
+      $(obj).html('已添加');
+      $(obj).off('click')
+    }
+
+    function batchApply(gameId, promoteIds) {
+      $.ajax({
+        type: 'post',
+        url: '{:U("batchApply")}',
+        dataType: 'json',
+        data: { game_id: gameId, promote_ids: promoteIds },
+        success: function (response) {
+            if (response.status) {
+                layer.msg(response.message, {icon: 1, time: 1500});
+            } else {
+                layer.msg(response.message, {icon: 2, time: 1500});
+            }
+        },
+        error: function () {
+            layer.msg('服务器故障', {icon: 5});
+            that.removeClass('no_submit');
+        }
+      })
+    }
+
+    function getUnApplyPromotes(data, successCallback) {
+      $.ajax({
+        url: "{:U('Game/getUnApplyPromotes')}",
+        data: data,
+        type: 'post',
+        dataType: 'json',
+        success: function(response) {
+          successCallback(response)
+        }
+      })
+    }
+
+    function getLink(type, gameId, promoteId, obj) {
+      var url = '';
+      if (type == 'download') {
+        url = "__URL__/getDownloadUrl";
+      } else if (type == 'landing-page') {
+        url = "__URL__/getLandingPageUrl";
+      }
+      $.ajax({
+        url: url,
+        type: 'post',
+        dataType: "json",
+        data: {game_id: gameId, promote_id: promoteId},
+        success: function (response) {
+          if (response.status == 1) {
+            var logo = getGameLogo(obj)
+            drawQrcode(response.data.url, logo)
+            showLinkDialog(response.data.url)
+          } else {
+            layer.alert(response.message, {icon: 7});
+          }
+        },
+        error: function (result) {
+          layer.msg('网络异常', {icon: 5});
+        }
+      });
+    }
+
+    function isImg(src) {
+      var img = new Image();
+      img.src = src;
+      if (img.width > 0 || img.height > 0) {
+        return  true;
+      }
+      return false;
+    }
+
+    function getGameLogo(obj) {
+      var logo = null;
+      var logoSrc = $(obj).parents('.game-li').eq(0).find('.img-box').children('img').attr('src');
+      if (isImg(logoSrc)) {
+        logo = $(obj).parents('.game-li').eq(0).find('.img-box').children('img')[0]
+      } else {
+        var img = document.createElement('img');
+        img.src = '__IMG__/game_icon.png';
+        logo = img;
+      }
+      return logo;
+    }
+
+    function offlineGame(gameId, promoteId) {
+      $.ajax({
+        url: "{:U('Game/offline')}",
+        data: { game_id: gameId, promote_id: promoteId },
+        type: 'post',
+        dataType: 'json',
+        success: function(response) {
+          layer.msg(response.msg, {time: 1000}, function() {
+          window.location.href = window.location.href
+          })
+        }
+      })
+    }
+
+    function drawQrcode(url, logo) {
+      var qrcodeWidth = 200
+      var qrcodeHeight = 200
+      var logoWidth  = qrcodeWidth/4                                                           
+      var logoHeight  = qrcodeHeight/4
+      var options = {
+        render: 'canvas',
+        ecLevel: 'H',//识别度
+        fill: '#000',//二维码颜色
+        background: '#ffffff',//背景颜色
+        quiet: 2,//边距
+        width: 200,//宽度
+        height: 200,
+        text: url,//二维码内容
+        label: 'jQuery.qrcode',
+        fontname: 'Ubuntu',
+        fontcolor: '#ff9818',
+      };
+      $('#game_link_ercode').empty().qrcode(options);
+      $("#game_link_ercode canvas")[0].getContext('2d').drawImage(logo, (qrcodeWidth - logoWidth) / 2, (qrcodeHeight - logoHeight) / 2, logoWidth, logoHeight);
+    }
+
+    function showLinkDialog(url) {
+      $('#clipboard-btn').attr('data-text', url)
+      $('#clipboard-btn').click()
+
+      $('#game_link_address').text(url);
+      $('#game_link').show();
+      $('.game-window-bg').show();
+    }
+
+    function batchApplyGame(gameId, promoteIds, successCallback) {
+      $.ajax({
+        url: "{:U('Game/batchApply')}",
+        data: { game_id: gameId, promote_ids: promoteIds },
+        type: 'post',
+        dataType: 'json',
+        success: function(response) {
+          successCallback(response)
+        }
+      })
+    }
+
+    function getMineBaseGames() {
+      $.ajax({
+        type: 'get',
+        url: "{:U('Game/getMineBaseGames')}",
+        dataType: "json",
+        success: function (response) {
+          var games = response.data.games;
+          var html = '<option value="">请选择游戏</option>';
+          if (games.length > 0) {
+            $.each(promotes, function (index, item) {
+              var selected = ''
+              if (curGameId == item.id) {
+                selected = 'selected'
+              }
+              html += '<option value="' + item.id + '" title="' + item.name + '"' + selected + '>';
+              html += promoteTitle;
+              html += '</option>';
+            });
+          }
+          $('#game_id').html(html);
+          $('#game_id').select2();
+        },
+        error: function (result) {
+            layer.msg('网络异常', {icon: 5});
+        }
+      });
+    }
+
+    function getPromotesByLevel(level) {
+      $.ajax({
+        type: 'get',
+        url: "{:U('Promote/getSubPromotes')}",
+        dataType: "json",
+        data: {'level': level},
+        success: function (response) {
+          var promotes = response.data.promotes;
+          var html = '<option value="">请选择渠道</option>';
+          if (promotes.length > 0) {
+            $.each(promotes, function (index, item) {
+              var promoteTitle = item['account'] + '(' + item['real_name'] + ')';
+              var selected = ''
+              if (curPromoteId == item.id) {
+                selected = 'selected'
+              }
+              html += '<option value="' + item['id'] + '" title="' + promoteTitle + '"' + selected + '>';
+              html += promoteTitle;
+              html += '</option>';
+            });
+          }
+          $('#promote_id').empty();
+          $('#promote_id').html(html);
+          $('#promote_id').select2();
+        },
+        error: function (result) {
+            layer.msg('网络异常', {icon: 5});
+        }
+      });
+    }
+
+    //查看游戏详情
+    function viewGameDetailed(id) {
+        $.ajax({
+            type: "post",
+            url: "__URL__/getDetail",
+            dataType: "json",
+            data: {'id': id},
+            success: function (data) {
+                $('#game_icon').attr('src', data.icon ? data.icon : '');
+                $('#game_name').text(data.game_name ? data.game_name : '');
+                $('#version').text(data.version ? data.version : '无');
+                $('#game_type_name').text(data.game_type_name ? data.game_type_name : '无');
+                $('#game_size').text(data.game_size ? data.game_size : 0);
+                $('#create_time').text(data.create_time ? data.create_time : '无');
+                $('#dow_num').text(data.dow_num ? data.dow_num : 0);
+                $('#features').text(data.features ? data.features : '无');
+
+                gameScreenshotCount = data.screenshot.length; //游戏截图数量
+
+                if (gameScreenshotCount > 0) {
+                    var html = '';
+                    $.each(data.screenshot_url, function (index, item) {
+                        html += '<li>';
+                        html += '<img src="' + item + '">';
+                        html += '</li>';
+                    });
+
+                    $('.game-slide-li').html(html);
+                    $('.game-slide-li').css('left', '0px');
+                }
+
+                $('.detail-body').show();
+            },
+            error: function (result) {
+                layer.msg('网络异常', {icon: 5});
+            }
+        });
+    }
+
+    $('.game-detail-close').on('click', function () {
+        $('.detail-body').hide();
+    });
+
+    $('.pic-prev').on('click', function () {
+        var element = $('.game-slides').children('ul');
+        var oldLeft = element.position().left;
+        var newLeft = oldLeft + 280;
+
+        if (newLeft <= 0 && newLeft % 1 === 0) {
+            element.css('left', newLeft);
+        }
+    });
+
+    $('.pic-next').on('click', function () {
+        var element = $('.game-slides').children('ul');
+        var oldLeft = element.position().left;
+        var newLeft = oldLeft - 280;
+        var minLeft = -(gameScreenshotCount * 280 -560);
+
+        if (newLeft >= minLeft && newLeft % 1 === 0) {
+            element.css('left', newLeft);
+        }
+    });
+
+    $('.pack-inner').hover(function () {
+        var element = $(this);
+
+        $('.pack-inner').children('.pack-word').hide();
+        element.children('.pack-word').show();
+    });
+
+    $('#submit').click(function () {
+      var url = $(this).attr('url');
+      console.log(url);
+      var query = $('.jssearch').find('input').serialize();
+      query += "&" + $('.jssearch').find('select').serialize();
+      query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g, '');
+      query = query.replace(/^&/g, '');
+      if (url.indexOf('?') > 0) {
+          url += '&' + query;
+      } else {
+          url += '?' + query;
+      }
+      window.location.href = url;
+    });
+  </script>
+</block>
diff --git a/Application/Home/View/default/Promote/children.html b/Application/Home/View/default/Promote/children.html
index 25894b64b..951a786e5 100644
--- a/Application/Home/View/default/Promote/children.html
+++ b/Application/Home/View/default/Promote/children.html
@@ -282,6 +282,7 @@ $(function(){
     click: function () {
       if ($(this).val() == 2) {
         $('#shift-transfer').show()
+        $('#shift-transfer').css({display: 'block'})
       } else {
         $('#shift-transfer').hide()
       }
@@ -458,7 +459,7 @@ $(function(){
         title: shiftTypeName,
         type: 1,
         content: box,
-        area: ['600px', '600px'],
+        area: ['600px', '650px'],
         zIndex: 250,
       })
     }
diff --git a/Application/Home/View/default/Public/bases.html b/Application/Home/View/default/Public/bases.html
index 7270884b5..31b92fb10 100644
--- a/Application/Home/View/default/Public/bases.html
+++ b/Application/Home/View/default/Public/bases.html
@@ -40,39 +40,41 @@
 
 </head>
 <body>
-<div class="header">
-  <div class="inner clearfix">
-    <div class="logo">
-      <if condition="CONTROLLER_NAME eq 'Cline' ">
-        <a href="https://www.vlcms.com/" target="_blank">
-								<span class="placeholder-graphic placeholder-graphic_logo" style="background:transparent;">
-                  <img src="{:check_logo_is_exist(C('CH_SET_LOGO'),'logo_default.png')}" alt="logo">
-								</span>
-        </a>
-        <else/>
-        <a href="{:U('index/index')}">
-								<span class="placeholder-graphic placeholder-graphic_logo" style="background:transparent;">
-                  <img src="{:check_logo_is_exist(C('CH_SET_LOGO'),'logo_default.png')}" alt="logo">
-								</span>
-        </a>
-      </if>
-      <i></i>
-      <span class="text"><span>手游推广</span><span>联盟中心</span></span>
+<div id="app">
+  <div class="header">
+    <div class="inner clearfix">
+      <div class="logo">
+        <if condition="CONTROLLER_NAME eq 'Cline' ">
+          <a href="https://www.vlcms.com/" target="_blank">
+                  <span class="placeholder-graphic placeholder-graphic_logo" style="background:transparent;">
+                    <img src="{:check_logo_is_exist(C('CH_SET_LOGO'),'logo_default.png')}" alt="logo">
+                  </span>
+          </a>
+          <else/>
+          <a href="{:U('index/index')}">
+                  <span class="placeholder-graphic placeholder-graphic_logo" style="background:transparent;">
+                    <img src="{:check_logo_is_exist(C('CH_SET_LOGO'),'logo_default.png')}" alt="logo">
+                  </span>
+          </a>
+        </if>
+        <i></i>
+        <span class="text"><span>手游推广</span><span>联盟中心</span></span>
+      </div>
+      <ul class="nav clearfix">
+        <think:nav name="nav">
+          <eq name="nav.pid" value="0">
+            <li>
+              <a href="{$nav.url|get_nav_url}" target="<eq name='nav.target' value='1'>_blank<else/>_self</eq>"><span>{$nav.title}</span></a>
+            </li>
+          </eq>
+        </think:nav>
+      </ul>
     </div>
-    <ul class="nav clearfix">
-      <think:nav name="nav">
-        <eq name="nav.pid" value="0">
-          <li>
-            <a href="{$nav.url|get_nav_url}" target="<eq name='nav.target' value='1'>_blank<else/>_self</eq>"><span>{$nav.title}</span></a>
-          </li>
-        </eq>
-      </think:nav>
-    </ul>
   </div>
-</div>
 
-<div class="trunk">
-  <block name="body"></block>
+  <div class="trunk">
+    <block name="body"></block>
+  </div>
 </div>
 
 <!-- <div class="footer">
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index 287c3590e..bf65b13a5 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -28,171 +28,171 @@
 </head>
 
 <body>
-
+<div id="app">
 <!--左侧导航栏 开始-->
-<div class="nav_new fl">
-	<div class="logo_picture">
-		<img src="{:check_logo_is_exist(C('CH_LOGO_BACKSTAGE'),'logo_default.png')}" style="height:40px;margin:0px;">
-	</div>
-	<div class="subNavBox">
-		<a href="{:U('Promote/index')}" class="subNav <if condition='CONTROLLER_NAME eq Promote and ACTION_NAME eq index '>active</if>"> 后台首页 </a>
-		<?php if ($loginer['level'] < 4) :?>
-		<div class="subNav jssubNav"><i class="prev_icon icon_guanli"></i><span>管理中心</span><i class="arrow_icon"></i></div>
-		<div class="navContent jsnavContent">
-			<!--				<a href="{:U('Promote/base_info')}" class="<if condition='CONTROLLER_NAME eq Promote and ACTION_NAME eq base_info '>active</if> ">账户信息</a>-->
-			<?php if (in_array($loginer['level'], [1])):?>
-			<a href="{:U('Promote/children', ['promote_type' => 0])}" class="<if condition='$_GET["promote_type"]==0 and CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">部门长管理</a>
-			<?php endif;?>
-			<?php if (in_array($loginer['level'], [1, 2])):?>
-			<a href="{:U('Promote/children', ['promote_type' => 1])}" class="<if condition='$_GET["promote_type"]==1 and CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">组长管理</a>
-			<?php endif;?>
-			<?php if (in_array($loginer['level'], [1, 2, 3])):?>
-			<a href="{:U('Promote/children', ['promote_type' => 2])}" class="<if condition='$_GET["promote_type"]==2 and CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
-			<?php endif;?>
+	<div class="nav_new fl">
+		<div class="logo_picture">
+			<img src="{:check_logo_is_exist(C('CH_LOGO_BACKSTAGE'),'logo_default.png')}" style="height:40px;margin:0px;">
 		</div>
-		<?php endif;?>
-		<?php
-			$isOpenQuery = true;
-		?>
-		<?php if($isOpenQuery):?>
-		<div class="subNav jssubNav"><i class="prev_icon icon_shujvi"></i><span>数据管理</span><i class="arrow_icon"></i></div>
-		<div class="navContent jsnavContent">
-			<a href="{:U('Query/dailySummary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq dailySummary '>active</if> ">每日概况</a>
-			<a href="{:U('Query/summary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq summary '>active</if> ">数据汇总</a>
-			<?php if($canViewUserRecharge):?>
-			<a href="{:U('Query/recharge')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq recharge or ACTION_NAME eq viewSpendDetailed) '>active</if> ">订单查询</a>
-			<?php endif;?>
-			<a href="{:U('Query/register')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq register or ACTION_NAME eq viewRole) '>active</if> ">注册明细</a>
-			<?php if($canViewUserRecharge):?>
-			<a href="{:U('Query/arpu')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq arpu '>active</if> ">ARPU统计</a>
+		<div class="subNavBox">
+			<a href="{:U('Promote/index')}" class="subNav <if condition='CONTROLLER_NAME eq Promote and ACTION_NAME eq index '>active</if>"> 后台首页 </a>
+			<?php if ($loginer['level'] < 4) :?>
+			<div class="subNav jssubNav"><i class="prev_icon icon_guanli"></i><span>管理中心</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<!--				<a href="{:U('Promote/base_info')}" class="<if condition='CONTROLLER_NAME eq Promote and ACTION_NAME eq base_info '>active</if> ">账户信息</a>-->
+				<?php if (in_array($loginer['level'], [1])):?>
+				<a href="{:U('Promote/children', ['promote_type' => 0])}" class="<if condition='$_GET["promote_type"]==0 and CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">部门长管理</a>
+				<?php endif;?>
+				<?php if (in_array($loginer['level'], [1, 2])):?>
+				<a href="{:U('Promote/children', ['promote_type' => 1])}" class="<if condition='$_GET["promote_type"]==1 and CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">组长管理</a>
+				<?php endif;?>
+				<?php if (in_array($loginer['level'], [1, 2, 3])):?>
+				<a href="{:U('Promote/children', ['promote_type' => 2])}" class="<if condition='$_GET["promote_type"]==2 and CONTROLLER_NAME eq Promote and (ACTION_NAME eq children or ACTION_NAME eq addPromote or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
+				<?php endif;?>
+			</div>
 			<?php endif;?>
-			<!-- <a href="{:U('Query/retention_analysis')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq retention_analysis '>active</if> ">留存统计</a> -->
-			<a href="{:U('Query/userRoles')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRoles '>active</if> ">角色查询</a>
-			<?php if($canViewUserRecharge):?>
-			<a href="{:U('Query/userRecharges')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRecharges '>active</if> ">充值玩家</a>
+			<?php
+				$isOpenQuery = true;
+			?>
+			<?php if($isOpenQuery):?>
+			<div class="subNav jssubNav"><i class="prev_icon icon_shujvi"></i><span>数据管理</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<a href="{:U('Query/dailySummary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq dailySummary '>active</if> ">每日概况</a>
+				<a href="{:U('Query/summary')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq summary '>active</if> ">数据汇总</a>
+				<?php if($canViewUserRecharge):?>
+				<a href="{:U('Query/recharge')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq recharge or ACTION_NAME eq viewSpendDetailed) '>active</if> ">订单查询</a>
+				<?php endif;?>
+				<a href="{:U('Query/register')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq register or ACTION_NAME eq viewRole) '>active</if> ">注册明细</a>
+				<?php if($canViewUserRecharge):?>
+				<a href="{:U('Query/arpu')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq arpu '>active</if> ">ARPU统计</a>
+				<?php endif;?>
+				<!-- <a href="{:U('Query/retention_analysis')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq retention_analysis '>active</if> ">留存统计</a> -->
+				<a href="{:U('Query/userRoles')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRoles '>active</if> ">角色查询</a>
+				<?php if($canViewUserRecharge):?>
+				<a href="{:U('Query/userRecharges')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq userRecharges '>active</if> ">充值玩家</a>
+				<?php endif;?>
+				<a href="{:U('Query/achievement')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq achievement '>active</if> ">团队/推广员业绩</a>
+				<a href="{:U('Query/promoteQuota')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq promoteQuota or ACTION_NAME eq quotaDtl) '>active</if> ">推广员指标</a>
+			</div>
+
 			<?php endif;?>
-			<a href="{:U('Query/achievement')}" class="<if condition='CONTROLLER_NAME eq Query and ACTION_NAME eq achievement '>active</if> ">团队/推广员业绩</a>
-			<a href="{:U('Query/promoteQuota')}" class="<if condition='CONTROLLER_NAME eq Query and (ACTION_NAME eq promoteQuota or ACTION_NAME eq quotaDtl) '>active</if> ">推广员指标</a>
-		</div>
+			<?php if ($canViewUserRecharge && $loginer['level'] == 1) :?>
+			<div class="subNav jssubNav"><i class="prev_icon icon_caiwu"></i><span>财务管理</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<a href="{:U('Finance/index')}" class="<if condition='CONTROLLER_NAME eq Finance and ACTION_NAME eq index '>active</if> ">结算中心</a>
+				<a href="{:U('Finance/settlementDtl')}" class="<if condition='CONTROLLER_NAME eq Finance and ACTION_NAME eq settlementDtl '>active</if> ">结算明细</a>
+				<a href="{:U('Finance/withdrawRecord')}" class="<if condition='CONTROLLER_NAME eq Finance and (ACTION_NAME eq withdrawRecord or ACTION_NAME eq withdrawDtl or ACTION_NAME eq settlementOrder) '>active</if> ">提现记录</a>
+			</div>
+			<?php endif ;?>
+			<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>游戏管理</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<!--							<a href="{:U('Apply/app_index')}" class="<if condition='CONTROLLER_NAME eq Apply and ACTION_NAME eq app_index '>active</if> ">APP列表</a>-->
+				<a href="{:U('Game/index')}" class="<if condition='CONTROLLER_NAME eq Game and (ACTION_NAME eq index) '>active</if> ">专服管理</a>
 
-		<?php endif;?>
-		<?php if ($canViewUserRecharge && $loginer['level'] == 1) :?>
-		<div class="subNav jssubNav"><i class="prev_icon icon_caiwu"></i><span>财务管理</span><i class="arrow_icon"></i></div>
+				<?php if($isOpenQuery):?>
+				<a href="{:U('Game/mix')}" class="<if condition='CONTROLLER_NAME eq Game and (ACTION_NAME eq mix) '>active</if> ">混服管理</a>
+				<if condition="getParentPromoteId(PID) eq 0">
+					<a href="{:U('GameDivide/index')}" class="<if condition='CONTROLLER_NAME eq GameDivide and (ACTION_NAME eq index ) '>active</if> ">分成比例</a>
+					<a href="{:U('Promote/setChildGamePermission')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq setChildGamePermission ) '>active</if> ">设置</a>
+				</if>
+				<a href="{:U('Apply/feature')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq feature or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">资料专区</a>
+				<?php endif;?>
+			</div>
+			<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>安全管理</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<!--							<a href="{:U('Apply/app_index')}" class="<if condition='CONTROLLER_NAME eq Apply and ACTION_NAME eq app_index '>active</if> ">APP列表</a>-->
+				<a href="{:U('Download/listsIndex')}" class="<if condition='CONTROLLER_NAME eq Download and (ACTION_NAME eq listsIndex or ACTION_NAME eq listsIndex or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">下载日志管理</a>
+				<a href="{:U('Safe/modifyloginpassword')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq modifyloginpassword or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">修改登录密码</a>
+				<a href="{:U('Safe/setSafeIndex')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq setSafeIndex or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">设置安全密码</a>
+				<?php if ($loginer['level'] == 1) :?>
+				<a href="{:U('Safe/modifyBaseInfo')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq modifyBaseInfo or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">用户基本信息</a>
+				<?php endif;?>
+				<a href="{:U('Safe/promoteLogs')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq promoteLogs or ACTION_NAME eq promoteLogs or ACTION_NAME eq promoteLogs or ACTION_NAME eq promoteLogs ) '>active</if> ">操作日志</a>
+			</div>
+			<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>测试资源</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<a href="{:U('TestResource/index')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">测试资源申请</a>
+				<a href="{:U('TestResource/lists')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq lists '>active</if> ">测试资源申请记录</a>
+				<a href="{:U('TestResource/supportNumberList')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq supportNumberList or ACTION_NAME eq freezeSupport or ACTION_NAME eq unfreezeSupport or ACTION_NAME eq rechangePassward ) '>active</if> ">测试号管理</a>
+				<a href="{:U('TestResource/protectLogList')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq protectLogList '>active</if> ">日志管理</a>
+			</div>
+			<!--<eq name="parent_id" value="0">
+		<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>扶持管理</span><i class="arrow_icon"></i></div>
 		<div class="navContent jsnavContent">
-			<a href="{:U('Finance/index')}" class="<if condition='CONTROLLER_NAME eq Finance and ACTION_NAME eq index '>active</if> ">结算中心</a>
-			<a href="{:U('Finance/settlementDtl')}" class="<if condition='CONTROLLER_NAME eq Finance and ACTION_NAME eq settlementDtl '>active</if> ">结算明细</a>
-			<a href="{:U('Finance/withdrawRecord')}" class="<if condition='CONTROLLER_NAME eq Finance and (ACTION_NAME eq withdrawRecord or ACTION_NAME eq withdrawDtl or ACTION_NAME eq settlementOrder) '>active</if> ">提现记录</a>
+		<a href="{:U('Support/index')}" class="<if condition='CONTROLLER_NAME eq Support and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">扶持申请</a>
+		<a href="{:U('Support/lists')}" class="<if condition='CONTROLLER_NAME eq Support and ACTION_NAME eq lists '>active</if> ">扶持记录</a>
+		<a href="{:U('Support/quota')}" class="<if condition='CONTROLLER_NAME eq Support and ACTION_NAME eq quota '>active</if> ">扶持额度</a>
 		</div>
-		<?php endif ;?>
-		<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>游戏管理</span><i class="arrow_icon"></i></div>
-		<div class="navContent jsnavContent">
-			<!--							<a href="{:U('Apply/app_index')}" class="<if condition='CONTROLLER_NAME eq Apply and ACTION_NAME eq app_index '>active</if> ">APP列表</a>-->
-			<a href="{:U('Apply/gameSpecialList')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq gameSpecialList or ACTION_NAME eq specialMyGameList ) '>active</if> ">专服管理</a>
+		</eq>-->
 
-			<?php if($isOpenQuery):?>
-			<a href="{:U('Apply/gameList')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq gameList or ACTION_NAME eq myGameList ) '>active</if> ">混服管理</a>
-			<if condition="getParentPromoteId(PID) eq 0">
-				<a href="{:U('GameDivide/index')}" class="<if condition='CONTROLLER_NAME eq GameDivide and (ACTION_NAME eq index ) '>active</if> ">分成比例</a>
-				<a href="{:U('Promote/setChildGamePermission')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq setChildGamePermission ) '>active</if> ">设置</a>
-			</if>
-			<a href="{:U('Apply/feature')}" class="<if condition='CONTROLLER_NAME eq Apply and (ACTION_NAME eq feature or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">资料专区</a>
-			<?php endif;?>
-		</div>
-		<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>安全管理</span><i class="arrow_icon"></i></div>
-		<div class="navContent jsnavContent">
-			<!--							<a href="{:U('Apply/app_index')}" class="<if condition='CONTROLLER_NAME eq Apply and ACTION_NAME eq app_index '>active</if> ">APP列表</a>-->
-			<a href="{:U('Download/listsIndex')}" class="<if condition='CONTROLLER_NAME eq Download and (ACTION_NAME eq listsIndex or ACTION_NAME eq listsIndex or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">下载日志管理</a>
-			<a href="{:U('Safe/modifyloginpassword')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq modifyloginpassword or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">修改登录密码</a>
-			<a href="{:U('Safe/setSafeIndex')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq setSafeIndex or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">设置安全密码</a>
-			<?php if ($loginer['level'] == 1) :?>
-			<a href="{:U('Safe/modifyBaseInfo')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq modifyBaseInfo or ACTION_NAME eq my_game or ACTION_NAME eq my_game_ch or ACTION_NAME eq child_game ) '>active</if> ">用户基本信息</a>
-			<?php endif;?>
-			<a href="{:U('Safe/promoteLogs')}" class="<if condition='CONTROLLER_NAME eq Safe and (ACTION_NAME eq promoteLogs or ACTION_NAME eq promoteLogs or ACTION_NAME eq promoteLogs or ACTION_NAME eq promoteLogs ) '>active</if> ">操作日志</a>
-		</div>
-		<div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>测试资源</span><i class="arrow_icon"></i></div>
-		<div class="navContent jsnavContent">
-			<a href="{:U('TestResource/index')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">测试资源申请</a>
-			<a href="{:U('TestResource/lists')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq lists '>active</if> ">测试资源申请记录</a>
-			<a href="{:U('TestResource/supportNumberList')}" class="<if condition='CONTROLLER_NAME eq TestResource and (ACTION_NAME eq supportNumberList or ACTION_NAME eq freezeSupport or ACTION_NAME eq unfreezeSupport or ACTION_NAME eq rechangePassward ) '>active</if> ">测试号管理</a>
-			<a href="{:U('TestResource/protectLogList')}" class="<if condition='CONTROLLER_NAME eq TestResource and ACTION_NAME eq protectLogList '>active</if> ">日志管理</a>
-		</div>
-		<!--<eq name="parent_id" value="0">
-    <div class="subNav jssubNav"><i class="prev_icon icon_fenbao"></i><span>扶持管理</span><i class="arrow_icon"></i></div>
-    <div class="navContent jsnavContent">
-      <a href="{:U('Support/index')}" class="<if condition='CONTROLLER_NAME eq Support and (ACTION_NAME eq index or ACTION_NAME eq add or ACTION_NAME eq apply ) '>active</if> ">扶持申请</a>
-      <a href="{:U('Support/lists')}" class="<if condition='CONTROLLER_NAME eq Support and ACTION_NAME eq lists '>active</if> ">扶持记录</a>
-      <a href="{:U('Support/quota')}" class="<if condition='CONTROLLER_NAME eq Support and ACTION_NAME eq quota '>active</if> ">扶持额度</a>
-    </div>
-    </eq>-->
+			<!--<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>会长福利</span><i class="arrow_icon"></i></div>-->
+			<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>平台币管理</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<a href="{:U('PromoteCoin/myCoin')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq myCoin or ACTION_NAME eq coinRecord or ACTION_NAME eq coinRecordDesc) '>active</if> ">我的平台币</a>
+				<a href="{:U('PromoteCoin/transferLogs')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq shift or ACTION_NAME eq transferLogs) '>active</if> ">平台币转移</a>
+				<?php if($loginer['level'] == 1):?>
+				<a href="{:U('CoinOrder/order_list')}" class="<if condition='CONTROLLER_NAME eq CoinOrder and (ACTION_NAME eq order_list or ACTION_NAME eq order_add or ACTION_NAME eq order_detail) '>active</if> ">平台币充值</a>
+				<?php endif;?>
+			</div>
 
-		<!--<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>会长福利</span><i class="arrow_icon"></i></div>-->
-		<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>平台币管理</span><i class="arrow_icon"></i></div>
-		<div class="navContent jsnavContent">
-			<a href="{:U('PromoteCoin/myCoin')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq myCoin or ACTION_NAME eq coinRecord or ACTION_NAME eq coinRecordDesc) '>active</if> ">我的平台币</a>
-			<a href="{:U('PromoteCoin/transferLogs')}" class="<if condition='CONTROLLER_NAME eq PromoteCoin and (ACTION_NAME eq shift or ACTION_NAME eq transferLogs) '>active</if> ">平台币转移</a>
-			<?php if($loginer['level'] == 1):?>
-			<a href="{:U('CoinOrder/order_list')}" class="<if condition='CONTROLLER_NAME eq CoinOrder and (ACTION_NAME eq order_list or ACTION_NAME eq order_add or ACTION_NAME eq order_detail) '>active</if> ">平台币充值</a>
+			<?php if($canViewUserRecharge):?>
+			<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>玩家管理</span><i class="arrow_icon"></i></div>
+			<div class="navContent jsnavContent">
+				<a href="{:U('Players/playAction')}" class="<if condition='CONTROLLER_NAME eq Players and (ACTION_NAME eq playAction)'>active</if> ">行为日志</a>
+			</div>
 			<?php endif;?>
 		</div>
-
-		<?php if($canViewUserRecharge):?>
-		<div class="subNav jssubNav"><i class="prev_icon icon_fuli"></i><span>玩家管理</span><i class="arrow_icon"></i></div>
-		<div class="navContent jsnavContent">
-			<a href="{:U('Players/playAction')}" class="<if condition='CONTROLLER_NAME eq Players and (ACTION_NAME eq playAction)'>active</if> ">行为日志</a>
-		</div>
-		<?php endif;?>
 	</div>
-</div>
 
-<div class="trunk">
-	<div class="trunk_con">
-		<!--头部个人信息-->
-		<div class="header">
-			<if condition="$loginer['level'] eq 1 and $loginer['company_belong'] eq 1">
-				<div style="position: absolute;padding-left: 1.5%;">
-					<span class="pinfo" style="color: #1239f2">市场总监联系方式：<span>13637338237(李总监)</span></span>
+	<div class="trunk">
+		<div class="trunk_con">
+			<!--头部个人信息-->
+			<div class="header">
+				<if condition="$loginer['level'] eq 1 and $loginer['company_belong'] eq 1">
+					<div style="position: absolute;padding-left: 1.5%;">
+						<span class="pinfo" style="color: #1239f2">市场总监联系方式：<span>13637338237(李总监)</span></span>
+					</div>
+				</if>
+				<div class="header-right">
+					<span class="pinfo jstime">今天是：<span></span></span>
+					<span class="pinfo">您好！{:session('promote_auth.account')}</span>
+					<a class="pinfo" href="{:U('Index/logout')}" ><img src="__IMG__/20180207/icon_normal_tuichu.png"><!--{:L('Quit')}--></a>
 				</div>
-			</if>
-			<div class="header-right">
-				<span class="pinfo jstime">今天是：<span></span></span>
-				<span class="pinfo">您好！{:session('promote_auth.account')}</span>
-				<a class="pinfo" href="{:U('Index/logout')}" ><img src="__IMG__/20180207/icon_normal_tuichu.png"><!--{:L('Quit')}--></a>
 			</div>
-		</div>
-		<!--结束 头部个人信息-->
-		<div class="trunk-container">
-			<!--右侧内容 开始-->
-			<div class="right_container">
-				<div class="location">
-					<block name="location"></block>
+			<!--结束 头部个人信息-->
+			<div class="trunk-container">
+				<!--右侧内容 开始-->
+				<div class="right_container">
+					<div class="location">
+						<block name="location"></block>
+					</div>
+					<block name="body"> </block>
 				</div>
-				<block name="body"> </block>
 			</div>
+			<!--底部信息-->
+			<!--  <div class="footer">
+			<div class="inner" >
+			<p class="customerService" style="margin-top:.8%;">
+				<span>客服电话：{:C("CH_SET_SERVER_TEL")}</span>
+				<span>客服邮箱：{:C("CH_SET_SERVER_EMAIL")}</span>
+				<span>服务时间：{:C("CH_TIME")}</span>
+			</p>
+			<p class="copyright"><span>网络备案：{:C('CH_SET_FOR_THE_RECORD')}</span><span>网络文化经营许可证编号：{:C(CH_SET_LICENSE)}</span><span>版权所有：{:C('CH_SET_COPYRIGHT')}</span></p>
+			</div>
+		</div>--><!--  <div class="footer">
+				<div class="inner" >
+					<p class="customerService" style="margin-top:.8%;">
+					<span>客服电话：{:C("CH_SET_SERVER_TEL")}</span>
+					<span>客服邮箱：{:C("CH_SET_SERVER_EMAIL")}</span>
+					<span>服务时间：{:C("CH_TIME")}</span>
+					</p>
+					<p class="copyright"><span>网络备案：{:C('CH_SET_FOR_THE_RECORD')}</span><span>网络文化经营许可证编号：{:C(CH_SET_LICENSE)}</span><span>版权所有：{:C('CH_SET_COPYRIGHT')}</span></p>
+				</div>
+				</div>-->
+			<!--结束 底部信息-->
 		</div>
-		<!--底部信息-->
-		<!--  <div class="footer">
-        <div class="inner" >
-          <p class="customerService" style="margin-top:.8%;">
-            <span>客服电话：{:C("CH_SET_SERVER_TEL")}</span>
-            <span>客服邮箱：{:C("CH_SET_SERVER_EMAIL")}</span>
-            <span>服务时间：{:C("CH_TIME")}</span>
-          </p>
-          <p class="copyright"><span>网络备案：{:C('CH_SET_FOR_THE_RECORD')}</span><span>网络文化经营许可证编号：{:C(CH_SET_LICENSE)}</span><span>版权所有：{:C('CH_SET_COPYRIGHT')}</span></p>
-        </div>
-      </div>--><!--  <div class="footer">
-		      <div class="inner" >
-		        <p class="customerService" style="margin-top:.8%;">
-		          <span>客服电话：{:C("CH_SET_SERVER_TEL")}</span>
-		          <span>客服邮箱：{:C("CH_SET_SERVER_EMAIL")}</span>
-		          <span>服务时间：{:C("CH_TIME")}</span>
-		        </p>
-		        <p class="copyright"><span>网络备案：{:C('CH_SET_FOR_THE_RECORD')}</span><span>网络文化经营许可证编号：{:C(CH_SET_LICENSE)}</span><span>版权所有：{:C('CH_SET_COPYRIGHT')}</span></p>
-		      </div>
-		    </div>-->
-		<!--结束 底部信息-->
 	</div>
-</div>
-
+<div>
 <script>
 	var url = window.location.pathname+"?s=/Home/" + "{$Think.CONTROLLER_NAME}"+ "/" + "{$Think.ACTION_NAME}"+".html";
 	url = url.replace(/(\/(p)\/\d+)|(&p=\d+)|(\/(id)\/\d+)|(&id=\d+)|(\/(group)\/\d+)|(&group=\d+)/, "");
diff --git a/Application/Home/View/default/Public/transfer.html b/Application/Home/View/default/Public/transfer.html
index 2005db2b8..f2a03eb1a 100644
--- a/Application/Home/View/default/Public/transfer.html
+++ b/Application/Home/View/default/Public/transfer.html
@@ -3,7 +3,7 @@
         <div class="tra-left">
             <div class="tra-header">
                 <div class="tra-header-left"><i class="tra-pointer" :class="selectIconLeft" @click="allInitSelect" aria-hidden="true"></i></div>
-                <div class="tra-header-center">全部成员</div>
+                <div class="tra-header-center">{{leftTitle}}</div>
                 <div class="tra-header-right">{{leftSelectNum}} / {{initNum}}</div>
             </div>
             <div class="tra-search">
@@ -27,7 +27,7 @@
         <div class="tra-right">
             <div class="tra-header">
                 <div class="tra-header-left"><i class="tra-pointer" :class="selectIconRight" @click="allTargetSelect" aria-hidden="true"></i></div>
-                <div class="tra-header-center">选中成员</div>
+                <div class="tra-header-center">{{rightTitle}}</div>
                 <div class="tra-header-right">{{rightSelectNum}} / {{targetNum}}</div>
             </div>
             <div class="tra-search">
diff --git a/Data/update.sql b/Data/update.sql
index e84323c12..cb5f93643 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -1446,6 +1446,7 @@ ALTER TABLE `tab_spend`
 ADD INDEX `pay_channel`(`pay_way`, `pay_status`, `game_id`) USING BTREE,
 ADD INDEX `pay_channel_type`(`pay_status`, `pay_way`) USING BTREE;
 
+-- 2020-03-06 liaojinling
 CREATE TABLE `tab_user_data` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `user_id` int(11) not null COMMENT '用户ID',
@@ -1466,4 +1467,19 @@ CREATE TABLE `tab_base_game` (
   `android_game_id` int(11) not null default 0 COMMENT 'android版ID',
   `ios_game_id` int(11) not null default 0 COMMENT 'ios版ID',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户数据表';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户数据表';
+
+ALTER TABLE `tab_spend`
+ADD INDEX `index_user_id`(`user_id`) USING BTREE;
+
+CREATE TABLE `tab_package_download_log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `promote_id` int(11) not null COMMENT '推广员ID',
+	`game_id` int(11) not null COMMENT '游戏ID',
+  `user_id` int(11) not null default 0 COMMENT '用户ID',
+  `type` tinyint(1) not null default 0 COMMENT '类型 1 企业签下载 2 TF下载 3 超级签下载',
+  `create_time` int(11) NULL DEFAULT 0 COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='包下载记录表';
+
+update tab_quick_menu set url='/index.php?s=/Home/Game/index.html' where url='/index.php?s=/Home/Apply/index.html';
\ No newline at end of file
diff --git a/Public/Home/css/20180207/common.css b/Public/Home/css/20180207/common.css
index f3c1e44d2..1c304c5ac 100644
--- a/Public/Home/css/20180207/common.css
+++ b/Public/Home/css/20180207/common.css
@@ -134,7 +134,7 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
 .normal_list{min-height: 80vh;background: #fff;position: relative;border: 1px solid #E3E8EC;}
 .normal_space{margin-left: 10px;}
 .normal_space .select_gallery{height: 32px;padding-left: 10px;border: 1px solid #E5E5E5;border-radius: 4px;line-height: 32px;}
-.form-group .submit{width: 95px;height: 36px;display: block;background: #26C7DB;color: #fff;border: none;border-radius: 4px;}
+.form-group .submit{width: 95px;height: 36px;display: block;background: #409eff;color: #fff;border: none;border-radius: 4px;}
 .form-group .submit:hover{background: #2bd8ed;}
 .normal_table{width: 100%;text-align: center;}
 .normal_table tr{height: 40px;}
@@ -335,7 +335,8 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
     padding: 20px 30px;
 }
 .layui-layer-content .layer-box .form-group {
-    margin-bottom: 15px;
+    margin-bottom: 10px;
+    display: inline-flex;
 }
 .layui-layer-content .layer-box .form-group .static-input {
     color: #515974;
@@ -343,6 +344,7 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
     line-height: 34px;
     height: 34px;
     width: 380px;
+    margin-bottom: 0px;
 }
 .layui-layer-content .layer-box .form-group > label {
     color: #8B8CA0;
@@ -387,4 +389,245 @@ input,select,button{outline:none;font-size:14px;font-family:inherit;}
 
 .normal_table tr td a {
     color: #06C
+}
+
+.el-button {
+    display: inline-block;
+    line-height: 1;
+    white-space: nowrap;
+    cursor: pointer;
+    background: #fff;
+    border: 1px solid #dcdfe6;
+    color: #606266;
+    -webkit-appearance: none;
+    text-align: center;
+    box-sizing: border-box;
+    outline: none;
+    margin: 0;
+    transition: .1s;
+    font-weight: 500;
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    padding: 12px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+}
+
+/* .el-button+.el-button {
+    margin-left: 10px;
+} */
+
+.el-button-primary {
+    color: #fff;
+    background-color: #409eff;
+    border-color: #409eff;
+}
+
+.el-button-success {
+    color: #fff;
+    background-color: #67c23a;
+    border-color: #67c23a;
+}
+
+.el-button-info {
+    color: #fff;
+    background-color: #909399;
+    border-color: #909399;
+}
+
+.el-button-warning {
+    color: #fff;
+    background-color: #e6a23c;
+    border-color: #e6a23c;
+}
+
+.el-button-danger {
+    color: #fff;
+    background-color: #f56c6c;
+    border-color: #f56c6c;
+}
+
+.el-button-primary.is-plain {
+    color: #409eff;
+    background: #ecf5ff;
+    border-color: #b3d8ff;
+}
+
+.el-button-success.is-plain {
+    color: #67c23a;
+    background: #f0f9eb;
+    border-color: #c2e7b0;
+}
+
+.el-button-info.is-plain {
+    color: #909399;
+    background: #f4f4f5;
+    border-color: #d3d4d6;
+}
+
+.el-button-warning.is-plain {
+    color: #e6a23c;
+    background: #fdf6ec;
+    border-color: #f5dab1;
+}
+
+.el-button-danger.is-plain {
+    color: #f56c6c;
+    background: #fef0f0;
+    border-color: #fbc4c4;
+}
+
+.el-button-medium {
+    padding: 10px 20px;
+    font-size: 14px;
+    border-radius: 4px;
+}
+
+.el-button-small {
+    padding: 9px 15px;
+    font-size: 12px;
+    border-radius: 3px;
+}
+
+.el-button-mini {
+    padding: 7px 15px;
+    font-size: 12px;
+    border-radius: 3px;
+}
+
+.el-button.is-disabled, .el-button.is-disabled:focus, .el-button.is-disabled:hover {
+    color: #c0c4cc;
+    cursor: not-allowed;
+    background-image: none;
+    background-color: #fff;
+    border-color: #ebeef5;
+}
+
+.el-button.is-disabled.is-plain, .el-button.is-disabled.is-plain:focus, .el-button.is-disabled.is-plain:hover {
+    background-color: #fff;
+    border-color: #ebeef5;
+    color: #c0c4cc;
+}
+
+.el-tag {
+    background-color: #ecf5ff;
+    display: inline-block;
+    height: 32px;
+    padding: 0 10px;
+    line-height: 30px;
+    font-size: 12px;
+    color: #409eff;
+    border: 1px solid #d9ecff;
+    border-radius: 4px;
+    box-sizing: border-box;
+    white-space: nowrap;
+}
+
+.el-tag.el-tag-success {
+    background-color: #f0f9eb;
+    border-color: #e1f3d8;
+    color: #67c23a;
+}
+
+.el-tag.el-tag-info {
+    background-color: #f4f4f5;
+    border-color: #e9e9eb;
+    color: #909399;
+}
+
+.el-tag.el-tag-warning {
+    background-color: #fdf6ec;
+    border-color: #faecd8;
+    color: #e6a23c;
+}
+
+.el-tag.el-tag-danger {
+    background-color: #fef0f0;
+    border-color: #fde2e2;
+    color: #f56c6c;
+}
+
+.el-tag-dark {
+    background-color: #409eff;
+    color: #fff;
+}
+
+.el-tag-dark, .el-tag-dark.is-hit {
+    border-color: #409eff;
+}
+
+.el-tag-dark.el-tag-success {
+    background-color: #67c23a;
+    border-color: #67c23a;
+    color: #fff;
+}
+
+.el-tag-dark.el-tag-info {
+    background-color: #909399;
+    border-color: #909399;
+    color: #fff;
+}
+
+.el-tag-dark.el-tag-danger {
+    background-color: #f56c6c;
+    border-color: #f56c6c;
+    color: #fff;
+}
+
+.el-tag-dark.el-tag-warning {
+    background-color: #e6a23c;
+    border-color: #e6a23c;
+    color: #fff;
+}
+
+.el-tag-plain {
+    background-color: #fff;
+    border-color: #b3d8ff;
+    color: #409eff;
+}
+
+.el-tag-plain.el-tag-success {
+    background-color: #fff;
+    border-color: #c2e7b0;
+    color: #67c23a;
+}
+
+.el-tag-plain.el-tag-info {
+    background-color: #fff;
+    border-color: #d3d4d6;
+    color: #909399;
+}
+
+.el-tag--plain.el-tag-danger {
+    background-color: #fff;
+    border-color: #fbc4c4;
+    color: #f56c6c;
+}
+
+.el-tag-plain.el-tag-warning {
+    background-color: #fff;
+    border-color: #f5dab1;
+    color: #e6a23c;
+}
+
+.el-tag-medium {
+    height: 28px;
+    line-height: 26px;
+}
+
+.el-tag-small {
+    height: 24px;
+    padding: 0 8px;
+    line-height: 22px;
+}
+
+.el-tag-mini {
+    height: 20px;
+    padding: 0 5px;
+    line-height: 19px;
+}
+
+.layui-layer-btn .layui-layer-btn0 {
+    color: #fff!important;
 }
\ No newline at end of file
diff --git a/Public/Home/css/20180207/data.css b/Public/Home/css/20180207/data.css
index 700801e3b..094e69907 100644
--- a/Public/Home/css/20180207/data.css
+++ b/Public/Home/css/20180207/data.css
@@ -22,8 +22,9 @@ label.includes input[type="checkbox"]:checked+.check_icon {
     background-color: #fff;
 }
 
-.tab a{display: inline-block;margin-right: 10px;padding-left: 10px;padding-right: 10px;height: 34px;border: 1px solid #E5E5E5;color: #a5a6bb;border-radius: 4px;line-height: 34px;text-align: center;}
-.tab a.current{border: 1px solid #26C7DB;color: #26C7DB;}
+.tab .tab-item{display: inline-block;margin-right: 10px;padding-left: 10px;padding-right: 10px;height: 34px;border: 1px solid #E5E5E5;color: #a5a6bb;border-radius: 4px;line-height: 34px;text-align: center;}
+.tab .tab-item.current{border: 1px solid #26C7DB;color: #26C7DB;}
+.tab .tab-item:hover {text-decoration: none; color: #67c23a; border-color: #67c23a;}
 
 .btn_calc{width: 96px;height: 36px;display: block;background: #3A97FF;
 color: #fff;
diff --git a/Public/Home/css/game_detailed.css b/Public/Home/css/game_detailed.css
index 674f78e2b..8ea86dffa 100644
--- a/Public/Home/css/game_detailed.css
+++ b/Public/Home/css/game_detailed.css
@@ -332,10 +332,15 @@
 }
 
 .game-ul .game-li {
-    padding-left: 0;
-    padding-right: 0;
+    padding-left: 15px;
+    padding-right: 15px;
     padding-top: 10px;
     padding-bottom: 10px;
+    border-radius: 5px;
+}
+
+.game-ul .game-li:hover {
+    background-color: #f5f7fa;
 }
 
 .game-ul .game-li .media {
@@ -368,24 +373,27 @@
     text-align: right;
     font-size: 1.1rem;
     color: #3A97FF;
+    margin-top: 25px;
 }
 
-.btn {
-    border: 1px solid #3A97FF;
+.tab .inline-btn {
+    border: 1px solid #409eff;
     width: 88px;
     line-height: 34px;
     text-align: center;
-    color: #3A97FF;
+    color: #409eff;
     cursor: pointer;
+    text-decoration: none;
 }
 
-.btn p {
+.tab .inline-btn p {
     width: 100%;
+    margin-bottom: 0px;
 }
 
 .highlight {
-    color: #fff;
-    background-color: #3A97FF;
+    color: #fff!important;
+    background-color: #409eff;
 }
 
 .game-window-box {
diff --git a/Public/Home/js/transfer.js b/Public/Home/js/transfer.js
index 1bd30a52e..95e9e4af0 100644
--- a/Public/Home/js/transfer.js
+++ b/Public/Home/js/transfer.js
@@ -2,6 +2,8 @@ var vm = new Vue({
     el:'#transfer-app',
     data:{
         initList:[],//初始化数据
+        leftTitle: '全部成员',
+        rightTitle: '部分成员',
         initNum:0,//初始化数据总数
         targetList:[],//目标数据
         targetNum:0,//目标数据总数