diff --git a/Application/Admin/Controller/PartnerController.class.php b/Application/Admin/Controller/PartnerController.class.php
index 6d536a3b5..33156d45c 100644
--- a/Application/Admin/Controller/PartnerController.class.php
+++ b/Application/Admin/Controller/PartnerController.class.php
@@ -12,6 +12,7 @@ use Think\Controller;
 class PartnerController extends ThinkController
 {
     private $modelName = 'Partner';
+    public $OpAuthList=[];
     public function _initialize()
     {
         $this->admininfo = $_SESSION['onethink_admin']['user_auth'];
@@ -200,7 +201,7 @@ class PartnerController extends ThinkController
         $this->assign('listData', $parseData);
         $this->assign('count', $count);
         $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Partner/lists'])->find());
-        $this->meta_title = '合作方管理';
+        $this->meta_title = '上游CP公司列表';
         $this->display();
     }
     //审核列表
@@ -211,6 +212,10 @@ class PartnerController extends ThinkController
         $row = intval(I('row', 0));
         $row = empty($row) ? 10 : $row;//每页条数
 
+        if(!IS_ROOT){
+            $this->OpAuthList= getModuleControllerAuth();
+        }
+
         $map = ["_string"=>"1=1"];
         $model = M("partner_verify", 'tab_');
         $data =  $model->where($map)->page($page,$row)->select();
@@ -237,20 +242,25 @@ class PartnerController extends ThinkController
             $create_time = date("Y-m-d H:i:s",$v["create_time"]);
 
             $v["create"]= "{$v['create_admin_account']} <br> {$create_time}";
-
+            $v['verify_log'] = json_decode($v['verify_log'], true);
             if(isset($v['verify_log']['verify_user'])){
                 if($v['verify_status'] == -1){
                     $ts = "审核拒绝";
                 }else{
                     $ts = "审核通过";
                 }
-                $v["verify"]= "{$ts}({$v['verify_log']['verify_user']}) {$symbol} {$v['verify_log']['verify_time']}";
+                $v["verify"]= "{$ts}({$v['verify_log']['verify_user']}) <br> {$v['verify_log']['verify_time']}";
             }else{
                 $v["verify"] = '--';
             }
 
         }
         $count =  $model->where($map)->count();
+        $page = set_pagination($count, $row);
+        if ($page) {
+            $this->assign('_page', $page);
+        }
+        $this->assign('menubtn',$this->menuAuth());
         $this->assign('listData', $data);
         $this->assign('count', $count);
         $this->assign('VerifyStatus', D("PartnerVerify")->VerifyStatus);
@@ -268,7 +278,7 @@ class PartnerController extends ThinkController
             $save['uid'] = UID;
             $save['create_time'] = time();
 
-            $has_check = M("partner_verify")->where(["partner_name"=>$partner_info['partner'],"verify_status"=>0])->field("id")->find();
+            $has_check = M("partner_verify","tab_")->where(["partner_name"=>$partner_info['partner'],"verify_status"=>0])->field("id")->find();
             if ($has_check) {
                 $this->error('已存在同名未审核的cp,请勿重复添加');
             }
@@ -281,7 +291,7 @@ class PartnerController extends ThinkController
                     "key"=>$save['partner'],
                     "url"=>U("Partner/lists",array("partner"=>$save['partner']))
                 ));
-                $this->success('保存成功,请联系管理尽快审核', U('lists'));
+                $this->success('保存成功,请联系管理尽快审核', U('index'));
             } else {
                 $this->error('保存失败');
             }
@@ -301,7 +311,6 @@ class PartnerController extends ThinkController
             $save = I("post.");
             $this->checkData($save);
             $res =D("PartnerVerify")->edit_db($save);
-            // $res = M("partner_verify", 'tab_')->save($verifydata);
             if ($res === false) {
                 $this->error('保存失败');
             } else {
@@ -311,7 +320,7 @@ class PartnerController extends ThinkController
                     "key"=>$save['partner'],
                     "url"=>U("Partner/lists",array("partner"=>$save['partner']))
                 ));
-                $this->success('保存成功', U('lists'));
+                $this->success('保存成功,请联系管理尽快审核', U('index'));
             }
         } else {
             $id = intval(I('get.id', 0));
@@ -382,6 +391,100 @@ class PartnerController extends ThinkController
         ));
         $this->success('删除成功', U('lists'));
     }
+    public function verifyView()
+    {
+        if(!isset($_REQUEST['id'])) $this->error('数据异常', U('index'));
+        $id = $_REQUEST['id'];
+        $map['id'] = $id;
+        $dbres = M("partner_verify", 'tab_')->find($id);
+        $data = json_decode($dbres['partner_info'],true);
+        
+
+        if ($data['contract_start_time']) {
+            $data['contract_start_time'] = date('Y-m-d', $data['contract_start_time']);
+        }else{
+            $data['contract_start_time']='';
+        }
+        if ($data['contract_end_time']) {
+            $data['contract_end_time'] = date('Y-m-d', $data['contract_end_time']);
+        }else{
+            $data['contract_end_time']='';
+        }
+
+        if ($data['validity_start_time']) {
+            $data['validity_start_time'] = date('Y-m-d', $data['validity_start_time']);
+        }else{
+            $data['validity_start_time']='';
+        }
+
+        if ($data['validity_end_time']) {
+            $data['validity_end_time'] = date('Y-m-d', $data['validity_end_time']);
+        }else{
+            $data['validity_end_time']='';
+        }
+
+        $this->assign('data', $data);
+        $this->assign('action', $action);
+        $this->assign('commonset', M('Kuaijieicon')->where(['url' => 'Partner/edit'])->find());
+        $this->meta_title ='审核信息查看';
+        $this->display("show");
+    }
+
+    public function adminRefuse(){
+        if(!isset($_REQUEST['ids'])) $this->error("参数错误");
+        $ids = $_REQUEST['ids'];
+        $dbres = M("partner_verify", 'tab_')->field("id,verify_status,verify_log")->where("id in ({$ids})")->select();
+        foreach($dbres as $k=>&$v){
+            if($v['status'] != 0) continue;
+            $v['verify_log'] = json_decode($v['verify_log'],true);
+            $v['verify_log']['verify_user']=$this->admininfo["username"];
+            $v['verify_log']['verify_time']=date("Y-m-d H:i:s");
+            $v['verify_log'] = json_encode($v['verify_log']);
+            $v['verify_status']=-1;
+            M("partner_verify", 'tab_')->save($v);
+            addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('index')]);
+        }
+        $this->ajaxReturn(array(
+            'status' => 1,
+            "info"=>"管理员审核拒绝成功"
+        ));
+    }
+
+    //管理员成功
+    public function adminAgree(){
+        if(!isset($_REQUEST['ids'])) $this->error("参数错误");
+        $ids = $_REQUEST['ids'];
+        
+        $Partner = M("partner", 'tab_');
+        $PartnerVerify = M("partner_verify", 'tab_');
+        $dbres =$PartnerVerify->field("*")->where("id in ({$ids})")->select();
+        foreach($dbres as $k=>&$v){
+            if($v['status'] != 0) continue;
+            $v['verify_log'] = json_decode($v['verify_log'],true);
+            $v['verify_log']['verify_user']=$this->admininfo["username"];
+            $v['verify_log']['verify_time']=date("Y-m-d H:i:s");
+            $v['verify_log'] = json_encode($v['verify_log']);
+            $v['status']=1;
+            $partner_info = json_decode($v['partner_info'],true);
+            if($v['partner_id'] == 0){
+                //新增
+                $v['partner_id'] = $Partner->add($partner_info);
+            }else{
+                //编辑
+                $Partner->save($partner_info);
+            }
+            //修改自身
+            $PartnerVerify->save($v);
+            M("partner_verify", 'tab_')->save($v);
+          
+            addOperationLog(['op_type'=>1,'key'=>$v['partner_id'],"op_name"=>"管理员审核",'url'=>U('index')]);
+        }
+        $this->ajaxReturn(array(
+            'status' => 1,
+            "info"=>"管理员审核通过成功"
+        ));
+    }
+
     protected function checkData(&$save)
     {
         $partner = trim($save['partner']);
@@ -460,5 +563,25 @@ class PartnerController extends ThinkController
         $save['last_up_time'] = $time;
     }
 
+    public function menuAuth()
+    {
+        $addurl = U("addRelation");
+        $mentBtn = [
+            "adminAgree"=>"<a class='butn' id='adminAgree'>管理员审核通过</a>",
+            "adminRefuse"=>"<a class='butn' id='adminRefuse' style='background-color: red;'>管理员审核拒绝</a>"
+        ];
+        $resarr = [];
+        foreach ($mentBtn as $k => $v) {
+            if(IS_ROOT){
+                $resarr[] = $v;
+            }else{
+                if(in_array($k,$this->OpAuthList)){
+                    $resarr[] = $v;
+                }
+            }
+        }
+        return $resarr;
+    }
+
 
 }
diff --git a/Application/Admin/View/Partner/index.html b/Application/Admin/View/Partner/index.html
index 7792eef81..1d2f0505e 100644
--- a/Application/Admin/View/Partner/index.html
+++ b/Application/Admin/View/Partner/index.html
@@ -31,10 +31,35 @@
             height: 30px;
             line-height: 30px;
         }
+        .butnbox {padding:10px 0 10px;}
+        .butnbox .butnlist {overflow:hidden;clear:both;}
+        .butnbox .butnlist .butn,.butnbox .butnlist .butn:hover {text-decoration:none;border:none;}
+        .butnbox .butnlist .butn {display:inline-block;width:120px;height:28px;line-height:28px;text-align:center;color:#FFF;background:#3C95C8;border-radius:3px;}
+        .butnbox .butnlist .butn.last {background:#009900;}
+        .butnbox .butnlist .butn~.butn {margin-left:20px;}
+        .butnbox a{
+            cursor:pointer
+        }
+        .data_list table tbody tr a.disabled,.data_list table tbody tr a.disabled:hover {color:#999;cursor:default;}
+        .layui-layer-title {
+            text-align: center;
+            height: 80px;
+            line-height: 80px;
+            font-weight: 600;
+            font-size: 18px;
+        }
+        .data_list table td{
+            line-height: 1.5;
+        }
     </style>
 
     <div class="cf main-place top_nav_list navtab_list">
+        <div class="fr">
+            <a  href="{:U('lists')}">生效列表</a>
+            <a class="tabchose" href="{:U('index')}">审核列表</a>
+        </div>
         <h3 class="page_title">{$meta_title}</h3>
+        <p class="description_text">审核通过后的修改申请将覆盖旧值，如果旧公司已被删除，将忽略</p>
     </div>
 
     <div class="cf top_nav_list">
@@ -80,6 +105,13 @@
             </div>
         </div>
     </div>
+    <div class="butnbox" style="margin-bottom: 10px;">
+        <div class="butnlist jscheckbutn" style="margin-left: 2px">
+            <foreach name="menubtn" item="vo" >
+                {$vo}
+             </foreach>
+        </div>
+    </div>
 
     <!-- 数据列表 -->
     <div class="data_list data_game_list">
@@ -88,7 +120,9 @@
                 <!-- 表头 -->
                 <thead>
                 <tr>
-                    
+                    <th style="padding:0 5px;text-indent:0px">
+                        <input class="check-all" type="checkbox">
+                    </th>
                     <th>合同合作方名称</th>
                     <th>对应平台</th>
                     <th>审核类型</th>
@@ -116,10 +150,13 @@
                 <!-- 列表 -->
                 <tbody>
                 <empty name ="listData">
-                    <td colspan="15" class="text-center">aOh! 暂时还没有内容!</td>
+                    <td colspan="16" class="text-center">aOh! 暂时还没有内容!</td>
                     <else />
                     <volist name="listData" id="data">
                         <tr>
+                            <td>
+                                <input class="ids" type="checkbox" data-status="{$data.verify_status}" value="{$data['id']}" name="ids[]" >
+                            </td>
                             <td>{$data.partner_info.partner}</td>
                             <td>{$data.partner_info.matche_platform}</td>
                             <td>{$data.verify_type}</td>
@@ -149,7 +186,7 @@
                                 </if>
                             </td>
                             <td >
-                                <a href="{:U('edit',array('id'=>$data['id'],'action' => 'show'))}">查看</a>
+                                <a href="{:U('verifyView',array('id'=>$data['id']))}">查看</a>
                             </td>
                         </tr> 
                     </volist>     
@@ -272,6 +309,61 @@
                 $("#search").click();
             }
         });
+        $("#adminAgree,#adminRefuse").on("click",function(){
+            var id = $(this).attr("id");
+            if(id=="adminAgree"){
+                var opname = "管理员审批通过";
+                var opurl = "{:U('adminAgree')}";
+                var opst ="[未进行审批]";
+                var status = 0;
+            }else if(id=="adminRefuse"){
+                var opname = "管理员审批拒绝";
+                var opurl = "{:U('adminRefuse')}";
+                var opst ="[未进行审批]";
+                var status = 0;
+            }
+
+            var flag = false;
+            var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
+                if($(elem).data("status") != status){
+                    flag = true;
+                }else{
+                    return $(elem).val();
+                }
+            }).get().join(",");
+            if(text == ''){
+                layer.msg("<font style='color:white'>" + '无需要'+opname+'的申请,仅'+opst+'状态可以进行'+opname+"</font>");
+                return;
+            }
+            if(flag){
+                layer.confirm(opname+"仅会对"+opst+"的申请进行处理，选择中包含其他的状态的申请将被忽略，点击取消停止操作",{title:false}, function(index){    
+                    _doAgreeApply();                
+                    layer.close(index);
+                });  
+            }else{
+                _doAgreeApply();
+            }
+            function _doAgreeApply(){
+                layer.load(2);
+                //执行
+                $.ajax({
+                    type: "POST",
+                    url: opurl,
+                    dataType: 'json',
+                    async: true,
+                    data: {ids:text},
+                    success:function(data){
+                        layer.closeAll('loading');
+                        if(data.status==1){
+                            layer.msg("<font style='color:white'>" + data.info + "</font>");
+                            setTimeout(function(){
+                                window.location.reload();
+                            },1500);
+                        }
+                    }
+                });
+            }
+        })
     });
 </script>
 </block>
diff --git a/Application/Admin/View/Partner/lists.html b/Application/Admin/View/Partner/lists.html
index b0d7c8646..a95940449 100644
--- a/Application/Admin/View/Partner/lists.html
+++ b/Application/Admin/View/Partner/lists.html
@@ -34,6 +34,10 @@
     </style>
 
     <div class="cf main-place top_nav_list navtab_list">
+        <div class="fr">
+            <a  class="tabchose" href="{:U('lists')}">生效列表</a>
+            <a  href="{:U('index')}">审核列表</a>
+        </div>
         <h3 class="page_title">{$meta_title}</h3>
     </div>
 
diff --git a/Application/Admin/View/Partner/show.html b/Application/Admin/View/Partner/show.html
index 1186d24fe..f8cc6004f 100644
--- a/Application/Admin/View/Partner/show.html
+++ b/Application/Admin/View/Partner/show.html
@@ -274,7 +274,7 @@
                 </div>
                 <div class="form-item cf">
                     <!--<input class="submit_btn ajax-post" type="button" value="保存" id="submit"  target-form="form-horizontal" style="margin-left:210px;">-->
-                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('Partner/lists')}" >
+                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();" >
                         返回
                     </a>
                 </div>
diff --git a/Data/update.sql b/Data/update.sql
index e1535ba86..dc818ad2e 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -2102,7 +2102,7 @@ CREATE TABLE `tab_partner_verify` (
   `partner_id` int(11) NOT NULL COMMENT '0新增,其他修改',
   `partner_name` varchar(60) NOT NULL DEFAULT '' COMMENT '上游公司名称',
   `partner_info` text  COMMENT '公司信息',
-  `verify_status` tinyint(1) unsigned NOT NULL DEFAULT '0' COMMENT '状态 -1拒绝 0未审核 1审核通过',
+  `verify_status` tinyint(3)  DEFAULT '0' COMMENT '状态 -1拒绝 0未审核 1审核通过',
   `create_admin_id` int(11) NOT NULL DEFAULT '0' COMMENT '添加人ID',
   `create_admin_account` varchar(60) COMMENT '添加人账号',
   `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间',