diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index bc1b87bee..a176eea7b 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -875,9 +875,9 @@ class PromoteCompanyController extends ThinkController
             } else {
                 $game_ids = '';
             }
-            // 获取下级id
             $res = M('promote_company', 'tab_')->where(['id'=>$id])->save(['game_ids'=>$game_ids]);
             if ($res) {
+                $this->changePromoteGameids($id,$game_ids);
                 $this->ajaxReturn(['code'=>1,'msg'=>'更新成功']);
             } else {
                 $this->ajaxReturn(['code'=>0,'msg'=>'数据未发生变化']);
@@ -1005,28 +1005,10 @@ class PromoteCompanyController extends ThinkController
         $save['validity_end_time'] = strtotime($save['validity_end_time']);
         $save['last_up_time'] = $time;
     }
-    /**
-     * 由于修改公司信息引起的会长信息修改
-     * @param [type] $save
-     * @return void
-     */
-    protected function changePromote(&$save){
-        $is_change_belong = false;
-        $is_change_relation =false;
-        $is_change_game =false;
-        if(empty($save['id'])){
-            return false;
-        }
-        $company_id = $save['id'];
-        $old_info = M("PromoteCompany","tab_")->field("company_belong,develop_type,game_ids")->where("id = {$save['id']}")->find();
-        if(isset($save['company_belong']) && ($old_info['company_belong'] != $save['company_belong'])){
-            $is_change_belong = true;
-        }
-        if(isset($save['develop_type']) && ($old_info['develop_type'] != $save['develop_type'])){
-            $is_change_relation = true;
-        }
-        //获取需要扣除的游戏
-        if($old_info['game_ids'] != $save['game_ids']){
+    protected function changePromoteGameids($company_id,$game_ids){
+        $is_change_game = false;
+        $old_info = M("PromoteCompany","tab_")->field("company_belong,develop_type,game_ids")->where("id = {$company_id}")->find();
+        if($old_info['game_ids'] != $game_ids){
             // $is_change_game = true;
             $oids = explode(',', $old_info['game_ids']);
             $nids = explode(',', $save['game_ids']);
@@ -1046,29 +1028,47 @@ class PromoteCompanyController extends ThinkController
                 $is_change_game = true;
                 $diff_ids = $this->changeRelationGameidToGameid($diff_ids,true);
             }
-        }
-
-        //处理底下所有会长的公会属性
-        if($is_change_belong ||  $is_change_relation || $is_change_game){
-            
-            if(!$is_change_game){
-                $savedata = array(
-                    "company_belong"=>$save['company_belong'],
-                    "company_relation"=>$save['develop_type']
-                );
-                M("Promote","tab_")->where("company_id = '{$company_id}'")->save($savedata);
-            }else{
-                //需要扣除游戏
-                $Promote =  M("Promote","tab_");
+            if ($is_change_game) {
+                $Promote =  M("Promote", "tab_");
                 $dbres =  $Promote->field("id,game_ids,company_belong,company_relation")->where("company_id = '{$company_id}'")->select();
-                foreach($dbres as $k=>&$v){
-                    $temp_ids = explode(',',$v['game_ids']);
-                    $v['game_ids'] = implode(',', array_diff($temp_ids,$diff_ids));
+                foreach ($dbres as $k=>&$v) {
+                    $temp_ids = explode(',', $v['game_ids']);
+                    $v['game_ids'] = implode(',', array_diff($temp_ids, $diff_ids));
                     $v['company_belong'] = $save['company_belong'];
                     $v['company_relation'] = $save['develop_type'];
                     $Promote->save($v);
                 }
             }
+        }
+        
+    }
+    /**
+     * 由于修改公司信息引起的会长信息修改
+     * @param [type] $save
+     * @return void
+     */
+    protected function changePromote(&$save){
+        $is_change_belong = false;
+        $is_change_relation =false;
+        if(empty($save['id'])){
+            return false;
+        }
+        $company_id = $save['id'];
+        $old_info = M("PromoteCompany","tab_")->field("company_belong,develop_type,game_ids")->where("id = {$save['id']}")->find();
+        if(isset($save['company_belong']) && ($old_info['company_belong'] != $save['company_belong'])){
+            $is_change_belong = true;
+        }
+        if(isset($save['develop_type']) && ($old_info['develop_type'] != $save['develop_type'])){
+            $is_change_relation = true;
+        }
+        //处理底下所有会长的公会属性
+        if($is_change_belong ||  $is_change_relation ){
+            
+            $savedata = array(
+                "company_belong"=>$save['company_belong'],
+                "company_relation"=>$save['develop_type']
+            );
+            M("Promote","tab_")->where("company_id = '{$company_id}'")->save($savedata);
             // 权限跟随
             if($is_change_belong){
                 $authGroup = M('auth_group',"sys_")->where(['title'=>'市场总监'])->find();
diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html
index 851018292..354ff05b7 100644
--- a/Application/Admin/View/PromoteCompany/add.html
+++ b/Application/Admin/View/PromoteCompany/add.html
@@ -97,12 +97,7 @@
                                 <input type="text" class="txt " name="company_name" value="" placeholder="请输入推广公司名称">
                             </td>
                         </tr>
-                        <tr>
-                            <td class="l">推广游戏：</td>
-                            <td class="r" >
-                                <a class="ajax-view">编辑</a>
-                            </td>
-                        </tr>
+
 
                         <tr>
                             <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>团体归属:</td>
@@ -418,69 +413,7 @@
             </form>
         </div>
     </div>
-    <div class="pro_promot" style="display:none">
-        <form  id="promotForm" >
-        <div class="pro_promot_main">
-            <div class="pro_promot_title">
-                <div class="fl pro_promot_title_text">
-                    <div class="fl pro_promot_title_bigtext"> 可申请游戏</div> 选中的游戏将在对应的推广员后台进行展示，推广员可进行游戏申请</div>
-                <div class="pro_promot_close fr"><img src="__IMG__/icon_close.png"></div>
-            </div>
-            <div class="pro_promot_con">
-                <div class="pro_promot_account">推广公司：<span class="pro_promot_number"></span></div>
-                <div class="pro_promot_select">
-                    <div class="pro_promot_select_title fl">选择游戏：</div>
-                    <div class="pro_promot_select_list fl">
-                        <a class="pro_promot_select_list_con fl active pro_promot_all  pro_promot_mr20">全部 </a>
-                        <a class="pro_promot_select_list_con fl" data-index="A">A</a>
-                        <a class="pro_promot_select_list_con fl" data-index="B">B</a>
-                        <a class="pro_promot_select_list_con fl" data-index="C">C</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="D">D</a>
-                        <a class="pro_promot_select_list_con fl" data-index="E">E</a>
-                        <a class="pro_promot_select_list_con fl" data-index="F">F</a>
-                        <a class="pro_promot_select_list_con fl" data-index="G">G</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="H">H</a>
-                        <a class="pro_promot_select_list_con fl" data-index="I">I</a>
-                        <a class="pro_promot_select_list_con fl" data-index="J">J</a>
-                        <a class="pro_promot_select_list_con fl" data-index="K">K</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="L">L</a>
-                        <a class="pro_promot_select_list_con fl" data-index="M">M</a>
-                        <a class="pro_promot_select_list_con fl" data-index="N">N</a>
-                        <a class="pro_promot_select_list_con fl" data-index="O">O</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="P">P</a>
-                        <a class="pro_promot_select_list_con fl" data-index="Q">Q</a>
-                        <a class="pro_promot_select_list_con fl" data-index="R">R</a>
-                        <a class="pro_promot_select_list_con fl" data-index="S">S</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="T">T</a>
-                        <a class="pro_promot_select_list_con fl" data-index="U">U</a>
-                        <a class="pro_promot_select_list_con fl" data-index="V">V</a>
-                        <a class="pro_promot_select_list_con fl" data-index="W">W</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="X">X</a>
-                        <a class="pro_promot_select_list_con fl" data-index="Y">Y</a>
-                        <a class="pro_promot_select_list_con fl" data-index="Z">Z</a>
-                    </div>
-                </div>
-                <div class="clear"></div>
-                <div class="pro_promot_game">
-                    <div class="jsgamecheckallbox z_clearfix" >
-                        <label class="custom-label">
-                            <input type="checkbox" class="form_control jsgamecheckall" >
-                            <i class="label_icon"></i>
-                            <span class="label_text">全选</span></label>
-                    </div>
-                    <ul id="game_list" class="z_clearfix game_list" style="clear: both;">
-
-                    </ul>
-                </div>
-                <div class="clear"></div>
-                <div class="pro_promot_btn">
-                    <div class="fl pro_promot_btn_confirm">确定</div>
-                    <div class="fr pro_promot_btn_cancel">取消</div>
-                </div>
-            </div>
-        </div>
-        </form>
-    </div>
+    
     <script type="text/html" id="doctpl">
         
 
@@ -830,125 +763,4 @@
             }
         }
     </script>
-    <script type="text/javascript">
-        //点击字母按照条件按钮筛选
-        $(".pro_promot_select_list_con").click(function(){
-            //选中高亮样式
-            $(this).addClass('active');
-            $(this).siblings().removeClass('active');
-    
-            var that = $(this);
-            var index = $(this).attr("data-index");
-    
-            $("#game_list li").each(function(index,ele){
-                var short = $(this).attr('data-short');
-                $(this).show();
-                if(that.attr('data-index')){
-                    if(that.attr('data-index')!=short.charAt(0)){
-                        $(this).hide();
-                    }
-                }
-            })
-        });
-    
-        //打开弹窗
-        $(".ajax-view").click(function(){
-            //获取游戏列表
-            var url = "{:U('getCompanyGame')}";
-            var checked = 'checked';
-
-            $.post(url,{},function(res){
-                if(res.code==1){
-                    $(".pro_promot_select_list a").eq(0).addClass('active');
-                    $(".pro_promot_select_list a").eq(0).siblings().removeClass('active');
-    
-                    var game_list = res.data.game_list;
-                    var lis = [];
-                    var promote_info = [];
-                    promote_info['game_ids'] = ids;
-    
-                    $.each(game_list,function(index,ele){
-                        if(ele.game_name.length>6){
-                            ele.game_name = ele.game_name .substring(0,6)+"..."
-                        }
-                        lis.push('<li class="fl pro_promot_game_con" data-short="'+ele.short+'">');
-    
-    
-                        if(promote_info['game_ids'].length == 0){
-                            $(".jsgamecheckall").attr('checked',false);
-                            lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" id="gameCheck'+index+'" />');
-                            checked = '';
-                        }else{
-                            if(promote_info['game_ids'].indexOf(ele.id)>-1){
-                                lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
-                            }else{
-                                $(".jsgamecheckall").attr('checked',false);
-                                lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" id="gameCheck'+index+'" />');
-                                checked = '';
-                            }
-                        }
-    
-                        lis.push('<label for="gameCheck'+index+'" class="fl"></label>');
-                        lis.push('<span class="fl pro_promot_game_name">'+ele.game_name+'</span>');
-                        lis.push('</li>');
-                    });
-    
-                    $(".jsgamecheckall").attr('checked',checked);
-    
-                    $("#game_list").html(lis.join(''));
-                    $(".pro_promot_number").text(res.data.promote_info.company_name);
-                    $("#se_promote_id").val(res.data.promote_info.id);
-                    $(".pro_promot").css("display","block");
-    
-                    jsgameid();
-    
-                }else{
-                    var tip_msg = res.info ? res.info : '操作失败';
-                    layer.msg(tip_msg);
-                }
-            });
-        });
-    
-        //保存修改
-        $(".pro_promot_btn_confirm").click(function(){
-            ids = [];
-            var res =  $("#promotForm").serializeArray();
-            for (var key in res) {
-                if (res.hasOwnProperty(key)) {
-                    var e = res[key];
-                    ids.push(e['value']);
-                }
-            }
-            // layer.msg("编辑成功，保存并审核通过后生效");
-            $(".pro_promot").hide();
-        });
-    
-        //关闭弹窗
-        $(".pro_promot_close").click(function(){
-            $(".pro_promot").css("display","none");
-        });
-        //取消修改
-        $(".pro_promot_btn_cancel").click(function(){
-            $(".pro_promot").css("display","none");
-        });
-    
-        $(".jsgamecheckall").click(function(){
-            $(this).closest('.jsgamecheckallbox').siblings("#game_list").find(".jsgameid").prop("checked", this.checked);
-        });
-    
-        function jsgameid(){
-            $(".jsgameid").click(function(){
-                var option = $(this).closest('ul').find(".jsgameid"),
-                    checkall = $(this).closest('ul').siblings('.jsgamecheckallbox').find('.jsgamecheckall');
-                option.each(function(i){
-                    if(!this.checked){
-                        checkall.prop("checked", false);
-                        return false;
-                    }else{
-                        checkall.prop("checked", true);
-                    }
-                });
-            });
-        }
-    </script>
 </block>
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index 85cf38c72..b3851e34c 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -97,12 +97,6 @@
                                 <input type="text" class="txt " name="company_name" value="{$data.company_name}" placeholder="请输入推广公司名称">
                             </td>
                         </tr>
-                        <tr>
-                            <td class="l">推广游戏：</td>
-                            <td class="r" >
-                                <a class="ajax-view">编辑</a>
-                            </td>
-                        </tr>
                         <tr>
                             <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>团体归属:</td>
                             <td class="r" >
@@ -436,69 +430,7 @@
             </form>
         </div>
     </div>
-    <div class="pro_promot" style="display:none">
-        <form  id="promotForm" >
-        <div class="pro_promot_main">
-            <div class="pro_promot_title">
-                <div class="fl pro_promot_title_text">
-                    <div class="fl pro_promot_title_bigtext"> 可申请游戏</div> 选中的游戏将在对应的推广员后台进行展示，推广员可进行游戏申请</div>
-                <div class="pro_promot_close fr"><img src="__IMG__/icon_close.png"></div>
-            </div>
-            <div class="pro_promot_con">
-                <div class="pro_promot_account">推广公司：<span class="pro_promot_number"></span></div>
-                <div class="pro_promot_select">
-                    <div class="pro_promot_select_title fl">选择游戏：</div>
-                    <div class="pro_promot_select_list fl">
-                        <a class="pro_promot_select_list_con fl active pro_promot_all  pro_promot_mr20">全部 </a>
-                        <a class="pro_promot_select_list_con fl" data-index="A">A</a>
-                        <a class="pro_promot_select_list_con fl" data-index="B">B</a>
-                        <a class="pro_promot_select_list_con fl" data-index="C">C</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="D">D</a>
-                        <a class="pro_promot_select_list_con fl" data-index="E">E</a>
-                        <a class="pro_promot_select_list_con fl" data-index="F">F</a>
-                        <a class="pro_promot_select_list_con fl" data-index="G">G</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="H">H</a>
-                        <a class="pro_promot_select_list_con fl" data-index="I">I</a>
-                        <a class="pro_promot_select_list_con fl" data-index="J">J</a>
-                        <a class="pro_promot_select_list_con fl" data-index="K">K</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="L">L</a>
-                        <a class="pro_promot_select_list_con fl" data-index="M">M</a>
-                        <a class="pro_promot_select_list_con fl" data-index="N">N</a>
-                        <a class="pro_promot_select_list_con fl" data-index="O">O</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="P">P</a>
-                        <a class="pro_promot_select_list_con fl" data-index="Q">Q</a>
-                        <a class="pro_promot_select_list_con fl" data-index="R">R</a>
-                        <a class="pro_promot_select_list_con fl" data-index="S">S</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="T">T</a>
-                        <a class="pro_promot_select_list_con fl" data-index="U">U</a>
-                        <a class="pro_promot_select_list_con fl" data-index="V">V</a>
-                        <a class="pro_promot_select_list_con fl" data-index="W">W</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="X">X</a>
-                        <a class="pro_promot_select_list_con fl" data-index="Y">Y</a>
-                        <a class="pro_promot_select_list_con fl" data-index="Z">Z</a>
-                    </div>
-                </div>
-                <div class="clear"></div>
-                <div class="pro_promot_game">
-                    <div class="jsgamecheckallbox z_clearfix" >
-                        <label class="custom-label">
-                            <input type="checkbox" class="form_control jsgamecheckall" >
-                            <i class="label_icon"></i>
-                            <span class="label_text">全选</span></label>
-                    </div>
-                    <ul id="game_list" class="z_clearfix game_list" style="clear: both;">
-
-                    </ul>
-                </div>
-                <div class="clear"></div>
-                <div class="pro_promot_btn">
-                    <div class="fl pro_promot_btn_confirm">确定</div>
-                    <div class="fr pro_promot_btn_cancel">取消</div>
-                </div>
-            </div>
-        </div>
-        </form>
-    </div>
+    
     <script type="text/html" id="doctpl">
         
 
@@ -845,123 +777,4 @@
         
         
     </script>
-    <script type="text/javascript">
-        //点击字母按照条件按钮筛选
-        $(".pro_promot_select_list_con").click(function(){
-            //选中高亮样式
-            $(this).addClass('active');
-            $(this).siblings().removeClass('active');
-    
-            var that = $(this);
-            var index = $(this).attr("data-index");
-    
-            $("#game_list li").each(function(index,ele){
-                var short = $(this).attr('data-short');
-                $(this).show();
-                if(that.attr('data-index')){
-                    if(that.attr('data-index')!=short.charAt(0)){
-                        $(this).hide();
-                    }
-                }
-            })
-        });
-    
-        //打开弹窗
-        $(".ajax-view").click(function(){
-            //获取游戏列表
-            var url = "{:U('getCompanyGame')}";
-            var checked = 'checked';
-
-            $.post(url,{},function(res){
-                if(res.code==1){
-                    $(".pro_promot_select_list a").eq(0).addClass('active');
-                    $(".pro_promot_select_list a").eq(0).siblings().removeClass('active');
-    
-                    var game_list = res.data.game_list;
-                    var lis = [];
-                    var promote_info = [];
-                    promote_info['game_ids'] = ids;
-    
-                    $.each(game_list,function(index,ele){
-                        if(ele.game_name.length>6){
-                            ele.game_name = ele.game_name .substring(0,6)+"..."
-                        }
-                        lis.push('<li class="fl pro_promot_game_con" data-short="'+ele.short+'">');
-                        if(promote_info['game_ids'].length == 0){
-                            $(".jsgamecheckall").attr('checked',false);
-                            lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" id="gameCheck'+index+'" />');
-                            checked = '';
-                        }else{
-                            if(promote_info['game_ids'].indexOf(ele.id)>-1){
-                                lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
-                            }else{
-                                $(".jsgamecheckall").attr('checked',false);
-                                lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" id="gameCheck'+index+'" />');
-                                checked = '';
-                            }
-                        }
-    
-                        lis.push('<label for="gameCheck'+index+'" class="fl"></label>');
-                        lis.push('<span class="fl pro_promot_game_name">'+ele.game_name+'</span>');
-                        lis.push('</li>');
-                    });
-    
-                    $(".jsgamecheckall").attr('checked',checked);
-    
-                    $("#game_list").html(lis.join(''));
-                    $(".pro_promot_number").text(res.data.promote_info.company_name);
-                    $("#se_promote_id").val(res.data.promote_info.id);
-                    $(".pro_promot").css("display","block");
-    
-                    jsgameid();
-    
-                }else{
-                    var tip_msg = res.info ? res.info : '操作失败';
-                    layer.msg(tip_msg);
-                }
-            });
-        });
-    
-        //保存修改
-        $(".pro_promot_btn_confirm").click(function(){
-            ids = [];
-            var res =  $("#promotForm").serializeArray();
-            for (var key in res) {
-                if (res.hasOwnProperty(key)) {
-                    var e = res[key];
-                    ids.push(e['value']);
-                }
-            }
-            // layer.msg("编辑成功，保存并审核通过后生效");
-            $(".pro_promot").hide();
-        });
-    
-        //关闭弹窗
-        $(".pro_promot_close").click(function(){
-            $(".pro_promot").css("display","none");
-        });
-        //取消修改
-        $(".pro_promot_btn_cancel").click(function(){
-            $(".pro_promot").css("display","none");
-        });
-    
-        $(".jsgamecheckall").click(function(){
-            $(this).closest('.jsgamecheckallbox').siblings("#game_list").find(".jsgameid").prop("checked", this.checked);
-        });
-    
-        function jsgameid(){
-            $(".jsgameid").click(function(){
-                var option = $(this).closest('ul').find(".jsgameid"),
-                    checkall = $(this).closest('ul').siblings('.jsgamecheckallbox').find('.jsgamecheckall');
-                option.each(function(i){
-                    if(!this.checked){
-                        checkall.prop("checked", false);
-                        return false;
-                    }else{
-                        checkall.prop("checked", true);
-                    }
-                });
-            });
-        }
-    </script>
 </block>
diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html
index 968d9adbc..b53da20de 100644
--- a/Application/Admin/View/PromoteCompany/lists.html
+++ b/Application/Admin/View/PromoteCompany/lists.html
@@ -365,60 +365,70 @@
     <div class="page">
         {$_page|default=''}
     </div>
-        <div class="pro_promot" style="display:none">
-            <form action="{:U('saveCompanyGame')}" id="ajaxForm" method="post" />
-            <input type="hidden" name="promote_id" id="se_promote_id" value="" />
-            <div class="pro_promot_main">
-                <div class="pro_promot_title">
-                    <div class="fl pro_promot_title_text">
-                        <div class="fl pro_promot_title_bigtext"> 可申请游戏</div> 选中的游戏将在对应的推广员后台进行展示，推广员可进行游戏申请</div>
-                    <div class="pro_promot_close fr"><img src="__IMG__/icon_close.png"></div>
-                </div>
-                <div class="pro_promot_con">
-                    <div class="pro_promot_account">推广公司：<span class="pro_promot_number"></span></div>
-                    <div class="pro_promot_select">
-                        <div class="pro_promot_select_title fl">可推广游戏：</div>
-                        <div class="pro_promot_select_list fl">
-                            <a class="pro_promot_select_list_con fl active pro_promot_all  pro_promot_mr20">全部 </a>
-                            <a class="pro_promot_select_list_con fl" data-index="A">A</a>
-                            <a class="pro_promot_select_list_con fl" data-index="B">B</a>
-                            <a class="pro_promot_select_list_con fl" data-index="C">C</a>
-                            <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="D">D</a>
-                            <a class="pro_promot_select_list_con fl" data-index="E">E</a>
-                            <a class="pro_promot_select_list_con fl" data-index="F">F</a>
-                            <a class="pro_promot_select_list_con fl" data-index="G">G</a>
-                            <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="H">H</a>
-                            <a class="pro_promot_select_list_con fl" data-index="I">I</a>
-                            <a class="pro_promot_select_list_con fl" data-index="J">J</a>
-                            <a class="pro_promot_select_list_con fl" data-index="K">K</a>
-                            <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="L">L</a>
-                            <a class="pro_promot_select_list_con fl" data-index="M">M</a>
-                            <a class="pro_promot_select_list_con fl" data-index="N">N</a>
-                            <a class="pro_promot_select_list_con fl" data-index="O">O</a>
-                            <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="P">P</a>
-                            <a class="pro_promot_select_list_con fl" data-index="Q">Q</a>
-                            <a class="pro_promot_select_list_con fl" data-index="R">R</a>
-                            <a class="pro_promot_select_list_con fl" data-index="S">S</a>
-                            <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="T">T</a>
-                            <a class="pro_promot_select_list_con fl" data-index="U">U</a>
-                            <a class="pro_promot_select_list_con fl" data-index="V">V</a>
-                            <a class="pro_promot_select_list_con fl" data-index="W">W</a>
-                            <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="X">X</a>
-                            <a class="pro_promot_select_list_con fl" data-index="Y">Y</a>
-                            <a class="pro_promot_select_list_con fl" data-index="Z">Z</a>
-                        </div>
+    <div class="pro_promot" style="display:none">
+        <form action="{:U('saveCompanyGame')}" id="ajaxForm" method="post" />
+        <input type="hidden" name="promote_id" id="se_promote_id" value="" />
+        <div class="pro_promot_main">
+            <div class="pro_promot_title">
+                <div class="fl pro_promot_title_text">
+                    <div class="fl pro_promot_title_bigtext"> 可申请游戏</div> 及时生效，删减游戏将照成所属会长无法推广此游戏</div>
+                <div class="pro_promot_close fr"><img src="__IMG__/icon_close.png"></div>
+            </div>
+            <div class="pro_promot_con">
+                <div class="pro_promot_account">推广公司：<span class="pro_promot_number"></span></div>
+                <div class="pro_promot_select">
+                    <div class="pro_promot_select_title fl">选择游戏：</div>
+                    <div class="pro_promot_select_list fl">
+                        <a class="pro_promot_select_list_con fl active pro_promot_all  pro_promot_mr20">全部 </a>
+                        <a class="pro_promot_select_list_con fl" data-index="A">A</a>
+                        <a class="pro_promot_select_list_con fl" data-index="B">B</a>
+                        <a class="pro_promot_select_list_con fl" data-index="C">C</a>
+                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="D">D</a>
+                        <a class="pro_promot_select_list_con fl" data-index="E">E</a>
+                        <a class="pro_promot_select_list_con fl" data-index="F">F</a>
+                        <a class="pro_promot_select_list_con fl" data-index="G">G</a>
+                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="H">H</a>
+                        <a class="pro_promot_select_list_con fl" data-index="I">I</a>
+                        <a class="pro_promot_select_list_con fl" data-index="J">J</a>
+                        <a class="pro_promot_select_list_con fl" data-index="K">K</a>
+                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="L">L</a>
+                        <a class="pro_promot_select_list_con fl" data-index="M">M</a>
+                        <a class="pro_promot_select_list_con fl" data-index="N">N</a>
+                        <a class="pro_promot_select_list_con fl" data-index="O">O</a>
+                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="P">P</a>
+                        <a class="pro_promot_select_list_con fl" data-index="Q">Q</a>
+                        <a class="pro_promot_select_list_con fl" data-index="R">R</a>
+                        <a class="pro_promot_select_list_con fl" data-index="S">S</a>
+                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="T">T</a>
+                        <a class="pro_promot_select_list_con fl" data-index="U">U</a>
+                        <a class="pro_promot_select_list_con fl" data-index="V">V</a>
+                        <a class="pro_promot_select_list_con fl" data-index="W">W</a>
+                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="X">X</a>
+                        <a class="pro_promot_select_list_con fl" data-index="Y">Y</a>
+                        <a class="pro_promot_select_list_con fl" data-index="Z">Z</a>
                     </div>
-                    <div class="clear"></div>
-                    <div class="pro_promot_game">
-                        <ul id="game_list" class="z_clearfix game_list" style="clear: both;">
-    
-                        </ul>
+                </div>
+                <div class="clear"></div>
+                <div class="pro_promot_game">
+                    <div class="jsgamecheckallbox z_clearfix" >
+                        <label class="custom-label">
+                            <input type="checkbox" class="form_control jsgamecheckall" >
+                            <i class="label_icon"></i>
+                            <span class="label_text">全选</span></label>
                     </div>
-                    <div class="clear"></div>
+                    <ul id="game_list" class="z_clearfix game_list" style="clear: both;">
+
+                    </ul>
+                </div>
+                <div class="clear"></div>
+                <div class="pro_promot_btn">
+                    <div class="fl pro_promot_btn_confirm">确定</div>
+                    <div class="fr pro_promot_btn_cancel">取消</div>
                 </div>
             </div>
-            </form>
         </div>
+        </form>
+    </div>
 		
 </block>
 
@@ -516,9 +526,6 @@
         var url = "{:U('getCompanyGame')}";
         var id = $(this).attr('data-id');
         var checked = 'checked';
-
-
-
         $.post(url,{id:id},function(res){
             if(res.code==1){
 
@@ -533,14 +540,28 @@
                     if(ele.game_name.length>6){
                         ele.game_name = ele.game_name .substring(0,6)+"..."
                     }
-                    if(promote_info['game_ids'].indexOf(ele.id)>-1){
-                        lis.push('<li class="fl pro_promot_game_con" data-short="'+ele.short+'">');
-                        lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" disabled class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
-                        lis.push('<label for="gameCheck'+index+'" class="fl"></label>');
-                        lis.push('<span class="fl pro_promot_game_name">'+ele.game_name+'</span>');
-                        lis.push('</li>');
-                    }
+                    lis.push('<li class="fl pro_promot_game_con" data-short="'+ele.short+'">');
+
+
+                    // if(promote_info['game_ids']==''){
+                        // lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
+                    // }else{
+                        if(promote_info['game_ids'].indexOf(ele.id)>-1){
+                            lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
+                        }else{
+                            $(".jsgamecheckall").attr('checked',false);
+                            lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" class="fl pro_promot_game_check jsgameid" id="gameCheck'+index+'" />');
+                            checked = '';
+                        }
+                    // }
+
+                    lis.push('<label for="gameCheck'+index+'" class="fl"></label>');
+                    lis.push('<span class="fl pro_promot_game_name">'+ele.game_name+'</span>');
+                    lis.push('</li>');
                 });
+
+                $(".jsgamecheckall").attr('checked',checked);
+
                 $("#game_list").html(lis.join(''));
                 $(".pro_promot_number").text(res.data.promote_info.company_name);
                 $("#se_promote_id").val(res.data.promote_info.id);
@@ -557,8 +578,11 @@
 
     //保存修改
     $(".pro_promot_btn_confirm").click(function(){
+        $(".pro_promot").hide();
+        var index = layer.load(2);
         $("#ajaxForm").ajaxSubmit(function(res){
-            $(".pro_promot").hide();
+            layer.msg(res.msg);
+            layer.close(index);   
         });
         return false;
     });
@@ -576,6 +600,7 @@
         $(this).closest('.jsgamecheckallbox').siblings("#game_list").find(".jsgameid").prop("checked", this.checked);
     });
 
+    //可申请游戏 全选及全选反选 功能  @author  zwm  date 20180604
     function jsgameid(){
         $(".jsgameid").click(function(){
             var option = $(this).closest('ul').find(".jsgameid"),
diff --git a/Application/Admin/View/PromoteCompany/view.html b/Application/Admin/View/PromoteCompany/view.html
index a64a9dace..18c87b73d 100644
--- a/Application/Admin/View/PromoteCompany/view.html
+++ b/Application/Admin/View/PromoteCompany/view.html
@@ -97,12 +97,7 @@
                                 <input type="text" class="txt " name="company_name" value="{$data.company_name}" readonly placeholder="请输入推广公司名称">
                             </td>
                         </tr>
-                        <tr>
-                            <td class="l">推广游戏：</td>
-                            <td class="r" >
-                                <a class="ajax-view">查看</a>
-                            </td>
-                        </tr>
+
 
                         <tr>
                             <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>团体归属:</td>
@@ -425,58 +420,7 @@
             </form>
         </div>
     </div>
-    <div class="pro_promot" style="display:none">
-        <form  id="promotForm" >
-        <div class="pro_promot_main">
-            <div class="pro_promot_title">
-                <div class="fl pro_promot_title_text">
-                    <div class="fl pro_promot_title_bigtext"> 可申请游戏</div> 选中的游戏将在对应的推广员后台进行展示，推广员可进行游戏申请</div>
-                <div class="pro_promot_close fr"><img src="__IMG__/icon_close.png"></div>
-            </div>
-            <div class="pro_promot_con">
-                <div class="pro_promot_select">
-                    <div class="pro_promot_select_title fl">可推广游戏：</div>
-                    <div class="pro_promot_select_list fl">
-                        <a class="pro_promot_select_list_con fl active pro_promot_all  pro_promot_mr20">全部 </a>
-                        <a class="pro_promot_select_list_con fl" data-index="A">A</a>
-                        <a class="pro_promot_select_list_con fl" data-index="B">B</a>
-                        <a class="pro_promot_select_list_con fl" data-index="C">C</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="D">D</a>
-                        <a class="pro_promot_select_list_con fl" data-index="E">E</a>
-                        <a class="pro_promot_select_list_con fl" data-index="F">F</a>
-                        <a class="pro_promot_select_list_con fl" data-index="G">G</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="H">H</a>
-                        <a class="pro_promot_select_list_con fl" data-index="I">I</a>
-                        <a class="pro_promot_select_list_con fl" data-index="J">J</a>
-                        <a class="pro_promot_select_list_con fl" data-index="K">K</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="L">L</a>
-                        <a class="pro_promot_select_list_con fl" data-index="M">M</a>
-                        <a class="pro_promot_select_list_con fl" data-index="N">N</a>
-                        <a class="pro_promot_select_list_con fl" data-index="O">O</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="P">P</a>
-                        <a class="pro_promot_select_list_con fl" data-index="Q">Q</a>
-                        <a class="pro_promot_select_list_con fl" data-index="R">R</a>
-                        <a class="pro_promot_select_list_con fl" data-index="S">S</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="T">T</a>
-                        <a class="pro_promot_select_list_con fl" data-index="U">U</a>
-                        <a class="pro_promot_select_list_con fl" data-index="V">V</a>
-                        <a class="pro_promot_select_list_con fl" data-index="W">W</a>
-                        <a class="pro_promot_select_list_con fl  pro_promot_mr20" data-index="X">X</a>
-                        <a class="pro_promot_select_list_con fl" data-index="Y">Y</a>
-                        <a class="pro_promot_select_list_con fl" data-index="Z">Z</a>
-                    </div>
-                </div>
-                <div class="clear"></div>
-                <div class="pro_promot_game">
-                    <ul id="game_list" class="z_clearfix game_list" style="clear: both;">
-
-                    </ul>
-                </div>
-                <div class="clear"></div>
-            </div>
-        </div>
-        </form>
-    </div>
+    
     <script type="text/html" id="doctpl">
         
 
@@ -547,113 +491,5 @@
         
         
     </script>
-    <script type="text/javascript">
-        //点击字母按照条件按钮筛选
-        $(".pro_promot_select_list_con").click(function(){
-            //选中高亮样式
-            $(this).addClass('active');
-            $(this).siblings().removeClass('active');
-    
-            var that = $(this);
-            var index = $(this).attr("data-index");
-    
-            $("#game_list li").each(function(index,ele){
-                var short = $(this).attr('data-short');
-                $(this).show();
-                if(that.attr('data-index')){
-                    if(that.attr('data-index')!=short.charAt(0)){
-                        $(this).hide();
-                    }
-                }
-            })
-        });
-    
-        //打开弹窗
-        $(".ajax-view").click(function(){
-            //获取游戏列表
-            var url = "{:U('getCompanyGame')}";
-            var checked = 'checked';
-
-            $.post(url,{},function(res){
-                if(res.code==1){
-                    $(".pro_promot_select_list a").eq(0).addClass('active');
-                    $(".pro_promot_select_list a").eq(0).siblings().removeClass('active');
-    
-                    var game_list = res.data.game_list;
-                    var lis = [];
-                    var promote_info = [];
-                    promote_info['game_ids'] = ids;
     
-                    $.each(game_list,function(index,ele){
-                        if(ele.game_name.length>6){
-                            ele.game_name = ele.game_name .substring(0,6)+"..."
-                        }
-                        if(promote_info['game_ids'].indexOf(ele.id)>-1){
-                            lis.push('<li class="fl pro_promot_game_con" data-short="'+ele.short+'">');
-                            lis.push('<input type="checkbox" value="'+ele.id+'" name="game_ids[]" disabled class="fl pro_promot_game_check jsgameid" checked="checked" id="gameCheck'+index+'" />');
-                            lis.push('<label for="gameCheck'+index+'" class="fl"></label>');
-                            lis.push('<span class="fl pro_promot_game_name">'+ele.game_name+'</span>');
-                            lis.push('</li>');
-                        }
-    
-                    });
-    
-                    // $(".jsgamecheckall").attr('checked',checked);
-    
-                    $("#game_list").html(lis.join(''));
-                    $(".pro_promot_number").text(res.data.promote_info.company_name);
-                    $("#se_promote_id").val(res.data.promote_info.id);
-                    $(".pro_promot").css("display","block");
-    
-                    jsgameid();
-    
-                }else{
-                    var tip_msg = res.info ? res.info : '操作失败';
-                    layer.msg(tip_msg);
-                }
-            });
-        });
-    
-        //保存修改
-        $(".pro_promot_btn_confirm").click(function(){
-            ids = [];
-            var res =  $("#promotForm").serializeArray();
-            for (var key in res) {
-                if (res.hasOwnProperty(key)) {
-                    var e = res[key];
-                    ids.push(e['value']);
-                }
-            }
-            // layer.msg("编辑成功，保存并审核通过后生效");
-            $(".pro_promot").hide();
-        });
-    
-        //关闭弹窗
-        $(".pro_promot_close").click(function(){
-            $(".pro_promot").css("display","none");
-        });
-        //取消修改
-        $(".pro_promot_btn_cancel").click(function(){
-            $(".pro_promot").css("display","none");
-        });
-    
-        $(".jsgamecheckall").click(function(){
-            $(this).closest('.jsgamecheckallbox').siblings("#game_list").find(".jsgameid").prop("checked", this.checked);
-        });
-    
-        function jsgameid(){
-            $(".jsgameid").click(function(){
-                var option = $(this).closest('ul').find(".jsgameid"),
-                    checkall = $(this).closest('ul').siblings('.jsgamecheckallbox').find('.jsgamecheckall');
-                option.each(function(i){
-                    if(!this.checked){
-                        checkall.prop("checked", false);
-                        return false;
-                    }else{
-                        checkall.prop("checked", true);
-                    }
-                });
-            });
-        }
-    </script>
 </block>