From 07ee17ca1d71ad958b018df17cd3fdd6d2a2e920 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 7 Jan 2021 11:21:33 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SocietyInfoController.class.php           |  94 +++++-
 Application/Admin/View/SocietyInfo/add.html   |  14 +
 Application/Admin/View/SocietyInfo/edit.html  |  13 +
 Application/Admin/View/SocietyInfo/lists.html |  70 +++-
 Application/Admin/View/SocietyInfo/view.html  | 300 ++++++++++++++++++
 Data/update.sql                               |   4 +
 6 files changed, 489 insertions(+), 6 deletions(-)
 create mode 100644 Application/Admin/View/SocietyInfo/view.html

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index df90c804e..1880870bd 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -14,6 +14,13 @@ class SocietyInfoController extends ThinkController
 {
     private $modelName = 'SocietyInfo';
     private $admininfo = '';
+    private $level = [
+        0=>'无',
+        1=>'S',
+        2=>'A',
+        3=>'B',
+        4=>'其他'
+    ];
 
     public function _initialize()
     {
@@ -32,6 +39,14 @@ class SocietyInfoController extends ThinkController
             $map['create_account'] = $this->admininfo['username'];
         }
 
+        if ($_REQUEST['text']) {
+            $map['_string'] = "province like '%{$_REQUEST['text']}%' or city like '%{$_REQUEST['text']}%'
+            or company_name like '%{$_REQUEST['text']}%' or register_capital like '%{$_REQUEST['text']}%' or functionary like '%{$_REQUEST['text']}%' 
+            or phone like '%{$_REQUEST['text']}%' or wechat like '%{$_REQUEST['text']}%' or qq like '%{$_REQUEST['text']}%' or game_type like '%{$_REQUEST['text']}%'
+             or game_name like '%{$_REQUEST['text']}%' or join_platform like '%{$_REQUEST['text']}%' or promote_scale like '%{$_REQUEST['text']}%' or turnover= '{$_REQUEST['text']}'
+              or address like '%{$_REQUEST['text']}%' or league_info like '%{$_REQUEST['text']}%' or remark like '%{$_REQUEST['text']}%' or interface_person like '%{$_REQUEST['text']}%'";
+        }
+
         $page = intval(I('get.p', 0));
         $page = $page ? $page : 1; //默认显示第一页数据
         $row = intval(I('row', 0));
@@ -56,6 +71,7 @@ class SocietyInfoController extends ThinkController
         if (I('time_gap', -1) == 0) {
             $map['communication_time'] = array('elt', time() - $gap * 86400);
         }
+        if (I('sociaty_level') && I('sociaty_level') != '0') $map['sociaty_level'] = I('sociaty_level');
         //获取分页数据
         $query = $model->where($map)->order("id desc");
         $count = $query->count();
@@ -79,6 +95,7 @@ class SocietyInfoController extends ThinkController
             return ;
         } else {
             $societyInfos = $model->where($map)->order("id desc")->field("*")->page($page,$row)->select();
+//            dump($societyInfos);die();
         }
 
         //分页
@@ -90,13 +107,25 @@ class SocietyInfoController extends ThinkController
             $this->assign('_page', $page);
         }
 
-        foreach ($societyInfos as &$v) {
+        foreach ($societyInfos as $k => &$v) {
+
+            $v['num'] = $k+1+intval((I('get.p', 0)?I('get.p', 0):1)-1)*$row;
+            $v['sociaty_level_str'] = $this->level[$v['sociaty_level']];
+
             if (time() - $v['communication_time'] > $gap * 86400)
                 $v['is_gap_time'] = 1;
         }
 
         $this->checkListOrCountAuthRestMap($map,[]);
-        $this->assign('timeset_check',$this->checkRule("Admin/SocietyInfo/timeset" ,array('in','1,2')));
+
+        if (IS_ROOT) {
+            $this->assign('timeset_check',true);
+            $this->assign('delset_check',true);
+        } else {
+            $this->assign('timeset_check',$this->checkRule("Admin/SocietyInfo/timeset" ,array('in','1,2')));
+            $this->assign('delset_check',$this->checkRule("Admin/SocietyInfo/delset" ,array('in','1,2')));
+        }
+
 
 //        $this->assign('time_gap', $config['value']);
         $gameTypes = M('game_type', 'tab_')->field("id, type_name")->select();
@@ -212,7 +241,6 @@ class SocietyInfoController extends ThinkController
             }
             $v['partner_info']['company_type'] = $v['partner_info']['company_type'] == 2 ? '个人' : '公司';
 
-
             $contract_start_time = $v['partner_info']['contract_start_time'] ? time_format($v['partner_info']['contract_start_time'], 'Y/m/d') : '-';
             if($v['partner_info']['contract_start_time']){
                 $contract_end_time = $v['partner_info']['contract_end_time'] ? date('Y/m/d', $v['partner_info']['contract_end_time']) : '永久';
@@ -344,6 +372,35 @@ class SocietyInfoController extends ThinkController
         }
     }
 
+    //查看
+    public function view()
+    {
+        $model = M($this->modelName, 'tab_');
+
+
+        $id = intval(I('get.id', 0));
+        $map['id'] = $id;
+        $data = $model->find($id);
+        if (empty($data)) {
+            $this->error('数据异常', U('lists'));
+        }
+        $gameTypes = M('game_type', 'tab_')->field("id, type_name")->select();
+        $myGameTypes = explode('/', $data['game_type']);
+        foreach ($gameTypes as &$v) {
+            $v['check'] = 0;
+            foreach ($myGameTypes as $item) {
+                if ($item == $v['type_name']) {
+                    $v['check'] = 1;
+                }
+            }
+        }
+
+        $this->assign("game_types", $gameTypes);
+        $this->assign('data', $data);
+        $this->meta_title = '编辑';
+        $this->display();
+    }
+
     //删除
     public function del()
     {
@@ -371,6 +428,37 @@ class SocietyInfoController extends ThinkController
         $this->success('删除成功', U('lists'));
     }
 
+    //批量删除
+    public function del_check() {
+        if (!empty($_POST['ids'])) {
+            if (!is_array($_POST['ids'])) {
+                $this->ajaxReturn(['status'=>0,'info'=>'参数异常']);
+//                $this->error('参数异常');
+            }
+
+            $id = implode(',', $_POST['ids']);
+        } else {
+            $id = intval(I('get.id', 0));
+            if ($id == 0) {
+                $this->ajaxReturn(['status'=>0,'info'=>'参数异常']);
+//                $this->error('参数异常');
+            }
+        }
+        $res = M($this->modelName, 'tab_')->delete($id);
+        if ($res === false) {
+//            $this->error('删除失败');
+            $this->ajaxReturn(['status'=>0,'info'=>'删除失败']);
+        }
+        addOperationLog(array(
+            "op_type"=>2,
+            "key"=>$id,
+            "url"=>U("Society/lists")
+        ));
+
+        $this->ajaxReturn(['status'=>1,'info'=>'删除成功']);
+
+    }
+
     // 导入
     public function excelImport() {
         header("Content-Type:text/html;charset=utf-8");
diff --git a/Application/Admin/View/SocietyInfo/add.html b/Application/Admin/View/SocietyInfo/add.html
index 4148f91cd..d6257700f 100644
--- a/Application/Admin/View/SocietyInfo/add.html
+++ b/Application/Admin/View/SocietyInfo/add.html
@@ -111,6 +111,20 @@
                                     <input type="text" name="promote_scale" id="promote_scale" class="input" placeholder="请输入推广规模" maxlength="50">
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="l">公会等级:</td>
+                                <td class="r" style="width: 50px;">
+                                    <select name="sociaty_level" id="sociaty_level" class="select_gallery">
+                                        <option>请选择公会等级</option>
+                                        <option value="1">S</option>
+                                        <option value="2">A</option>
+                                        <option value="3">B</option>
+                                        <option value="4">其他</option>
+                                    </select>
+                                    <span class="notice-text"></span>
+                                </td>
+                            </tr>
+                            <tr>
                             <tr>
                                 <td class="l">流水：</td>
                                 <td class="r table_radio">
diff --git a/Application/Admin/View/SocietyInfo/edit.html b/Application/Admin/View/SocietyInfo/edit.html
index 48539f364..0f2d6612e 100644
--- a/Application/Admin/View/SocietyInfo/edit.html
+++ b/Application/Admin/View/SocietyInfo/edit.html
@@ -120,6 +120,19 @@
                                     <input type="text" value="{$data['promote_scale']}" name="promote_scale" id="promote_scale" class="input" placeholder="请输入推广规模" maxlength="50">
                                 </td>
                             </tr>
+                            <tr>
+                                <td class="l">公会等级:</td>
+                                <td class="r" style="width: 50px;">
+                                    <select name="sociaty_level" id="sociaty_level" class="select_gallery">
+                                        <option>请选择公会等级</option>
+                                        <option value="1" <if condition="$data['sociaty_level'] eq 1">selected</if>>S</option>
+                                        <option value="2" <if condition="$data['sociaty_level'] eq 2">selected</if>>A</option>
+                                        <option value="3" <if condition="$data['sociaty_level'] eq 3">selected</if>>B</option>
+                                        <option value="4" <if condition="$data['sociaty_level'] eq 4">selected</if>>其他</option>
+                                    </select>
+                                    <span class="notice-text"></span>
+                                </td>
+                            </tr>
                             <tr>
                                 <td class="l">流水：</td>
                                 <td class="r table_radio">
diff --git a/Application/Admin/View/SocietyInfo/lists.html b/Application/Admin/View/SocietyInfo/lists.html
index 86f56fdb8..30e46c5fc 100644
--- a/Application/Admin/View/SocietyInfo/lists.html
+++ b/Application/Admin/View/SocietyInfo/lists.html
@@ -75,6 +75,20 @@
                 </select>
             </div>
 
+            <div class="input-list input-list-game search_label_rehab">
+                <select name="sociaty_level" id="sociaty_level" class="select_gallery">
+                    <option value="0">请选择公会等级</option>
+                    <option value="1">S</option>
+                    <option value="2">A</option>
+                    <option value="3">B</option>
+                    <option value="4">其他</option>
+                </select>
+            </div>
+
+            <div class="input-list">
+                <input type="text"  name="text" style="width: 200px" class="" placeholder="快速搜索" value="{:I('text')}"/>&nbsp;
+            </div>
+
             <div class="input-list">
                 <a class="sch-btn" href="javascript:;" id="search" url="{:U('lists','model='.$model['name'] .'&row='.I('row'),false)}">搜索</a>
             </div>
@@ -96,6 +110,11 @@
                     <a class="sch-btn" href="javascript:;" id="downloadexcel" url="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}">导出</a>
                 </if>
             </div>
+            <div class="input-list">
+                <if condition="$delset_check eq true ">
+                    <a class="sch-btn" id="del_check" style="background:red">删除</a>
+                </if>
+            </div>
             <div class="input-list">
                 <if condition="$timeset_check eq true ">
                     <a style="width: 100px;" class="sch-btn" href="javascript:;" id="timeset" data-url="{:U('timeset')}">时间间隔设置</a>
@@ -124,6 +143,8 @@
                 <!-- 表头 -->
                 <thead>
                 <tr>
+                    <th><input class="check-all" type="checkbox"></th>
+                    <th>序号</th>
                     <th>省份</th>
                     <th>城市</th>
                     <th>公司</th>
@@ -136,6 +157,7 @@
                     <th>所做游戏</th>
                     <th>合作平台</th>
                     <th>推广规模</th>
+                    <th>公会等级</th>
                     <th>流水</th>
                     <th>地址</th>
                     <th>联盟信息</th>
@@ -155,10 +177,12 @@
                     <td colspan="22" class="text-center">aOh! 暂时还没有内容!</td>
                     <else />
                     <volist name="listData" id="data">
-                        <tr <if condition="$data['is_gap_time'] eq 1"> style="background: yellow;" </if> >
+                        <tr  >
+                        <td ><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
+                        <td rowspan="{$data.row}">{$data.num}</td>
                             <td rowspan="{$data.row}">{$data.province}</td>
                             <td rowspan="{$data.row}">{$data.city}</td>
-                            <td rowspan="{$data.row}">{$data.company_name}</td>
+                            <td rowspan="{$data.row}"><if condition="$data['is_gap_time'] eq 1"> <span style="color: red">●</span> </if>{$data.company_name}</td>
                             <td rowspan="{$data.row}">{$data.register_capital}</td>
                             <td rowspan="{$data.row}">{$data.functionary}</td>
                             <td rowspan="{$data.row}">{$data.phone}</td>
@@ -168,6 +192,7 @@
                             <td rowspan="{$data.row}">{$data.game_name}</td>
                             <td rowspan="{$data.row}">{$data.join_platform}</td>
                             <td rowspan="{$data.row}">{$data.promote_scale}</td>
+                        <td rowspan="{$data.row}">{$data.sociaty_level_str}</td>
                             <td rowspan="{$data.row}">{$data.turnover}</td>
                             <td rowspan="{$data.row}">{$data.address}</td>
                             <td rowspan="{$data.row}">{$data.league_info}</td>
@@ -182,7 +207,10 @@
 
                             <td rowspan="{$data.row}">
                                 <a href="{:U('edit',array('id'=>$data['id']))}">编辑</a>
-                                <a href="{:U('del',array('id'=>$data['id']))}" class="confirm ajax-get">删除</a>
+                                <a href="{:U('view',array('id'=>$data['id']))}">查看</a>
+                                <if condition="$delset_check eq true ">
+                                    <a href="{:U('del',array('id'=>$data['id']))}" class="confirm ajax-get">删除</a>
+                                </if>
                             </td>
                         </tr>
 
@@ -302,6 +330,42 @@
         });
     }
 
+    $("#del_check").click(function () {
+        var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
+            return $(elem).val();
+        }).get();
+
+        if(text.length < 1){
+            layer.msg("<font style='color:white'>" + '没有需要删除的数据' + "</font>");
+            return;
+        }
+        layer.confirm('删除后将无法恢复，请慎重选择', {
+            btn: ['确认','取消'],
+            title:false
+        }, function(){
+            $.ajax({
+                type: "POST",
+                url: "{:U('del_check')}",
+                dataType: 'json',
+                async: false,
+                data: {ids:text},
+                success:function(data){
+                    if(data.status==1){
+                        layer.msg("<font style='color:white'>" + data.info + "</font>");
+                        setTimeout(function(){
+                            window.location.reload();
+                        },1500);
+                    }else{
+                        layer.msg("<font style='color:white'>" + data.info + "</font>");
+                        return false;
+                    }
+                }
+            });
+        });
+
+    });
+
+
     $(function() {
         areaInit();
         mapInit();
diff --git a/Application/Admin/View/SocietyInfo/view.html b/Application/Admin/View/SocietyInfo/view.html
new file mode 100644
index 000000000..04f57c86c
--- /dev/null
+++ b/Application/Admin/View/SocietyInfo/view.html
@@ -0,0 +1,300 @@
+<extend name="Public/base" />
+<block name="css">
+    <link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all">
+    <link rel="stylesheet" type="text/css" href="__STATIC__/webuploader/webuploader.css" media="all">
+    <style>
+        #form .txt_area.download_url {width:400px;}
+        .tabcon1711 .table_radio2 .table_btn {width:215px;}
+        .tabcon1711 td:first-child{width: 20px; padding-left: 20px;}
+    </style>
+</block>
+<block name="body">
+    <script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
+
+    <script src="__STATIC__/md5.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" src="__STATIC__/webuploader/webuploader.js"></script>
+    <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+    <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js"></script>
+    <script src="__STATIC__/juicer-min.js" type="text/javascript"></script>
+    <script src="__STATIC__/area.js" type="text/javascript" charset="utf-8"></script>
+
+    <!-- 标签页导航 -->
+    <div class="tab-wrap">
+        <div class="cf main-place top_nav_list navtab_list">
+            <h3 class="page_title">{$meta_title}</h3>
+        </div>
+
+        <div class="tab-content tabcon1711">
+            <!-- 表单 -->
+            <form id="form" action="{:U('edit')}" method="post" class="form-horizontal" autocomplete="off">
+                <input value="{$data['id']}" name="id" type="hidden">
+                <!-- 基础 -->
+                <div id="tab1" class="tab1">
+                    <table  border="0" cellspacing="0" cellpadding="0">
+                        <tbody>
+                            <tr>
+                                <td class="l">省份:</td>
+                                <td class="r" style="width: 50px;">
+                                  <select name="province" id="province" class="select_gallery" disabled>
+                                  </select>
+                                  <span class="notice-text"></span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">城市:</td>
+                                <td class="r" style="width: 50px;">
+                                    <select name="city" id="city" class="select_gallery" disabled>
+                                    </select>
+                                    <span class="notice-text"></span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">公司：</td>
+                                <td class="r table_radio">
+                                  <input type="text" value="{$data['company_name']}" name="company_name" id="company_name" class="input" placeholder="请输入公司名称" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">注册资本：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['register_capital']}" name="register_capital" id="register_capital" class="input" placeholder="请输入注册资本" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">负责人：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['functionary']}" name="functionary" id="functionary" class="input" placeholder="请输入负责人" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">电话：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['phone']}" name="phone" id="phone" class="input" placeholder="请输入电话" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">微信：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['wechat']}" name="wechat" id="wechat" class="input" placeholder="请输入微信" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">QQ：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['qq']}" name="qq" id="qq" class="input" placeholder="请输入QQ" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">游戏类型：</td>
+                                <!--<input id="game_type" name="game_type" type="hidden" value="{$game_types[0]['type_name']}">-->
+                                <td class="r" style="">
+                                    <volist name="game_types" id="vo">
+                                        <span style="margin-right:18px;">{$vo['type_name']}: <input type="checkbox" name="game_types[]" value="{$vo['type_name']}" <if condition="$vo['check'] eq 1">checked</if> disabled></span>
+                                    </volist>
+                                    <!--<select name="game_type_id" id="game_type_id" class="select_gallery">
+                                        <volist name="game_types" id="vo">
+                                            <option value="<?=$vo['id']?>" <if condition="$data['game_type_id'] eq $vo['id']">selected</if> >{$vo['type_name']}</option>
+                                        </volist>
+                                    </select>-->
+                                    <span class="notice-text"></span>
+                                </td>
+                                <!--<script>$("#game_type_id").change(function() {
+                                    $("#game_type").val($("#game_type_id option:selected").text());
+                                });</script>-->
+                            </tr>
+                            <tr>
+                                <td class="l">所做游戏：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['game_name']}" name="game_name" id="game_name" class="input" placeholder="请输入所做游戏" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">合作平台：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['join_platform']}" name="join_platform" id="join_platform" class="input" placeholder="请输入合作平台" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">推广规模：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['promote_scale']}" name="promote_scale" id="promote_scale" class="input" placeholder="请输入推广规模" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">公会等级:</td>
+                                <td class="r" style="width: 50px;">
+                                    <select name="sociaty_level" id="sociaty_level" class="select_gallery" disabled>
+                                        <option>请选择公会等级</option>
+                                        <option value="1" <if condition="$data['sociaty_level'] eq 1">selected</if>>S</option>
+                                        <option value="2" <if condition="$data['sociaty_level'] eq 2">selected</if>>A</option>
+                                        <option value="3" <if condition="$data['sociaty_level'] eq 3">selected</if>>B</option>
+                                        <option value="4" <if condition="$data['sociaty_level'] eq 4">selected</if>>其他</option>
+                                    </select>
+                                    <span class="notice-text"></span>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">流水：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['turnover']}" name="turnover" id="turnover" class="input" placeholder="请输入流水" maxlength="50" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">地址：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['address']}" name="address" id="address" class="input" placeholder="请输入地址" maxlength="100" disabled>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td class="l">联盟信息：</td>
+                                <td class="r table_radio">
+                                    <input type="text" value="{$data['league_info']}" name="league_info" id="league_info" class="input" placeholder="请输入联盟信息" maxlength="50" disabled>
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td class="l noticeinfo">是否为意向客户：</td>
+                                <td class="r table_radio">
+                                <span class="form_radio table_btn">
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="0"  name="is_potential" <if condition="$data['is_potential'] eq 0">checked</if> disabled> 否
+                                    </label>
+                                    <label>
+                                        <input type="radio" class="inp_radio" value="1"  name="is_potential" <if condition="$data['is_potential'] eq 1">checked</if> disabled> 是
+                                    </label>
+                                </span>
+                                    <span class="notice-text"></span>
+                                </td>
+                            </tr>
+
+                            <tr>
+                                <td class="l">备注信息：</td>
+                                <td class="r">
+                                    <textarea name="remark" class="txt" placeholder="请输入备注信息" maxlength="100" disabled>{$data['remark']}</textarea>
+                                </td>
+                            </tr>
+
+                            <!--<tr>
+                                <td class="l">沟通时间：</td>
+                                <td class="r">
+                                    <input type="text" class="txt time time1" name="communication_time" value="" placeholder="请选择沟通时间">
+                                </td>
+                            </tr>-->
+                            <tr>
+                                <td class="l">对接人：</td>
+                                <td class="r">
+                                    <input type="text" class="txt" name="interface_person" value="{$data['interface_person']}" placeholder="对接人" disabled>
+                                </td>
+                            </tr>
+
+
+                        </tbody>
+                    </table>
+                </div>
+                <div class="form-item cf">
+                    <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('SocietyInfo/lists')}" >
+                        返回
+                    </a>
+                </div>
+            </form>
+        </div>
+    </div>
+
+    <div class="common_settings">
+        <span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
+        <form class="addShortcutIcon">
+            <input type="hidden" name="title" value="{$meta_title}">
+            <input type="hidden" name="url" value="SocietyInfo/add">
+        </form>
+        <a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
+    </div>
+
+</block>
+
+<block name="script">
+    <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+    <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+    <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
+    <script type="text/javascript">
+
+
+    $(function() {
+        areaInit();
+
+        var province = document.getElementById('province');
+        //给选择框一个高度，可直接写进数据，不然要先创建dom元素option再录值
+        province.length=provinces.length;
+        for(var i=0;i<provinces.length;i++){
+            if (province.options[i].text == "{$data['province']}"
+            || province.options[i].text.substring(0, 2) == "{$data['province']}".substring(0, 2)
+            ) {
+                province.selectedIndex = province.options[i].index;
+                province.options[i].selected = true;
+                $("#province").change();
+                break;
+            }
+        }
+
+        var city = document.getElementById('city');
+        city.length=citys.length;
+        for(var i=0;i<citys.length;i++){
+            if (city.options[i].text == "{$data['city']}"
+            || city.options[i].text.substring(0, 2) == "{$data['city']}".substring(0, 2)
+            ) {
+                city.selectedIndex = city.options[i].index;
+                city.options[i].selected = true;
+                break;
+            }
+        }
+    });
+
+        $('.time1').datetimepicker({
+            format: 'yyyy-mm-dd H:i:0',
+            language:"zh-CN",
+            minView: 0,
+            autoclose:true,
+            showClear: true,
+        });
+
+
+        //导航高亮
+        highlight_subnav("{:U('SocietyInfo/lists')}");
+    </script>
+
+    <script>
+
+        $("#submit").on("click",function(){
+            var cres = $('form').serializeArray();
+            if ($("#province").val() == "请选择省份" || !$("#province").val()) {
+                // layer.msg('请选择省份');return ;
+            }
+            if (!$("#city").val()) {
+                // layer.msg('请选择城市');return ;
+            }
+            if (!$("#company_name").val()) {
+                layer.msg('请输入公司名');return ;
+            }
+
+            //添加
+            $.ajax({
+                url:"{:U('SocietyInfo/edit')}",
+                type:"post",
+                data:cres,
+                dataType:"json",
+                success:function(data){
+                    if(data.status == 1){
+                        layer.msg(data.info,function(){
+                            window.location.href="{:U('SocietyInfo/lists')}";
+                        });
+                    }else{
+                        layer.msg(data.info);
+                    }
+                },
+                error:function(e){
+                }
+            });
+        });
+
+    </script>
+</block>
diff --git a/Data/update.sql b/Data/update.sql
index 308fb3613..e93329e71 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -2781,3 +2781,7 @@ ALTER TABLE `tab_testing_resource_batch`
 ADD COLUMN `verify_admin_id` int(11) NOT NULL DEFAULT 0 COMMENT '審核管理員ID' AFTER `verify_status`;
 ALTER TABLE `tab_testing_resource_batch`
 ADD COLUMN `apply_admin_id` int(11) NOT NULL DEFAULT 0 COMMENT '申請管理員ID' AFTER `apply_promote_id`;
+
+
+ALTER TABLE `tab_society_info`
+ADD COLUMN `sociaty_level` tinyint(2) NOT NULL DEFAULT 0 COMMENT '公会等级 1：S 2：A  3：B 4：其他  ' AFTER `create_account`;
\ No newline at end of file

From 9fceedd10e957b9a248c2c7af996b2af69fb0559 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 7 Jan 2021 15:23:59 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketPercentageController.class.php      | 878 +++++++++---------
 .../View/MarketPercentage/addcoefficient.html |   3 +
 .../ExcelPaymentController.class.php          |  28 +
 .../Payment/View/ExcelPayment/add.html        |   3 +
 Public/Admin/excel/coefficient.xlsx           | Bin 0 -> 41121 bytes
 Public/Admin/excel/underPayment.xlsx          | Bin 0 -> 41329 bytes
 6 files changed, 491 insertions(+), 421 deletions(-)
 create mode 100644 Public/Admin/excel/coefficient.xlsx
 create mode 100644 Public/Admin/excel/underPayment.xlsx

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 0a724f3dc..77f8e064d 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -16,42 +16,43 @@ class MarketPercentageController extends ThinkController
     protected function _initialize()
     {
 
-        $coefficient_data = M("coefficient","tab_")->where("1=1")->select();
+        $coefficient_data = M("coefficient", "tab_")->where("1=1")->select();
 
         foreach ($coefficient_data as $key => $value) {
 
-            $this->coefficient[$value['pay_time']][$value['admin_id']] = $value['coefficient']/100;
+            $this->coefficient[$value['pay_time']][$value['admin_id']] = $value['coefficient'] / 100;
 
         }
         parent::_initialize();
     }
 
-    public function index($row = 10, $p = 1){
+    public function index($row = 10, $p = 1)
+    {
 
         $map = [];
 
 //        $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):'';
-        $_REQUEST['promote_id']?($map['promote_id'] = $_REQUEST['promote_id']):'';
-        $_REQUEST['relation_game_id']?($map['relation_game_id'] = $_REQUEST['relation_game_id']):'';
+        $_REQUEST['promote_id'] ? ($map['promote_id'] = $_REQUEST['promote_id']) : '';
+        $_REQUEST['relation_game_id'] ? ($map['relation_game_id'] = $_REQUEST['relation_game_id']) : '';
         // $_REQUEST['sdk_version']?($map['sdk_version'] = $_REQUEST['sdk_version']):'';
-        $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
-        ($_REQUEST['company_id']||$_REQUEST['company_id']=='0')?($map['company_id'] = $_REQUEST['company_id']):'';
+        $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
+        ($_REQUEST['company_id'] || $_REQUEST['company_id'] == '0') ? ($map['company_id'] = $_REQUEST['company_id']) : '';
 
         $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
         $map['admin_id'] = $admin_id;
         $map['is_settlement'] = 1;
-        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
+        if (is_administrator() || session('user_group_id') == 15 || session('user_group_id') == 14 || session('user_group_id') == 19 || session('user_group_id') == 23) {
             unset($map['admin_id']);
             $admin_data = M("member")
                 ->field("access.uid admin_id")
                 ->join("left join sys_auth_group_access access on sys_member.uid = access.uid")
                 ->join("left join sys_auth_group auth on access.group_id=auth.id")
-                ->where(['group_id'=>['in','11,12,21']])
+                ->where(['group_id' => ['in', '11,12,21']])
                 ->select();
             if ($admin_data) {
-                $map['admin_id'] = ['in',array_column($admin_data,'admin_id')];
+                $map['admin_id'] = ['in', array_column($admin_data, 'admin_id')];
             }
-            $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
+            $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
         }
 
         $search_date = [];
@@ -64,7 +65,7 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -72,14 +73,14 @@ class MarketPercentageController extends ThinkController
 
         } elseif (isset($_REQUEST['time_start'])) {
 
-            $end = date("Y-m",time());
+            $end = date("Y-m", time());
             $start = $_REQUEST['time_start'];
             $i = 0;
             do {
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -94,7 +95,7 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -103,7 +104,7 @@ class MarketPercentageController extends ThinkController
 //        dump($map);die();
 //        var_dump($map);die();
 
-        $data = SM("settleup_marketorder","tab_")
+        $data = SM("settleup_marketorder", "tab_")
             ->field("pay_time,promote_account,company_name,company_belong,real_name,develop_type,game_name,
             sum(pay_amount) pay_amount,sum(cp_amount) cp_amount,sum(promote_amount) promote_amount,
             sum(channel_amount) channel_amount, sum(company_tax) company_tax,sum(company_profit) company_profit");
@@ -121,14 +122,14 @@ class MarketPercentageController extends ThinkController
                 ->select();
         }
 
-        $sum = SM("settleup_marketorder","tab_")
+        $sum = SM("settleup_marketorder", "tab_")
             ->field("pay_time,promote_account,company_belong,real_name,develop_type,game_name,
             sum(pay_amount) pay_amount,sum(cp_amount) cp_amount,sum(promote_amount) promote_amount,
             sum(channel_amount) channel_amount, sum(company_tax) company_tax,sum(company_profit) company_profit")
             ->where($map)
             ->find();
 
-        $this->assign("sum",$sum);
+        $this->assign("sum", $sum);
 
         foreach ($data as $key => $value) {
 
@@ -156,7 +157,7 @@ class MarketPercentageController extends ThinkController
         if ($_REQUEST['export']) {
 
             $title = ['pay_time' => '时间',
-                'company_name'=>'公司名称',
+                'company_name' => '公司名称',
                 'promote_account' => '会长账号',
                 'company_belong' => '内外团',
                 'real_name' => '所属市场专员',
@@ -170,7 +171,7 @@ class MarketPercentageController extends ThinkController
                 'company_profit' => '税后毛利额'];
 
             foreach ($data as $key => $value) {
-                $data[$key]['pay_time'] = '`'.$data[$key]['pay_time'];
+                $data[$key]['pay_time'] = '`' . $data[$key]['pay_time'];
             }
 
             $sum['pay_time'] = '';
@@ -180,12 +181,12 @@ class MarketPercentageController extends ThinkController
             $sum['develop_type'] = '';
             $sum['game_name'] = '';
 
-            $data = array_merge($data,[$sum]);
+            $data = array_merge($data, [$sum]);
 
-            data2csv($data,'市场毛利统计',$title);
+            data2csv($data, '市场毛利统计', $title);
         }
 
-        $count = SM("settleup_marketorder","tab_")
+        $count = SM("settleup_marketorder", "tab_")
             ->field("promote_id,game_name,pay_time,admin_id")
             ->where($map)
             ->group("promote_id,game_name,pay_time,admin_id")
@@ -197,39 +198,40 @@ class MarketPercentageController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
-        $this->checkListOrCountAuthRestMap($map,[]);
+        $this->checkListOrCountAuthRestMap($map, []);
 
-        $this->assign("list_data",$data);
+        $this->assign("list_data", $data);
         $this->display();
 
     }
 
-    public function indexuncaculate($row = 10, $p = 1){
+    public function indexuncaculate($row = 10, $p = 1)
+    {
 
         $map = [];
 
 //        $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):'';
-        $_REQUEST['promote_id']?($map['promote_id'] = $_REQUEST['promote_id']):'';
-        $_REQUEST['relation_game_id']?($map['relation_game_id'] = $_REQUEST['relation_game_id']):'';
-        $_REQUEST['sdk_version']?($map['sdk_version'] = $_REQUEST['sdk_version']):'';
-        $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
-        ($_REQUEST['company_id']||$_REQUEST['company_id']=='0')?($map['company_id'] = $_REQUEST['company_id']):'';
+        $_REQUEST['promote_id'] ? ($map['promote_id'] = $_REQUEST['promote_id']) : '';
+        $_REQUEST['relation_game_id'] ? ($map['relation_game_id'] = $_REQUEST['relation_game_id']) : '';
+        $_REQUEST['sdk_version'] ? ($map['sdk_version'] = $_REQUEST['sdk_version']) : '';
+        $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
+        ($_REQUEST['company_id'] || $_REQUEST['company_id'] == '0') ? ($map['company_id'] = $_REQUEST['company_id']) : '';
 
         $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
         $map['admin_id'] = $admin_id;
         $map['is_settlement'] = 0;
-        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
+        if (is_administrator() || session('user_group_id') == 15 || session('user_group_id') == 14 || session('user_group_id') == 19 || session('user_group_id') == 23) {
             unset($map['admin_id']);
             $admin_data = M("member")
                 ->field("access.uid admin_id")
                 ->join("left join sys_auth_group_access access on sys_member.uid = access.uid")
                 ->join("left join sys_auth_group auth on access.group_id=auth.id")
-                ->where(['group_id'=>['in','11,12,21']])
+                ->where(['group_id' => ['in', '11,12,21']])
                 ->select();
             if ($admin_data) {
-                $map['admin_id'] = ['in',array_column($admin_data,'admin_id')];
+                $map['admin_id'] = ['in', array_column($admin_data, 'admin_id')];
             }
-            $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
+            $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
         }
 
         $search_date = [];
@@ -242,7 +244,7 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -250,14 +252,14 @@ class MarketPercentageController extends ThinkController
 
         } elseif (isset($_REQUEST['time_start'])) {
 
-            $end = date("Y-m",time());
+            $end = date("Y-m", time());
             $start = $_REQUEST['time_start'];
             $i = 0;
             do {
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -272,7 +274,7 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -281,7 +283,7 @@ class MarketPercentageController extends ThinkController
 //        dump($map);die();
 //        var_dump($map);die();
 
-        $data = M("settleup_marketorder","tab_")
+        $data = M("settleup_marketorder", "tab_")
             ->field("pay_time,promote_account,company_name,company_belong,member.real_name,develop_type,game_name,
             sum(pay_amount) pay_amount,sum(cp_amount) cp_amount,sum(promote_amount) promote_amount,
             sum(channel_amount) channel_amount, sum(company_tax) company_tax,sum(company_profit) company_profit")
@@ -300,14 +302,14 @@ class MarketPercentageController extends ThinkController
                 ->select();
         }
 
-        $sum = M("settleup_marketorder","tab_")
+        $sum = M("settleup_marketorder", "tab_")
             ->field("pay_time,promote_account,company_belong,real_name,develop_type,game_name,
             sum(pay_amount) pay_amount,sum(cp_amount) cp_amount,sum(promote_amount) promote_amount,
             sum(channel_amount) channel_amount, sum(company_tax) company_tax,sum(company_profit) company_profit")
             ->where($map)
             ->find();
 
-        $this->assign("sum",$sum);
+        $this->assign("sum", $sum);
 
         foreach ($data as $key => $value) {
 
@@ -335,7 +337,7 @@ class MarketPercentageController extends ThinkController
         if ($_REQUEST['export']) {
 
             $title = ['pay_time' => '时间',
-                'company_name'=>'公司名称',
+                'company_name' => '公司名称',
                 'promote_account' => '会长账号',
                 'company_belong' => '内外团',
                 'real_name' => '所属市场专员',
@@ -349,7 +351,7 @@ class MarketPercentageController extends ThinkController
                 'company_profit' => '税后毛利额'];
 
             foreach ($data as $key => $value) {
-                $data[$key]['pay_time'] = '`'.$data[$key]['pay_time'];
+                $data[$key]['pay_time'] = '`' . $data[$key]['pay_time'];
             }
 
             $sum['pay_time'] = '';
@@ -359,12 +361,12 @@ class MarketPercentageController extends ThinkController
             $sum['develop_type'] = '';
             $sum['game_name'] = '';
 
-            $data = array_merge($data,[$sum]);
+            $data = array_merge($data, [$sum]);
 
-            data2csv($data,'市场毛利统计(不结算)',$title);
+            data2csv($data, '市场毛利统计(不结算)', $title);
         }
 
-        $count = M("settleup_marketorder","tab_")
+        $count = M("settleup_marketorder", "tab_")
             ->where($map)
             ->group("promote_id,game_name,pay_time,admin_id")
             ->select(false);
@@ -375,17 +377,18 @@ class MarketPercentageController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
-        $this->checkListOrCountAuthRestMap($map,[]);
+        $this->checkListOrCountAuthRestMap($map, []);
 
-        $this->assign("list_data",$data);
+        $this->assign("list_data", $data);
         $this->display();
 
     }
 
-    public function addcoefficient() {
+    public function addcoefficient()
+    {
 
-        $batch = date('Ymd').date('His').sp_random_num(3);
-        $this->assign("batch",$batch);
+        $batch = date('Ymd') . date('His') . sp_random_num(3);
+        $this->assign("batch", $batch);
         $this->meta_title = 'EXCEL导入';
         $this->display();
 
@@ -398,12 +401,12 @@ class MarketPercentageController extends ThinkController
 //        $batch = $p['batch'];
         $checkarr = $p['checkarr'];
         //循环获取添加
-        if(count($checkarr) < 1){
-            $this->ajaxReturn(["status"=>1,"msg"=>"ok"]);
+        if (count($checkarr) < 1) {
+            $this->ajaxReturn(["status" => 1, "msg" => "ok"]);
         }
 
         $data = M("auth_group")
-            ->where(['title'=>['like','%市场专员%']])
+            ->where(['title' => ['like', '%市场专员%']])
             ->select(false);
 
         $member = M("auth_group_access")
@@ -415,46 +418,46 @@ class MarketPercentageController extends ThinkController
 
         $handle_member = [];
 
-        foreach($member as $key => $value) {
+        foreach ($member as $key => $value) {
 
             $handle_member[$value['real_name']] = $value;
 
         }
 
         $save = [];
-        $coefficient = M('coefficient',"tab_");
+        $coefficient = M('coefficient', "tab_");
 
         foreach ($checkarr as $k => $v) {
 
-            if(!strtotime($v['pay_time'])) {
-                $this->ajaxReturn(["status"=>0,"msg"=>"导入失败，序号{$v['sort']}行日期格式错误"]);
+            if (!strtotime($v['pay_time'])) {
+                $this->ajaxReturn(["status" => 0, "msg" => "导入失败，序号{$v['sort']}行日期格式错误"]);
             }
 
             if ($handle_member[$v['nickname']]) {
-                if ($save[$v['nickname'].$v['pay_time']]) {
-                    $this->ajaxReturn(["status"=>0,"msg"=>"导入失败，序号{$v['sort']}行存在重复记录"]);
+                if ($save[$v['nickname'] . $v['pay_time']]) {
+                    $this->ajaxReturn(["status" => 0, "msg" => "导入失败，序号{$v['sort']}行存在重复记录"]);
                 }
 
                 $hav_coefficient = $coefficient
-                    ->where(['admin_id'=>$handle_member[$v['nickname']]['uid'],'pay_time'=>$v['pay_time']])
+                    ->where(['admin_id' => $handle_member[$v['nickname']]['uid'], 'pay_time' => $v['pay_time']])
                     ->find();
 
                 if ($hav_coefficient) {
-                    $this->ajaxReturn(["status"=>0,"msg"=>"导入失败，日期{$v['pay_time']}市场员{$handle_member[$v['nickname']]['real_name']}已经存在,请勿重复导入"]);
+                    $this->ajaxReturn(["status" => 0, "msg" => "导入失败，日期{$v['pay_time']}市场员{$handle_member[$v['nickname']]['real_name']}已经存在,请勿重复导入"]);
                 }
 
-                $save[$v['nickname'].$v['pay_time']]['pay_time'] = $v['pay_time'];
-                $save[$v['nickname'].$v['pay_time']]['real_name'] = $handle_member[$v['nickname']]['real_name'];
-                $save[$v['nickname'].$v['pay_time']]['admin_id'] = $handle_member[$v['nickname']]['uid'];
-                $save[$v['nickname'].$v['pay_time']]['nickname'] = $handle_member[$v['nickname']]['nickname'];
-                $save[$v['nickname'].$v['pay_time']]['coefficient'] = $v['coefficient']*100;
+                $save[$v['nickname'] . $v['pay_time']]['pay_time'] = $v['pay_time'];
+                $save[$v['nickname'] . $v['pay_time']]['real_name'] = $handle_member[$v['nickname']]['real_name'];
+                $save[$v['nickname'] . $v['pay_time']]['admin_id'] = $handle_member[$v['nickname']]['uid'];
+                $save[$v['nickname'] . $v['pay_time']]['nickname'] = $handle_member[$v['nickname']]['nickname'];
+                $save[$v['nickname'] . $v['pay_time']]['coefficient'] = $v['coefficient'] * 100;
 
                 if ($v['coefficient'] > 1) {
-                    $this->ajaxReturn(["status"=>0,"msg"=>"导入失败，序号{$v['sort']}行系数错误,系数超过最大值1"]);
+                    $this->ajaxReturn(["status" => 0, "msg" => "导入失败，序号{$v['sort']}行系数错误,系数超过最大值1"]);
                 }
 
             } else {
-                $this->ajaxReturn(["status"=>0,"msg"=>"导入失败，导入的市场员{$v['nickname']}不存在"]);
+                $this->ajaxReturn(["status" => 0, "msg" => "导入失败，导入的市场员{$v['nickname']}不存在"]);
             }
 
         }
@@ -462,87 +465,87 @@ class MarketPercentageController extends ThinkController
         $save = array_values($save);
 
         if ($coefficient->addAll($save)) {
-            $this->ajaxReturn(["status"=>1,"msg"=>"导入成功"]);
+            $this->ajaxReturn(["status" => 1, "msg" => "导入成功"]);
         }
 
     }
 
-    public function coefficientSave() {
+    public function coefficientSave()
+    {
 
-        $pay_time =date('Y-m',strtotime(date('Y',time()).'-'.(date('m',time())-1).'-01'));
+        $pay_time = date('Y-m', strtotime(date('Y', time()) . '-' . (date('m', time()) - 1) . '-01'));
 
         if ($_REQUEST['is_get']) {
             unset($_GET['is_get']);
             $data = $_GET;
 
-            $if_coefficientSave = M("market_altogether","tab_")
+            $if_coefficientSave = M("market_altogether", "tab_")
                 ->where([
-                    'pay_time'=>$pay_time,
-                    'market_check'=>1
+                    'pay_time' => $pay_time,
+                    'market_check' => 1
                 ])
                 ->find();
 
             if ($if_coefficientSave) {
-                $this->ajaxReturn(['status'=>0,'msg'=>"市场部已确认，绩效系数再不可修改"]);
+                $this->ajaxReturn(['status' => 0, 'msg' => "市场部已确认，绩效系数再不可修改"]);
             }
 
             $admin = $_SESSION['onethink_admin']['user_auth']['username'];
-            $coefficient_check_detail = "已审批（{$admin}）<br>".date("Y-m-d H:i:s",time());
+            $coefficient_check_detail = "已审批（{$admin}）<br>" . date("Y-m-d H:i:s", time());
             $marketSave['coefficient_check'] = 1;
             $marketSave['coefficient_check_detail'] = $coefficient_check_detail;
 
             foreach ($data as $key => $value) {
                 //解析键值信息
-                $info = explode('-',$key);
+                $info = explode('-', $key);
                 $save['nickname'] = $info[0];
                 $save['admin_id'] = $info[1];
                 $save['real_name'] = $info[2];
-                $save['coefficient'] = $value*100;
+                $save['coefficient'] = $value * 100;
 
                 $save['pay_time'] = $pay_time;
 
-                $is_hav = M("coefficient","tab_")
+                $is_hav = M("coefficient", "tab_")
                     ->where([
-                        'pay_time'=>$save['pay_time'],
-                        'admin_id'=>$save['admin_id']
+                        'pay_time' => $save['pay_time'],
+                        'admin_id' => $save['admin_id']
                     ])
                     ->find();
                 if ($is_hav) {
 
                     if ($is_hav['coefficient'] != $save['coefficient']) {
                         $save['update_time'] = time();
-                        M("coefficient","tab_")
+                        M("coefficient", "tab_")
                             ->where([
-                                'pay_time'=>$save['pay_time'],
-                                'admin_id'=>$save['admin_id']
-                            ])->save(['coefficient'=>$save['coefficient']]);
+                                'pay_time' => $save['pay_time'],
+                                'admin_id' => $save['admin_id']
+                            ])->save(['coefficient' => $save['coefficient']]);
                     }
-                    M("market_altogether","tab_")->where([
-                        'pay_time'=>$save['pay_time'],
-                        'admin_id'=>$save['admin_id']
+                    M("market_altogether", "tab_")->where([
+                        'pay_time' => $save['pay_time'],
+                        'admin_id' => $save['admin_id']
                     ])->save($marketSave);
 
 
-
                 } else {
                     $save['create_time'] = time();
-                    M("coefficient","tab_")->add($save);
-                    M("market_altogether","tab_")->where([
-                        'pay_time'=>$save['pay_time'],
-                        'admin_id'=>$save['admin_id']
+                    M("coefficient", "tab_")->add($save);
+                    M("market_altogether", "tab_")->where([
+                        'pay_time' => $save['pay_time'],
+                        'admin_id' => $save['admin_id']
                     ])->save($marketSave);
 
                 }
 
             }
 
-            $this->ajaxReturn(['status'=>1,'msg'=>"绩效系数编辑成功"]);
+            $this->ajaxReturn(['status' => 1, 'msg' => "绩效系数编辑成功"]);
 
 
         } else {
 
             $data = M("auth_group")
-                ->where(['title'=>['like','%市场专员%']])
+                ->where(['title' => ['like', '%市场专员%']])
                 ->select(false);
 
             $data = M("auth_group_access")
@@ -553,49 +556,50 @@ class MarketPercentageController extends ThinkController
                 ->where("auth.title is not null")
                 ->select();
 
-            $this->assign('list_data',$data);
+            $this->assign('list_data', $data);
 
             $this->display("coefficient");
         }
 
     }
 
-    public function marketStaffSettle($row = 10, $p = 1) {
+    public function marketStaffSettle($row = 10, $p = 1)
+    {
 
         $map = [];
 
-        $map['group_id'] = ['in','11,12,21'];
+        $map['group_id'] = ['in', '11,12,21'];
         //获取权限
         $marketPercentage = M("auth_group")->where($map)->getField("id,market_percentage");
 
 //        $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):'';
-        $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
-        $_REQUEST['group_id']?($map['level'] = $_REQUEST['group_id']):'';
+        $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
+        $_REQUEST['group_id'] ? ($map['level'] = $_REQUEST['group_id']) : '';
 
 
         $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
         $map['admin_id'] = $admin_id;
-        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
+        if (is_administrator() || session('user_group_id') == 15 || session('user_group_id') == 14 || session('user_group_id') == 19 || session('user_group_id') == 23) {
             unset($map['admin_id']);
 
-            $markerData = M("ucenter_member")->field("id")->where(['work_status'=>1])->select();
+            $markerData = M("ucenter_member")->field("id")->where(['work_status' => 1])->select();
 
             if ($markerData) {
-                $admin_map['sys_member.uid'] = ['not in',array_column($markerData,'id')];
+                $admin_map['sys_member.uid'] = ['not in', array_column($markerData, 'id')];
             }
 
             $admin_data = M("member")
                 ->field("access.uid admin_id")
                 ->join("left join sys_auth_group_access access on sys_member.uid = access.uid")
                 ->join("left join sys_auth_group auth on access.group_id=auth.id")
-                ->where(['group_id'=>['in','11,12,21']])
+                ->where(['group_id' => ['in', '11,12,21']])
                 ->where($admin_map)
                 ->select();
             if ($admin_data) {
-                $map['admin_id'] = ['in',array_column($admin_data,'admin_id')];
+                $map['admin_id'] = ['in', array_column($admin_data, 'admin_id')];
             }
-            if (!in_array($_REQUEST['admin_id'],array_column($markerData,'id'))) {
-                $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
+            if (!in_array($_REQUEST['admin_id'], array_column($markerData, 'id'))) {
+                $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
             } else {
                 $this->display("marketstaffsettle");
                 die();
@@ -613,7 +617,7 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -621,14 +625,14 @@ class MarketPercentageController extends ThinkController
 
         } elseif (isset($_REQUEST['time_start'])) {
 
-            $end = date("Y-m",time());
+            $end = date("Y-m", time());
             $start = $_REQUEST['time_start'];
             $i = 0;
             do {
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -643,20 +647,20 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
             }
         }
 
-        $_REQUEST['time_start']?($start_time = date("Y-m-1",strtotime($_REQUEST['time_start']))):'';
-        $_REQUEST['time_end']?($end_time = date("Y-m-t",strtotime($_REQUEST['time_end']))):'';
+        $_REQUEST['time_start'] ? ($start_time = date("Y-m-1", strtotime($_REQUEST['time_start']))) : '';
+        $_REQUEST['time_end'] ? ($end_time = date("Y-m-t", strtotime($_REQUEST['time_end']))) : '';
 
-        $this->assign('start_time',$start_time);
-        $this->assign('end_time',$end_time);
+        $this->assign('start_time', $start_time);
+        $this->assign('end_time', $end_time);
 
-        $data = SM("market_altogether","tab_")
+        $data = SM("market_altogether", "tab_")
             ->where($map);
 
 
@@ -673,7 +677,7 @@ class MarketPercentageController extends ThinkController
                 ->select();
         }
 
-        $count = SM("market_altogether","tab_")
+        $count = SM("market_altogether", "tab_")
             ->where($map)
             ->count();
 
@@ -681,32 +685,32 @@ class MarketPercentageController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
-        $this->checkListOrCountAuthRestMap($map,[]);
+        $this->checkListOrCountAuthRestMap($map, []);
 
-        if(IS_ROOT){
-            $this->assign('coefficient_check',true);
-            $this->assign('market_check',true);
-            $this->assign('finance_check',true);
-            $this->assign('coefficient_in_check',true);
-        }else {
+        if (IS_ROOT) {
+            $this->assign('coefficient_check', true);
+            $this->assign('market_check', true);
+            $this->assign('finance_check', true);
+            $this->assign('coefficient_in_check', true);
+        } else {
             $exportRule = strtolower(MODULE_NAME . '/' . CONTROLLER_NAME . '/' . ACTION_NAME . "_coefficient_check");
-            $this->assign('coefficient_check',$this->checkRule($exportRule,array('in','1,2')));
+            $this->assign('coefficient_check', $this->checkRule($exportRule, array('in', '1,2')));
             $exportRule = strtolower(MODULE_NAME . '/' . CONTROLLER_NAME . '/' . ACTION_NAME . "_market_check");
-            $this->assign('market_check',$this->checkRule($exportRule,array('in','1,2')));
+            $this->assign('market_check', $this->checkRule($exportRule, array('in', '1,2')));
             $exportRule = strtolower(MODULE_NAME . '/' . CONTROLLER_NAME . '/' . ACTION_NAME . "_finance_check");
-            $this->assign('finance_check',$this->checkRule($exportRule,array('in','1,2')));
+            $this->assign('finance_check', $this->checkRule($exportRule, array('in', '1,2')));
             $exportRule = strtolower(MODULE_NAME . '/' . CONTROLLER_NAME . '/' . ACTION_NAME . "_coefficient_in_check");
-            $this->assign('coefficient_in_check',$this->checkRule($exportRule,array('in','1,2')));
+            $this->assign('coefficient_in_check', $this->checkRule($exportRule, array('in', '1,2')));
         }
 
-        $all_data = SM("market_altogether","tab_")
+        $all_data = SM("market_altogether", "tab_")
 //            ->where($map)
             ->select();
         $wait_amount = [];
         foreach ($all_data as $key => $value) {
 
-            $wait_amount[$value['admin_id'].$value['pay_time'].'performance_commission'] = $value['wait_performance_commission'];
-            $wait_amount[$value['admin_id'].$value['pay_time'].'achievement_bonus'] = $value['wait_achievement_commission'] * ($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1);
+            $wait_amount[$value['admin_id'] . $value['pay_time'] . 'performance_commission'] = $value['wait_performance_commission'];
+            $wait_amount[$value['admin_id'] . $value['pay_time'] . 'achievement_bonus'] = $value['wait_achievement_commission'] * ($this->coefficient[$value['pay_time']][$value['admin_id']] ? $this->coefficient[$value['pay_time']][$value['admin_id']] : 1);
 
         }
 
@@ -721,12 +725,12 @@ class MarketPercentageController extends ThinkController
 
         foreach ($data as $key => $value) {
             $level = $value['level'];
-            if(isset($marketPercentage[$level])){
+            if (isset($marketPercentage[$level])) {
                 $value['market_percentage'] = $marketPercentage[$level];
             }
             $Rule = strtolower(MODULE_NAME . '/' . CONTROLLER_NAME . '/' . ACTION_NAME . "_export_show_check");
 
-            if ($_REQUEST['export'] && $this->checkRule($Rule,array('in','1,2'))) {
+            if ($_REQUEST['export'] && $this->checkRule($Rule, array('in', '1,2'))) {
 
                 if (!$value['market_check'] || !$value['finance_check']) {
                     unset($data[$key]);
@@ -734,8 +738,8 @@ class MarketPercentageController extends ThinkController
                 }
             }
 
-            $data[$key]['start_time'] = date("Y-m-1",strtotime($value['pay_time']));
-            $data[$key]['end_time'] = date("Y-m-t",strtotime($value['pay_time']));
+            $data[$key]['start_time'] = date("Y-m-1", strtotime($value['pay_time']));
+            $data[$key]['end_time'] = date("Y-m-t", strtotime($value['pay_time']));
 
             if ($value['level'] == 21) {
                 $data[$key]['level'] = '初级';
@@ -745,7 +749,7 @@ class MarketPercentageController extends ThinkController
                 $data[$key]['level'] = '高级';
             }
 
-            if(!$value['market_check']) {
+            if (!$value['market_check']) {
                 $data[$key]['market_check_detail'] = "-----";
             }
 
@@ -758,12 +762,12 @@ class MarketPercentageController extends ThinkController
             }
 
             if ($_REQUEST['export']) {
-                $data[$key]['market_check_detail'] = str_replace("<br>",'',$data[$key]['market_check_detail']);
-                $data[$key]['finance_check_detail'] = str_replace("<br>",'',$data[$key]['finance_check_detail']);
-                $data[$key]['coefficient_check_detail'] = str_replace("<br>",'',$data[$key]['coefficient_check_detail']);
+                $data[$key]['market_check_detail'] = str_replace("<br>", '', $data[$key]['market_check_detail']);
+                $data[$key]['finance_check_detail'] = str_replace("<br>", '', $data[$key]['finance_check_detail']);
+                $data[$key]['coefficient_check_detail'] = str_replace("<br>", '', $data[$key]['coefficient_check_detail']);
             }
 
-            $market_percentage = json_decode($value['market_percentage'],true);
+            $market_percentage = json_decode($value['market_percentage'], true);
             //开发业绩提成比例
             $data[$key]['develop_commission_ratio'] = $market_percentage['develop_commission_ratio'];
             //维护业绩提成比例
@@ -773,24 +777,24 @@ class MarketPercentageController extends ThinkController
             //维护奖金考核比例
             $data[$key]['maintain_appraisal_bonuses_ratio'] = $market_percentage['maintain_appraisal_bonuses_ratio'];
 
-            $data[$key]['coefficient'] = $this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1;
+            $data[$key]['coefficient'] = $this->coefficient[$value['pay_time']][$value['admin_id']] ? $this->coefficient[$value['pay_time']][$value['admin_id']] : 1;
 
-            $month = date("m",strtotime($value['pay_time']));
-            $yes = date("Y",strtotime($value['pay_time']));
+            $month = date("m", strtotime($value['pay_time']));
+            $yes = date("Y", strtotime($value['pay_time']));
 
             $achievement_bonus = number_format($data[$key]['achievement_bonus'], 2, '.', '');
 
             //绩效系数计算
-            $data[$key]['achievement_bonus'] = number_format($data[$key]['achievement_bonus'] * ($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 2, '.', '');
+            $data[$key]['achievement_bonus'] = number_format($data[$key]['achievement_bonus'] * ($this->coefficient[$value['pay_time']][$value['admin_id']] ? $this->coefficient[$value['pay_time']][$value['admin_id']] : 1), 2, '.', '');
 
             $data[$key]['commission'] = number_format($data[$key]['performance_commission'] + $data[$key]['achievement_bonus'], 2, '.', '');
-            $data[$key]['wait_commission'] = number_format($value['wait_performance_commission'] + $value['wait_achievement_commission']*($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 2, '.', '');
+            $data[$key]['wait_commission'] = number_format($value['wait_performance_commission'] + $value['wait_achievement_commission'] * ($this->coefficient[$value['pay_time']][$value['admin_id']] ? $this->coefficient[$value['pay_time']][$value['admin_id']] : 1), 2, '.', '');
             $data[$key]['extend_commission'] = $data[$key]['commission'] - $data[$key]['wait_commission'];
 //            dump($data[$key]['commission']);
 
             //两个起提流水都没达到时，不展示税后毛利
             $sum_amount = $value['performance_revenue'] + $value['appraisal_bonuses'];
-            if ($sum_amount<$market_percentage['performance_revenue']&&$sum_amount<$market_percentage['appraisal_bonuses']) {
+            if ($sum_amount < $market_percentage['performance_revenue'] && $sum_amount < $market_percentage['appraisal_bonuses']) {
                 $data[$key]['company_profit'] = "0.00";
                 $value['company_profit'] = "0.00";
             }
@@ -798,71 +802,70 @@ class MarketPercentageController extends ThinkController
             if ($market_percentage['time'] == 1) {
 
                 if ($month == '07') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'01'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'02'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'03'.'performance_commission'];
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '01' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '02' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '03' . 'performance_commission'];
 //                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'04'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'05'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'06'.'performance_commission'];
-                } elseif($month == '10') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'04'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'05'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'06'.'performance_commission'];
+                } elseif ($month == '10') {
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '04' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '05' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '06' . 'performance_commission'];
 //                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'07'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'08'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'09'.'performance_commission'];
-                } elseif($month == '04') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'10'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'11'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'12'.'performance_commission'];
+                } elseif ($month == '04') {
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12' . 'performance_commission'];
 //                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'01'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'02'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'03'.'performance_commission'];
-                } elseif($month == '01') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'07'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'08'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'09'.'performance_commission'];
+                } elseif ($month == '01') {
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '07' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '08' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '09' . 'performance_commission'];
 //                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'10'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'11'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'12'.'performance_commission'];
                 }
-            } elseif($market_percentage['time'] == 2) {
+            } elseif ($market_percentage['time'] == 2) {
                 if ($month == '07') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'01'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'02'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'03'.'performance_commission'] +
-                        $wait_amount[$value['admin_id'].$yes.'-'.'04'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'05'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'06'.'performance_commission'];
-                } elseif($month == '01') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'07'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'08'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'09'.'performance_commission'] +
-                        $wait_amount[$value['admin_id'].($yes-1).'-'.'10'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'11'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'12'.'performance_commission'];
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '01' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '02' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '03' . 'performance_commission'] +
+                        $wait_amount[$value['admin_id'] . $yes . '-' . '04' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '05' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '06' . 'performance_commission'];
+                } elseif ($month == '01') {
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '07' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '08' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '09' . 'performance_commission'] +
+                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12' . 'performance_commission'];
                 }
-            } elseif($market_percentage['time'] == 3) {
+            } elseif ($market_percentage['time'] == 3) {
                 if ($month == '01') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '01'.'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '02'.'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '03'.'performance_commission'] +
-                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '04'.'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '05'.'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '06'.'performance_commission'] +
-                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '07'.'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '08'.'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '09'.'performance_commission'] +
-                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10'.'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11'.'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12'.'performance_commission'];
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '01' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '02' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '03' . 'performance_commission'] +
+                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '04' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '05' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '06' . 'performance_commission'] +
+                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '07' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '08' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '09' . 'performance_commission'] +
+                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12' . 'performance_commission'];
                 }
             } else {
-                $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] .date("Y-m",strtotime("last month",strtotime($value['pay_time']))).'performance_commission'];
+                $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . date("Y-m", strtotime("last month", strtotime($value['pay_time']))) . 'performance_commission'];
             }
 
             if ($market_percentage['remain_time'] == 1) {
                 if ($month == '07') {
 
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'01'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'02'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'03'.'achievement_bonus'];
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '01' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '02' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '03' . 'achievement_bonus'];
 //                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'04'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'05'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'06'.'achievement_bonus'];
                     //                    dump($data[$key]['extend_commission']);die();
-                } elseif($month == '10') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'04'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'05'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'06'.'achievement_bonus'];
+                } elseif ($month == '10') {
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '04' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '05' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '06' . 'achievement_bonus'];
 //                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'07'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'08'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'09'.'achievement_bonus'];
-                } elseif($month == '04') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'10'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'11'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'12'.'achievement_bonus'];
+                } elseif ($month == '04') {
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12' . 'achievement_bonus'];
 //                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'01'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'02'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'03'.'achievement_bonus'];
-                }
-                elseif($month == '01') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'07'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'08'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'09'.'achievement_bonus'];
+                } elseif ($month == '01') {
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '07' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '08' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '09' . 'achievement_bonus'];
 //                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'10'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'11'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'12'.'achievement_bonus'];
                 }
-            } elseif($market_percentage['remain_time'] == 2) {
+            } elseif ($market_percentage['remain_time'] == 2) {
                 if ($month == '07') {
-                        $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'01'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'02'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'03'.'achievement_bonus'] +
-                            $wait_amount[$value['admin_id'].$yes.'-'.'04'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'05'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'06'.'achievement_bonus'];
-                } elseif($month == '01') {
-                        $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'07'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'08'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'09'.'achievement_bonus'] +
-                            $wait_amount[$value['admin_id'].($yes-1).'-'.'10'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'11'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'12'.'achievement_bonus'];
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '01' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '02' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '03' . 'achievement_bonus'] +
+                        $wait_amount[$value['admin_id'] . $yes . '-' . '04' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '05' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '06' . 'achievement_bonus'];
+                } elseif ($month == '01') {
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '07' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '08' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '09' . 'achievement_bonus'] +
+                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12' . 'achievement_bonus'];
                 }
-            } elseif($market_percentage['remain_time'] == 3) {
+            } elseif ($market_percentage['remain_time'] == 3) {
                 if ($month == '01') {
-                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '01'.'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '02'.'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '03'.'achievement_bonus'] +
-                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '04'.'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '05'.'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '06'.'achievement_bonus'] +
-                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '07'.'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '08'.'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '09'.'achievement_bonus'] +
-                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10'.'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11'.'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12'.'achievement_bonus'];
+                    $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '01' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '02' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '03' . 'achievement_bonus'] +
+                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '04' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '05' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '06' . 'achievement_bonus'] +
+                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '07' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '08' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '09' . 'achievement_bonus'] +
+                        $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12' . 'achievement_bonus'];
                 }
             } else {
-                $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] .date("Y-m",strtotime("last month",strtotime($value['pay_time']))).'achievement_bonus'];
+                $data[$key]['extend_commission'] += $wait_amount[$value['admin_id'] . date("Y-m", strtotime("last month", strtotime($value['pay_time']))) . 'achievement_bonus'];
             }
 //            $data[$key]['extend_commission'] = number_format($data[$key]['extend_commission'], 2, '.', '');
 //
@@ -871,35 +874,34 @@ class MarketPercentageController extends ThinkController
             if ($market_percentage['time'] == 1) {
 
                 if ($month == '07') {
-                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'04'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'05'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'06'.'performance_commission'];
-                } elseif($month == '10') {
-                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'07'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'08'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'09'.'performance_commission'];
-                } elseif($month == '04') {
-                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'01'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'02'.'performance_commission'] + $wait_amount[$value['admin_id'].$yes.'-'.'03'.'performance_commission'];
-                } elseif($month == '01') {
-                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'10'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'11'.'performance_commission'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'12'.'performance_commission'];
+                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '04' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '05' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '06' . 'performance_commission'];
+                } elseif ($month == '10') {
+                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '07' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '08' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '09' . 'performance_commission'];
+                } elseif ($month == '04') {
+                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '01' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '02' . 'performance_commission'] + $wait_amount[$value['admin_id'] . $yes . '-' . '03' . 'performance_commission'];
+                } elseif ($month == '01') {
+                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11' . 'performance_commission'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12' . 'performance_commission'];
                 }
             }
 
             if ($market_percentage['remain_time'] == 1) {
                 if ($month == '07') {
 
-                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'04'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'05'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'06'.'achievement_bonus'];
+                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '04' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '05' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '06' . 'achievement_bonus'];
                     //                    dump($data[$key]['extend_commission']);die();
-                } elseif($month == '10') {
-                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'07'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'08'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'09'.'achievement_bonus'];
-                } elseif($month == '04') {
-                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].$yes.'-'.'01'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'02'.'achievement_bonus'] + $wait_amount[$value['admin_id'].$yes.'-'.'03'.'achievement_bonus'];
-                }
-                elseif($month == '01') {
-                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'].($yes-1).'-'.'10'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'11'.'achievement_bonus'] + $wait_amount[$value['admin_id'].($yes-1).'-'.'12'.'achievement_bonus'];
+                } elseif ($month == '10') {
+                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '07' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '08' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '09' . 'achievement_bonus'];
+                } elseif ($month == '04') {
+                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'] . $yes . '-' . '01' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '02' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . $yes . '-' . '03' . 'achievement_bonus'];
+                } elseif ($month == '01') {
+                    $data[$key]['wait_commission'] += $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '10' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '11' . 'achievement_bonus'] + $wait_amount[$value['admin_id'] . ($yes - 1) . '-' . '12' . 'achievement_bonus'];
                 }
             }
 
-            $data[$key]['extend_commission'] = number_format($data[$key]['extend_commission'],2,'.','');
-            $data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'],2,'.','');
+            $data[$key]['extend_commission'] = number_format($data[$key]['extend_commission'], 2, '.', '');
+            $data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'], 2, '.', '');
 
-            $data[$key]['achievement_bonus']  = $achievement_bonus;
+            $data[$key]['achievement_bonus'] = $achievement_bonus;
 
             $sum['performance_revenue'] += $data[$key]['performance_revenue'];
             $sum['appraisal_bonuses'] += $data[$key]['appraisal_bonuses'];
@@ -910,7 +912,6 @@ class MarketPercentageController extends ThinkController
             $sum['company_profit'] += $data[$key]['company_profit'];
 
 
-
         }
         $sum['wait_commission'] = '-------';
         $sum['pay_time'] = '总计';
@@ -922,26 +923,26 @@ class MarketPercentageController extends ThinkController
                 'level' => '级别',
                 'performance_revenue' => '开发总流水',
                 'appraisal_bonuses' => '维护总流水',
-                'develop_commission_ratio'=>'开发业绩提成比例(%)',
-                'maintain_commission_ratio'=>'维护业绩提成比例(%)',
-                'appraisal_bonuses_ratio'=>'开发考核奖金比例(%)',
-                'maintain_appraisal_bonuses_ratio'=>'维护奖金考核比例(%)',
-                'achievement_profit'=>'开发税后毛利',
-                'performance_profit'=>'维护税后毛利',
+                'develop_commission_ratio' => '开发业绩提成比例(%)',
+                'maintain_commission_ratio' => '维护业绩提成比例(%)',
+                'appraisal_bonuses_ratio' => '开发考核奖金比例(%)',
+                'maintain_appraisal_bonuses_ratio' => '维护奖金考核比例(%)',
+                'achievement_profit' => '开发税后毛利',
+                'performance_profit' => '维护税后毛利',
                 'performance_commission' => '业绩提成',
                 'achievement_bonus' => '绩效考核奖金',
-                'coefficient'=>'绩效系数',
+                'coefficient' => '绩效系数',
                 'commission' => '当月合计',
                 'extend_commission' => '应发金额',
                 'wait_commission' => '待发金额',
-                'coefficient_check_detail'=>'绩效确认',
+                'coefficient_check_detail' => '绩效确认',
                 'market_check_detail' => '市场部确认',
                 'finance_check_detail' => '财务部审批'];
 
             foreach ($data as $key => $value) {
-                $line = $key+2;
+                $line = $key + 2;
 //                $develop_commission_ratio = $value['develop_commission_ratio']/100;
-                $data[$key]['pay_time'] = '`'.$data[$key]['pay_time'];
+                $data[$key]['pay_time'] = '`' . $data[$key]['pay_time'];
 
                 $data[$key]['performance_commission'] = "=ROUND(";
                 $data[$key]['achievement_bonus'] = "=ROUND(";
@@ -966,7 +967,6 @@ class MarketPercentageController extends ThinkController
                     }
 
 
-
 //                    $data[$key]['achievement_bonus'] .= "J{$line}*(H{$line}/100)";
                 } else {
                     $data[$key]['performance_commission'] .= ',2)';
@@ -974,8 +974,6 @@ class MarketPercentageController extends ThinkController
                 }
 
 
-
-
 //                if ($value['achievement_profit'] != "0.00") {
 //                    if ($data[$key]['performance_commission'] == "=ROUND(") {
 //                        $data[$key]['performance_commission'] .= "K{$line}*(G{$line}/100),2)";
@@ -1006,37 +1004,38 @@ class MarketPercentageController extends ThinkController
                 $data[$key]['commission'] = "=ROUND(L{$line}+M{$line}*N{$line},2)";
             }
 
-            $data = array_merge($data,[$sum]);
+            $data = array_merge($data, [$sum]);
 
-            data2csv($data,'市场业绩提成',$title);
+            data2csv($data, '市场业绩提成', $title);
         }
 
         $arraypage = $p;
         $size = $row;//每页显示的记录数
         $data = array_slice($data, ($arraypage - 1) * $size, $size);
 
-        $this->assign("sum",$sum);
-        $this->assign("list_data",$data);
+        $this->assign("sum", $sum);
+        $this->assign("list_data", $data);
         $this->display("marketstaffsettle");
 
     }
 
-    public function personMarketStaffSettle($row = 10, $p = 1) {
+    public function personMarketStaffSettle($row = 10, $p = 1)
+    {
 //        var_dump(getMarketAdmin());
         $map = [];
 
-        $map['group_id'] = ['in','11,12,21'];
+        $map['group_id'] = ['in', '11,12,21'];
         //获取权限
         $marketPercentage = M("auth_group")->where($map)->getField("id,market_percentage");
 
 //        $_REQUEST['pay_time']?($map['pay_time'] = $_REQUEST['pay_time']):'';
 //        $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
-        $_REQUEST['group_id']?($map['group_id'] = $_REQUEST['group_id']):'';
-        ($_REQUEST['status']||$_REQUEST['status']=='0')?($map['tab_market_altogether.status'] = $_REQUEST['status']):'';
+        $_REQUEST['group_id'] ? ($map['group_id'] = $_REQUEST['group_id']) : '';
+        ($_REQUEST['status'] || $_REQUEST['status'] == '0') ? ($map['tab_market_altogether.status'] = $_REQUEST['status']) : '';
 
-        if($_REQUEST['status']||$_REQUEST['status']=='0') {
-            if( $_REQUEST['status'] == '1') {
-                $map['tab_market_altogether.status'] = ['egt',1];
+        if ($_REQUEST['status'] || $_REQUEST['status'] == '0') {
+            if ($_REQUEST['status'] == '1') {
+                $map['tab_market_altogether.status'] = ['egt', 1];
             } else {
                 $map['tab_market_altogether.status'] = $_REQUEST['status'];
             }
@@ -1044,20 +1043,20 @@ class MarketPercentageController extends ThinkController
 
         $admin_id = $_SESSION['onethink_admin']['user_auth']['uid'];
         $map['admin_id'] = $admin_id;
-        if(is_administrator()||session('user_group_id') == 15||session('user_group_id') == 14||session('user_group_id') == 19||session('user_group_id') == 23) {
+        if (is_administrator() || session('user_group_id') == 15 || session('user_group_id') == 14 || session('user_group_id') == 19 || session('user_group_id') == 23) {
             unset($map['admin_id']);
 
             $admin_data = M("member")
                 ->field("access.uid admin_id")
                 ->join("left join sys_auth_group_access access on sys_member.uid = access.uid")
                 ->join("left join sys_auth_group auth on access.group_id=auth.id")
-                ->where(['group_id'=>['in','11,12,21']])
+                ->where(['group_id' => ['in', '11,12,21']])
                 ->select();
             if ($admin_data) {
-                $map['admin_id'] = ['in',array_column($admin_data,'admin_id')];
+                $map['admin_id'] = ['in', array_column($admin_data, 'admin_id')];
             }
 
-            $_REQUEST['admin_id']?($map['admin_id'] = $_REQUEST['admin_id']):'';
+            $_REQUEST['admin_id'] ? ($map['admin_id'] = $_REQUEST['admin_id']) : '';
         }
 
         $search_date = [];
@@ -1070,7 +1069,7 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -1078,14 +1077,14 @@ class MarketPercentageController extends ThinkController
 
         } elseif (isset($_REQUEST['time_start'])) {
 
-            $end = date("Y-m",time());
+            $end = date("Y-m", time());
             $start = $_REQUEST['time_start'];
             $i = 0;
             do {
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
@@ -1100,14 +1099,14 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['pay_time'] = ['in', $search_date];
             }
         }
 
-        $data = SM("market_altogether","tab_")
+        $data = SM("market_altogether", "tab_")
             ->field("*")
             ->where($map);
 
@@ -1122,7 +1121,7 @@ class MarketPercentageController extends ThinkController
                 ->select();
         }
 
-        $count = SM("market_altogether","tab_")
+        $count = SM("market_altogether", "tab_")
             ->where($map)
             ->count();
 
@@ -1130,7 +1129,7 @@ class MarketPercentageController extends ThinkController
         if ($page) {
             $this->assign('_page', $page);
         }
-        $this->checkListOrCountAuthRestMap($map,[]);
+        $this->checkListOrCountAuthRestMap($map, []);
 
         $sum['performance_revenue'] = 0;
         $sum['appraisal_bonuses'] = 0;
@@ -1143,14 +1142,14 @@ class MarketPercentageController extends ThinkController
 
         foreach ($data as $key => $value) {
             $level = $value['level'];
-            if(isset($marketPercentage[$level])){
+            if (isset($marketPercentage[$level])) {
                 $value['market_percentage'] = $marketPercentage[$level];
             }
 
-            $data[$key]['start_time'] = date("Y-m-1",strtotime($value['pay_time']));
-            $data[$key]['end_time'] = date("Y-m-t",strtotime($value['pay_time']));
+            $data[$key]['start_time'] = date("Y-m-1", strtotime($value['pay_time']));
+            $data[$key]['end_time'] = date("Y-m-t", strtotime($value['pay_time']));
 
-            $market_percentage = json_decode($value['market_percentage'],true);
+            $market_percentage = json_decode($value['market_percentage'], true);
 
             if ($value['level'] == 21) {
                 $data[$key]['level'] = '初级';
@@ -1168,20 +1167,20 @@ class MarketPercentageController extends ThinkController
 
             //两个起提流水都没达到时，不展示税后毛利
             $sum_amount = $value['performance_revenue'] + $value['appraisal_bonuses'];
-            if ($sum_amount<$market_percentage['performance_revenue']&&$sum_amount<$market_percentage['appraisal_bonuses']) {
+            if ($sum_amount < $market_percentage['performance_revenue'] && $sum_amount < $market_percentage['appraisal_bonuses']) {
                 $data[$key]['company_profit'] = "0.00";
                 $value['company_profit'] = "0.00";
             }
 
-            $data[$key]['coefficient'] = $this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1;
+            $data[$key]['coefficient'] = $this->coefficient[$value['pay_time']][$value['admin_id']] ? $this->coefficient[$value['pay_time']][$value['admin_id']] : 1;
 
             $data[$key]['wait_commission'] =
-                number_format($value['wait_performance_commission'] + $value['wait_achievement_commission']*($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 2, '.', '');
+                number_format($value['wait_performance_commission'] + $value['wait_achievement_commission'] * ($this->coefficient[$value['pay_time']][$value['admin_id']] ? $this->coefficient[$value['pay_time']][$value['admin_id']] : 1), 2, '.', '');
 
             $achievement_bonus = number_format($data[$key]['achievement_bonus'], 2, '.', '');
 
             //绩效系数计算
-            $data[$key]['achievement_bonus'] = number_format($data[$key]['achievement_bonus'] * ($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 2, '.', '');
+            $data[$key]['achievement_bonus'] = number_format($data[$key]['achievement_bonus'] * ($this->coefficient[$value['pay_time']][$value['admin_id']] ? $this->coefficient[$value['pay_time']][$value['admin_id']] : 1), 2, '.', '');
 
             $data[$key]['commission'] = number_format($data[$key]['performance_commission'] + $data[$key]['achievement_bonus'], 2, '.', '');;
             $data[$key]['extend_commission'] = $data[$key]['commission'] - $data[$key]['wait_commission'];
@@ -1195,7 +1194,7 @@ class MarketPercentageController extends ThinkController
             $sum['performance_commission'] += $value['performance_commission'];
             $sum['achievement_bonus'] += $data[$key]['achievement_bonus'];
             $sum['commission'] += $data[$key]['commission'];
-            $sum['extend_commission'] += $data[$key]['extend_commission'] ;
+            $sum['extend_commission'] += $data[$key]['extend_commission'];
             $sum['wait_commission'] += $data[$key]['wait_commission'];
 
         }
@@ -1210,7 +1209,7 @@ class MarketPercentageController extends ThinkController
         $sum['extend_commission'] = number_format($sum['extend_commission'], 2, '.', '');
         $sum['wait_commission'] = number_format($sum['wait_commission'], 2, '.', '');
 
-        $this->assign("sum",$sum);
+        $this->assign("sum", $sum);
 
         if ($_REQUEST['export']) {
 
@@ -1220,33 +1219,34 @@ class MarketPercentageController extends ThinkController
                 'level' => '级别',
                 'performance_revenue' => '开发总流水',
                 'appraisal_bonuses' => '维护总流水',
-                'company_profit'=>'税后毛利',
+                'company_profit' => '税后毛利',
                 'performance_commission' => '业绩提成',
                 'achievement_bonus' => '绩效考核奖金',
-                'coefficient'=>'绩效系数',
+                'coefficient' => '绩效系数',
                 'commission' => '当月总提成',
                 'extend_commission' => '本月发放',
                 'wait_commission' => '本月未发',
-                'is_send'=>'剩余金额发放状态'];
+                'is_send' => '剩余金额发放状态'];
 
-            $data = array_merge($data,[$sum]);
+            $data = array_merge($data, [$sum]);
 
             foreach ($data as $key => $value) {
-                $data[$key]['pay_time'] = '`'.$data[$key]['pay_time'];
+                $data[$key]['pay_time'] = '`' . $data[$key]['pay_time'];
             }
 
-            data2csv($data,'个人总提成列表',$title);
+            data2csv($data, '个人总提成列表', $title);
         }
         $arraypage = $p;
         $size = $row;//每页显示的记录数
         $data = array_slice($data, ($arraypage - 1) * $size, $size);
 
-        $this->assign("list_data",$data);
+        $this->assign("list_data", $data);
         $this->display("personmarketstaffsettle");
 
     }
 
-    public function sendBonus() {
+    public function sendBonus()
+    {
 
         $map['pay_time'] = $_REQUEST['pay_time'];
 
@@ -1254,33 +1254,33 @@ class MarketPercentageController extends ThinkController
             ->field("access.uid admin_id")
             ->join("left join sys_auth_group_access access on sys_member.uid = access.uid")
             ->join("left join sys_auth_group auth on access.group_id=auth.id")
-            ->where(['group_id'=>['in','11,12,21']])
+            ->where(['group_id' => ['in', '11,12,21']])
             ->select();
         if ($admin_data) {
-            $map['admin_id'] = ['in',array_column($admin_data,'admin_id')];
+            $map['admin_id'] = ['in', array_column($admin_data, 'admin_id')];
         }
 
         $map['admin_id'] = $_REQUEST['admin_id'];
 
-        if (!$_REQUEST['pay_time']||!$_REQUEST['admin_id']) {
-            $this->ajaxReturn(['status'=>0,'msg'=>'数据错误']);
+        if (!$_REQUEST['pay_time'] || !$_REQUEST['admin_id']) {
+            $this->ajaxReturn(['status' => 0, 'msg' => '数据错误']);
         }
 
-        $check_data = SM("market_altogether","tab_")
-            ->where(['pay_time'=>$_REQUEST['pay_time'],'admin_id'=>$_REQUEST['admin_id']])
+        $check_data = SM("market_altogether", "tab_")
+            ->where(['pay_time' => $_REQUEST['pay_time'], 'admin_id' => $_REQUEST['admin_id']])
             ->find();
 
         //正常发放添加判断，不让他重新发放
-        if (!$_REQUEST['all']&&$check_data) {
+        if (!$_REQUEST['all'] && $check_data) {
 
-            if ($check_data['status'] >0) {
-                $this->ajaxReturn(['status'=>0,'msg'=>'已经发放过,请勿重复操作']);
+            if ($check_data['status'] > 0) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '已经发放过,请勿重复操作']);
             }
         }
         //判断是否已经离职发放过
-        if($_REQUEST['all']) {
-            if ($check_data['status']==2) {
-                $this->ajaxReturn(['status'=>0,'msg'=>'离职发放已经发放过']);
+        if ($_REQUEST['all']) {
+            if ($check_data['status'] == 2) {
+                $this->ajaxReturn(['status' => 0, 'msg' => '离职发放已经发放过']);
             }
         }
 
@@ -1292,19 +1292,20 @@ class MarketPercentageController extends ThinkController
             $save['remark'] = '离职发放';
         }
 
-        $is_save = SM("market_altogether","tab_")
+        $is_save = SM("market_altogether", "tab_")
             ->where($map)
             ->save($save);
 
         if ($is_save) {
-            $this->ajaxReturn(['status'=>1,'msg'=>'发放成功']);
+            $this->ajaxReturn(['status' => 1, 'msg' => '发放成功']);
         } else {
-            $this->ajaxReturn(['status'=>0,'msg'=>'发放失败']);
+            $this->ajaxReturn(['status' => 0, 'msg' => '发放失败']);
         }
 
     }
 
-    public function reCaculateBonus() {
+    public function reCaculateBonus()
+    {
 
         $pay_time = $_REQUEST['pay_time'];
 
@@ -1315,16 +1316,17 @@ class MarketPercentageController extends ThinkController
 
 //        var_dump("cd ".ROOTTT.";php admin.php timing/caculateMarketStream/time/{$pay_time} > /dev/null &");die();
 
-        exec("source /etc/profile;cd ".ROOTTT.";php ".SUBSITE_INDEX." timing/caculateMarketStream/time/{$pay_time} > /dev/null &");
+        exec("source /etc/profile;cd " . ROOTTT . ";php " . SUBSITE_INDEX . " timing/caculateMarketStream/time/{$pay_time} > /dev/null &");
 
-        $this->ajaxReturn(['status'=>1]);
+        $this->ajaxReturn(['status' => 1]);
     }
 
-    public function showBonusList($row = 10, $p = 1) {
+    public function showBonusList($row = 10, $p = 1)
+    {
 
         //排序
-        if(!array_key_exists("time_start",$_REQUEST)){
-            $this->redirect(ACTION_NAME, array('time_start' => date('Y-m',strtotime('-1 month')),"time_end"=>date('Y-m',strtotime('-1 month'))));
+        if (!array_key_exists("time_start", $_REQUEST)) {
+            $this->redirect(ACTION_NAME, array('time_start' => date('Y-m', strtotime('-1 month')), "time_end" => date('Y-m', strtotime('-1 month'))));
         }
 
         $map = [];
@@ -1333,16 +1335,16 @@ class MarketPercentageController extends ThinkController
             ->field("access.uid admin_id")
             ->join("left join sys_auth_group_access access on sys_member.uid = access.uid")
             ->join("left join sys_auth_group auth on access.group_id=auth.id")
-            ->where(['group_id'=>['in','11,12,21']])
+            ->where(['group_id' => ['in', '11,12,21']])
             ->select();
         if ($admin_data) {
-            $map['tab_market_altogether.admin_id'] = ['in',array_column($admin_data,'admin_id')];
+            $map['tab_market_altogether.admin_id'] = ['in', array_column($admin_data, 'admin_id')];
         }
 
-        $_REQUEST['pay_time']?$map['tab_market_altogether.pay_time'] = $_REQUEST['pay_time']:'';
-        $_REQUEST['real_name']?$map['tab_market_altogether.real_name'] = $_REQUEST['real_name']:'';
-        $_REQUEST['nickname']?$map['tab_market_altogether..nickname'] = $_REQUEST['nickname']:'';
-        $_REQUEST['level']?$map['level'] = $_REQUEST['level']:'';
+        $_REQUEST['pay_time'] ? $map['tab_market_altogether.pay_time'] = $_REQUEST['pay_time'] : '';
+        $_REQUEST['real_name'] ? $map['tab_market_altogether.real_name'] = $_REQUEST['real_name'] : '';
+        $_REQUEST['nickname'] ? $map['tab_market_altogether..nickname'] = $_REQUEST['nickname'] : '';
+        $_REQUEST['level'] ? $map['level'] = $_REQUEST['level'] : '';
 
 
         $search_date = [];
@@ -1355,7 +1357,7 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['tab_market_altogether.pay_time'] = ['in', $search_date];
@@ -1363,14 +1365,14 @@ class MarketPercentageController extends ThinkController
 
         } elseif (isset($_REQUEST['time_start'])) {
 
-            $end = date("Y-m",time());
+            $end = date("Y-m", time());
             $start = $_REQUEST['time_start'];
             $i = 0;
             do {
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['tab_market_altogether.pay_time'] = ['in', $search_date];
@@ -1385,19 +1387,19 @@ class MarketPercentageController extends ThinkController
                 $date = date('Y-m', strtotime($start . ' + ' . $i . ' month'));
                 $search_date[] = $date;
                 $i++;
-            }while ($date < date('Y-m', strtotime("{$end}")));
+            } while ($date < date('Y-m', strtotime("{$end}")));
 
             if ($search_date) {
                 $map['tab_market_altogether.pay_time'] = ['in', $search_date];
             }
         }
 
-        if($_REQUEST['pay_time']) {
-            if (in_array($_REQUEST['pay_time'],$search_date)) {
+        if ($_REQUEST['pay_time']) {
+            if (in_array($_REQUEST['pay_time'], $search_date)) {
                 $map['tab_market_altogether.pay_time'] = $_REQUEST['pay_time'];
-            } elseif(isset($_REQUEST['time_start']) || isset($_REQUEST['time_end'])) {
-                $this->checkListOrCountAuthRestMap($map,[]);
-                $this->assign("list_data",[]);
+            } elseif (isset($_REQUEST['time_start']) || isset($_REQUEST['time_end'])) {
+                $this->checkListOrCountAuthRestMap($map, []);
+                $this->assign("list_data", []);
                 $this->display("showbonuslist");
                 die();
             } else {
@@ -1405,7 +1407,7 @@ class MarketPercentageController extends ThinkController
             }
         }
 
-        $data = SM("market_altogether","tab_")
+        $data = SM("market_altogether", "tab_")
             ->field("max(tab_market_altogether.pay_time) pay_time,tab_market_altogether.real_name,tab_market_altogether.admin_id,tab_market_altogether.nickname,level,sum(pay_amount) pay_amount,sum(extend_commission) extend_commission, 
             sum(performance_commission) performance_commission,sum(achievement_bonus* IF(coefficient is not NULL, coefficient, 100)/100) achievement_bonus,
             sum(wait_performance_commission)+sum(wait_achievement_commission) wait_amount,
@@ -1442,7 +1444,7 @@ class MarketPercentageController extends ThinkController
         $sum['extend_commission'] = 0;
         $sum['wait_commission'] = 0;
 
-        foreach($data as $key => $value) {
+        foreach ($data as $key => $value) {
 //            dump($value);
             if ($value['level'] == 21) {
                 $data[$key]['level'] = '初级';
@@ -1461,8 +1463,8 @@ class MarketPercentageController extends ThinkController
 //                number_format($value['wait_performance_commission'] + $value['wait_achievement_commission']*($this->coefficient[$value['pay_time']][$value['admin_id']]?$this->coefficient[$value['pay_time']][$value['admin_id']]:1), 2, '.', '');
 
             $data[$key]['extend_commission'] = number_format($data[$key]['commission'] - $data[$key]['wait_commission'], 2, '.', '');
-            $data[$key]['pay_amount'] = number_format($data[$key]['pay_amount'] , 2, '.', '');
-            $data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'] , 2, '.', '');
+            $data[$key]['pay_amount'] = number_format($data[$key]['pay_amount'], 2, '.', '');
+            $data[$key]['wait_commission'] = number_format($data[$key]['wait_commission'], 2, '.', '');
 //            $data[$key]['all_commission'] = $data[$key]['wait_amount'] + ;
 
             $sum['pay_amount'] += $data[$key]['pay_amount'];
@@ -1476,10 +1478,10 @@ class MarketPercentageController extends ThinkController
         $sum['extend_commission'] = number_format($sum['extend_commission'], 2, '.', '');;
         $sum['wait_commission'] = number_format($sum['wait_commission'], 2, '.', '');;
 
-        $_REQUEST['time_start']?($start_time = date("Y-m-1",strtotime($_REQUEST['time_start']))):$start_time = date("Y-m-1",strtotime(''));
-        $_REQUEST['time_end']?($end_time = date("Y-m-t",strtotime($_REQUEST['time_end']))):'';
-        $this->assign('start_time',$start_time);
-        $this->assign('end_time',$end_time);
+        $_REQUEST['time_start'] ? ($start_time = date("Y-m-1", strtotime($_REQUEST['time_start']))) : $start_time = date("Y-m-1", strtotime(''));
+        $_REQUEST['time_end'] ? ($end_time = date("Y-m-t", strtotime($_REQUEST['time_end']))) : '';
+        $this->assign('start_time', $start_time);
+        $this->assign('end_time', $end_time);
 
         if ($_REQUEST['export']) {
 
@@ -1487,16 +1489,16 @@ class MarketPercentageController extends ThinkController
                 'nickname' => '账号',
                 'level' => '级别',
                 'pay_amount' => '总流水',
-                'commission'=>'总提成',
+                'commission' => '总提成',
                 'extend_commission' => '已发放总提成',
-                'wait_commission'=>'剩余未发放总提成'];
+                'wait_commission' => '剩余未发放总提成'];
 
-            $data = array_merge($data,[$sum]);
+            $data = array_merge($data, [$sum]);
 
-            data2csv($data,'提成汇总结算单',$title);
+            data2csv($data, '提成汇总结算单', $title);
         }
 
-        $count = SM("market_altogether","tab_")
+        $count = SM("market_altogether", "tab_")
             ->field("admin_id")
             ->where($map)
             ->group("admin_id")
@@ -1512,15 +1514,16 @@ class MarketPercentageController extends ThinkController
         $size = $row;//每页显示的记录数
         $data = array_slice($data, ($arraypage - 1) * $size, $size);
 
-        $this->checkListOrCountAuthRestMap($map,[]);
+        $this->checkListOrCountAuthRestMap($map, []);
 
-        $this->assign("sum",$sum);
-        $this->assign("list_data",$data);
+        $this->assign("sum", $sum);
+        $this->assign("list_data", $data);
         $this->display("showbonuslist");
 
     }
 
-    public function editTaxRatio() {
+    public function editTaxRatio()
+    {
 
         if (IS_POST) {
 
@@ -1536,91 +1539,96 @@ class MarketPercentageController extends ThinkController
             $data['time'] = strtotime($data['timestart']);
             $data['create_time'] = time();
 
-            $is_hav = M("tax_radio","tab_")
-                ->where(['time'=>strtotime($data['timestart'])])
+            $is_hav = M("tax_radio", "tab_")
+                ->where(['time' => strtotime($data['timestart'])])
                 ->find();
 
-            M("tax_radio","tab_")
-                ->where(['time'=>['gt',strtotime($data['timestart'])]])
+            M("tax_radio", "tab_")
+                ->where(['time' => ['gt', strtotime($data['timestart'])]])
                 ->delete();
 
             if ($is_hav) {
-                $is_save = M("tax_radio","tab_")
-                    ->where(['time'=>strtotime($data['timestart'])])
+                $is_save = M("tax_radio", "tab_")
+                    ->where(['time' => strtotime($data['timestart'])])
                     ->save($data);
             } else {
-                $is_save = M("tax_radio","tab_")->add($data);
+                $is_save = M("tax_radio", "tab_")->add($data);
             }
 
-            $this->success("保存成功",U("index"));
+            $this->success("保存成功", U("index"));
 
         } else {
 
-            $data = M("tax_radio","tab_")
+            $data = M("tax_radio", "tab_")
                 ->field("tax_radio,time timestart")
                 ->order("create_time DESC")
                 ->find();
 
-            $data['timestart'] = Date("Y-m",$data['timestart']);
+            $data['timestart'] = Date("Y-m", $data['timestart']);
 
-            $this->assign('data',$data);
+            $this->assign('data', $data);
             $this->display("edittaxratio");
 
         }
 
     }
+
     //市场部确认操作
-    public function doMarketCheck() {
+    public function doMarketCheck()
+    {
 
         $ids = $_REQUEST['ids'];
 
         if (!$ids) {
-            $this->ajaxReturn(['status'=>0,'info'=>'操作失败,id不能为空']);
+            $this->ajaxReturn(['status' => 0, 'info' => '操作失败,id不能为空']);
         }
         $admin = $_SESSION['onethink_admin']['user_auth']['username'];
-        $market_check_detail = "市场部已确认（{$admin}）<br>".date("Y-m-d H:i:s",time());
+        $market_check_detail = "市场部已确认（{$admin}）<br>" . date("Y-m-d H:i:s", time());
 
-        $is_save = SM("market_altogether","tab_")
-            ->where(['id'=>['in',$ids],'market_check'=>0])
-            ->save(['market_check'=>1,'market_check_detail'=>$market_check_detail]);
+        $is_save = SM("market_altogether", "tab_")
+            ->where(['id' => ['in', $ids], 'market_check' => 0])
+            ->save(['market_check' => 1, 'market_check_detail' => $market_check_detail]);
 
         if (!$is_save) {
-            $this->ajaxReturn(['status'=>0,'info'=>'操作失败']);
+            $this->ajaxReturn(['status' => 0, 'info' => '操作失败']);
         }
 
-        $this->ajaxReturn(['status'=>1,'info'=>'市场部确认成功']);
+        $this->ajaxReturn(['status' => 1, 'info' => '市场部确认成功']);
 
     }
+
     //财务部审批操作
-    public function doFinanceCheck() {
+    public function doFinanceCheck()
+    {
 
         $ids = $_REQUEST['ids'];
 
         if (!$ids) {
-            $this->ajaxReturn(['status'=>0,'info'=>'操作失败,id不能为空']);
+            $this->ajaxReturn(['status' => 0, 'info' => '操作失败,id不能为空']);
         }
 
         $admin = $_SESSION['onethink_admin']['user_auth']['username'];
-        $finance_check_detail = "财务部已审批（{$admin}）<br>".date("Y-m-d H:i:s",time());
+        $finance_check_detail = "财务部已审批（{$admin}）<br>" . date("Y-m-d H:i:s", time());
 
-        $is_save = SM("market_altogether","tab_")
-            ->where(['id'=>['in',$ids],'finance_check'=>0])
-            ->save(['finance_check'=>1,'finance_check_detail'=>$finance_check_detail]);
+        $is_save = SM("market_altogether", "tab_")
+            ->where(['id' => ['in', $ids], 'finance_check' => 0])
+            ->save(['finance_check' => 1, 'finance_check_detail' => $finance_check_detail]);
 
         if (!$is_save) {
-            $this->ajaxReturn(['status'=>0,'info'=>'操作失败']);
+            $this->ajaxReturn(['status' => 0, 'info' => '操作失败']);
         }
 
-        $this->ajaxReturn(['status'=>1,'info'=>'财务部审批成功']);
+        $this->ajaxReturn(['status' => 1, 'info' => '财务部审批成功']);
 
     }
 
-    public function companybelonggame($row = 10, $p = 1) {
+    public function companybelonggame($row = 10, $p = 1)
+    {
 
         if ($_REQUEST['relation_game_id']) {
             $game_id = $_REQUEST['relation_game_id'];
 
-            $where['game_ids'] = ['like',"%,{$game_id},%"];
+            $where['game_ids'] = ['like', "%,{$game_id},%"];
 
         }
 
@@ -1628,17 +1636,17 @@ class MarketPercentageController extends ThinkController
 
         if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
             $time_start = strtotime($_REQUEST['time_start']);
-            $time_end = strtotime($_REQUEST['time_end'])+ 86399;
-            $where["_string"] =  "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end}) OR (begin_time <= {$time_end} AND  end_time >= {$time_end}) OR (begin_time >0 AND end_time = 0)";
+            $time_end = strtotime($_REQUEST['time_end']) + 86399;
+            $where["_string"] = "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end}) OR (begin_time <= {$time_end} AND  end_time >= {$time_end}) OR (begin_time >0 AND end_time = 0)";
         } elseif (isset($_REQUEST['time_start'])) {
             $time_start = strtotime($_REQUEST['time_start']);
-            $where["_string"] =  "end_time >= {$time_start} OR end_time = 0";
+            $where["_string"] = "end_time >= {$time_start} OR end_time = 0";
         } elseif (isset($_REQUEST['time_end'])) {
-            $time_end = strtotime($_REQUEST['time_end'])+ 86399;
-            $where["_string"] =  "begin_time <= {$time_end}";
+            $time_end = strtotime($_REQUEST['time_end']) + 86399;
+            $where["_string"] = "begin_time <= {$time_end}";
         }
 
-        $data = M("company_belong_game","tab_")
+        $data = M("company_belong_game", "tab_")
             ->where($where)
             ->page($p, $row)
             ->order("begin_time DESC")
@@ -1646,12 +1654,12 @@ class MarketPercentageController extends ThinkController
 
         foreach ($data as $key => $value) {
 
-            $data[$key]["begin_time"] = date("Y.m.d",$value['begin_time']);
+            $data[$key]["begin_time"] = date("Y.m.d", $value['begin_time']);
 
-            if($value['end_time'] == 0) {
+            if ($value['end_time'] == 0) {
                 $data[$key]["end_time"] = "永久";
-            } else{
-                $data[$key]["end_time"] = date("Y.m.d",$value['end_time']);
+            } else {
+                $data[$key]["end_time"] = date("Y.m.d", $value['end_time']);
             }
 
             $where_game = $value['game_ids'];
@@ -1662,9 +1670,9 @@ class MarketPercentageController extends ThinkController
 
             $game = [];
             if ($where_game) {
-                $game = M("game","tab_")
+                $game = M("game", "tab_")
                     ->field("original_package_name,relation_game_name,relation_game_id,game_type_name")
-                    ->where(['relation_game_id'=>['in',$where_game]])
+                    ->where(['relation_game_id' => ['in', $where_game]])
                     ->group("relation_game_id")
                     ->select();
             }
@@ -1673,7 +1681,7 @@ class MarketPercentageController extends ThinkController
 
         }
 
-        $count = M("company_belong_game","tab_")
+        $count = M("company_belong_game", "tab_")
             ->where($where)
             ->count();
 
@@ -1682,14 +1690,14 @@ class MarketPercentageController extends ThinkController
             $this->assign('_page', $page);
         }
 
-        $this->assign("gameList",D("Game")->getRelationGameLits());
-        $this->assign("data",$data);
+        $this->assign("gameList", D("Game")->getRelationGameLits());
+        $this->assign("data", $data);
         $this->display();
 
     }
 
-    public function addcompanybelonggame() {
-
+    public function addcompanybelonggame()
+    {
 
 
         if (IS_POST) {
@@ -1697,45 +1705,45 @@ class MarketPercentageController extends ThinkController
             $data = $_POST;
 
             if (!$data['begin_time']) {
-                $this->ajaxReturn(['msg'=>"起始时间必填","status"=>0]);
+                $this->ajaxReturn(['msg' => "起始时间必填", "status" => 0]);
             }
 
             if (!$data['game_ids']) {
-                $this->ajaxReturn(['msg'=>"请选择推广游戏","status"=>0]);
+                $this->ajaxReturn(['msg' => "请选择推广游戏", "status" => 0]);
             }
-            $data['game_ids'] = explode(',',$data['game_ids']);
-            $data['game_ids'] = array_merge([''],$data['game_ids'],['']);
-            $data['game_ids'] = implode(',',$data['game_ids']);
+            $data['game_ids'] = explode(',', $data['game_ids']);
+            $data['game_ids'] = array_merge([''], $data['game_ids'], ['']);
+            $data['game_ids'] = implode(',', $data['game_ids']);
 
             $data['begin_time'] = strtotime($data['begin_time']);
             $data['end_time'] = strtotime($data['end_time']);
 
             $time_start = $data['begin_time'];
 
-            if($data['end_time']) {
+            if ($data['end_time']) {
                 $time_end = $data['end_time'];
             } else {
                 $time_end = 99999999999;
             }
 
-            $last_month = strtotime(date('Y-m-t',strtotime("-2 month")));
+            $last_month = strtotime(date('Y-m-t', strtotime("-2 month")));
 
             if ($data['begin_time'] < $last_month) {
-                $this->ajaxReturn(['msg'=>"已经结算过的时间不能添加","status"=>0]);
+                $this->ajaxReturn(['msg' => "已经结算过的时间不能添加", "status" => 0]);
             }
 
 
-            $belong_game = M("company_belong_game","tab_")
+            $belong_game = M("company_belong_game", "tab_")
                 ->where("((begin_time<={$time_start} and (end_time >={$time_start} or end_time=0)) or (begin_time<={$time_end} and end_time >={$time_end}) or (end_time>={$time_start} and end_time <={$time_end}))")
                 ->select();
 
             if ($belong_game) {
-                $this->ajaxReturn(['msg'=>"重复时间段，请勿重复添加","status"=>0]);
+                $this->ajaxReturn(['msg' => "重复时间段，请勿重复添加", "status" => 0]);
             }
 
-            M("company_belong_game","tab_")->add($data);
+            M("company_belong_game", "tab_")->add($data);
 
-            $this->ajaxReturn(['msg'=>"添加成功，请到对应时间段市场业绩重新结算，否则数据可能无法对上","status"=>1]);
+            $this->ajaxReturn(['msg' => "添加成功，请到对应时间段市场业绩重新结算，否则数据可能无法对上", "status" => 1]);
 
         } else {
             $this->display();
@@ -1744,7 +1752,8 @@ class MarketPercentageController extends ThinkController
 
     }
 
-    public function editcompanybelonggame() {
+    public function editcompanybelonggame()
+    {
 
         $id = $_REQUEST["id"];
 
@@ -1752,16 +1761,16 @@ class MarketPercentageController extends ThinkController
             $data = $_POST;
 
             if (!$data['begin_time'] && !$data['is_start']) {
-                $this->ajaxReturn(['msg'=>"起始时间必填","status"=>0]);
+                $this->ajaxReturn(['msg' => "起始时间必填", "status" => 0]);
             }
 
             if (!$data['game_ids']) {
-                $this->ajaxReturn(['msg'=>"请选择推广游戏","status"=>0]);
+                $this->ajaxReturn(['msg' => "请选择推广游戏", "status" => 0]);
             }
 
 //            $data['game_ids'] = json_encode($data['game_ids']);
 
-            $data['game_ids'] = explode(',',$data['game_ids']);
+            $data['game_ids'] = explode(',', $data['game_ids']);
 
             foreach ($data['game_ids'] as $key => $value) {
                 if ($value == "0") {
@@ -1769,14 +1778,14 @@ class MarketPercentageController extends ThinkController
                 }
             }
 
-            $data['game_ids'] = array_merge([''],$data['game_ids'],['']);
-            $data['game_ids'] = implode(',',$data['game_ids']);
+            $data['game_ids'] = array_merge([''], $data['game_ids'], ['']);
+            $data['game_ids'] = implode(',', $data['game_ids']);
 
 
             $time_start = strtotime($data['begin_time']);
 
 
-            if($data['end_time']) {
+            if ($data['end_time']) {
                 $time_end = strtotime($data['end_time']);
             } else {
                 $time_end = 99999999999;
@@ -1785,34 +1794,31 @@ class MarketPercentageController extends ThinkController
             $data['begin_time'] = strtotime($data['begin_time']);
             $data['end_time'] = strtotime($data['end_time']);
 
-            $company_belong_game_data = M("company_belong_game","tab_")->where(['id'=>$id])->find();
+            $company_belong_game_data = M("company_belong_game", "tab_")->where(['id' => $id])->find();
 
             if ($data['is_start']) {
                 $time_start = $company_belong_game_data['begin_time'];
                 $data['begin_time'] = $company_belong_game_data['begin_time'];
             }
 
-            $last_month = strtotime(date('Y-m-t',strtotime("-2 month")));
+            $last_month = strtotime(date('Y-m-t', strtotime("-2 month")));
 
-            if ($company_belong_game_data['end_time'] > $last_month && $data['end_time'] < $last_month)
-            {
+            if ($company_belong_game_data['end_time'] > $last_month && $data['end_time'] < $last_month) {
                 $time_end = $last_month;
                 $data['end_time'] = $last_month;
 //                $this->ajaxReturn(['msg'=>"过去已结算过的比例不能修改","status"=>0]);
             }
-            $last_month_first = strtotime(date('Y-m-1',strtotime("-1 month")));
-            if ($company_belong_game_data['begin_time'] > $last_month && $data['begin_time'] < $last_month)
-            {
+            $last_month_first = strtotime(date('Y-m-1', strtotime("-1 month")));
+            if ($company_belong_game_data['begin_time'] > $last_month && $data['begin_time'] < $last_month) {
 //                $time_end = $last_month;
                 $data['begin_time'] = $last_month_first;
 //                $this->ajaxReturn(['msg'=>"过去已结算过的比例不能修改","status"=>0]);
             }
 
 
-
             if ($data['begin_time'] < $last_month && $data['end_time'] <= $last_month) {
 
-                if($company_belong_game_data['end_time']<= $last_month) {
+                if ($company_belong_game_data['end_time'] <= $last_month) {
                     $data['end_time'] = $company_belong_game_data['end_time'];
                 } else {
                     $data['end_time'] = $last_month;
@@ -1821,11 +1827,11 @@ class MarketPercentageController extends ThinkController
             }
 
             if ($_POST['end_time']) {
-                $belong_game = M("company_belong_game","tab_")
+                $belong_game = M("company_belong_game", "tab_")
                     ->where("((begin_time<={$time_start} and (end_time >={$time_start} or end_time=0)) or (begin_time<={$time_end} and end_time >={$time_end}) or (end_time>={$time_start} and end_time <={$time_end})) and id != {$id}")
                     ->select();
             } else {
-                $belong_game = M("company_belong_game","tab_")
+                $belong_game = M("company_belong_game", "tab_")
                     ->where("(begin_time>={$time_start} or (end_time >={$time_start})) and id != {$id}")
                     ->select();
             }
@@ -1833,114 +1839,116 @@ class MarketPercentageController extends ThinkController
 
             if ($belong_game) {
 
-                $this->ajaxReturn(['msg'=>"重复时间段，请勿重复添加","status"=>0]);
+                $this->ajaxReturn(['msg' => "重复时间段，请勿重复添加", "status" => 0]);
             }
 
-            M("company_belong_game","tab_")->where(['id'=>$id])->save($data);
+            M("company_belong_game", "tab_")->where(['id' => $id])->save($data);
 
-            $this->ajaxReturn(['msg'=>"编辑成功，请到对应时间段市场业绩重新结算，否则数据可能无法对上","status"=>1]);
+            $this->ajaxReturn(['msg' => "编辑成功，请到对应时间段市场业绩重新结算，否则数据可能无法对上", "status" => 1]);
 
 
         } else {
 
-            $data = M("company_belong_game","tab_")
-                ->where(['id'=>$id])
+            $data = M("company_belong_game", "tab_")
+                ->where(['id' => $id])
                 ->find();
 
 //            $data['game_ids'] = json_encode(explode(',',$data['game_ids']));
-            $game_ids = explode(',',$data['game_ids']);
+            $game_ids = explode(',', $data['game_ids']);
 
-            $data['game_ids'] = explode(',',$data['game_ids']);
+            $data['game_ids'] = explode(',', $data['game_ids']);
 
-            foreach($game_ids as $key => $value) {
+            foreach ($game_ids as $key => $value) {
 
                 if ($value == "\"") {
                     unset($game_ids[$key]);
                 } else {
 
-                    $game_ids[$key] = $value-0;
+                    $game_ids[$key] = $value - 0;
                 }
 
             }
             $data['is_start'] = 0;
-            if($data['begin_time']<strtotime(date("Y-m-1",strtotime('-1 month')))) {
+            if ($data['begin_time'] < strtotime(date("Y-m-1", strtotime('-1 month')))) {
                 $data['is_start'] = 1;
             }
 
-            $data['ids'] = implode(',',$game_ids);
+            $data['ids'] = implode(',', $game_ids);
 
             $game_ids = json_encode(array_values($game_ids));
 
             $data['game_ids'] = $game_ids;
 
-            $data['begin_time'] = date("Y-m-d",$data['begin_time']);
-            $data['end_time'] = date("Y-m-d",$data['end_time']);
+            $data['begin_time'] = date("Y-m-d", $data['begin_time']);
+            $data['end_time'] = date("Y-m-d", $data['end_time']);
             if ($game_ids) {
-                $game = M("game","tab_")->field("relation_game_name")
-                    ->where(['relation_game_id'=>['in',$data['ids']]])
+                $game = M("game", "tab_")->field("relation_game_name")
+                    ->where(['relation_game_id' => ['in', $data['ids']]])
                     ->group("relation_game_id")
                     ->select();
                 $span_str = "";
                 foreach ($game as $key => $value) {
                     $span_str .= "<span style='margin-left: 15px'>{$value['relation_game_name']}</span>";
-                    if (($key+1)%5 == 0) {
+                    if (($key + 1) % 5 == 0) {
                         $span_str .= "<br>";
                     }
                 }
                 $data['span_str'] = $span_str;
             }
 
-            $this->assign("data",$data);
+            $this->assign("data", $data);
             $this->display();
         }
 
 
     }
 
-    public function delcompanybelonggame() {
+    public function delcompanybelonggame()
+    {
 
         $id = $_REQUEST["id"];
 
         if (!$id) {
-            $this->ajaxReturn(['msg'=>"参数传递错误","status"=>0]);
+            $this->ajaxReturn(['msg' => "参数传递错误", "status" => 0]);
         }
 
 
-        $data = M("company_belong_game","tab_")
-            ->where(['id'=>$id])
+        $data = M("company_belong_game", "tab_")
+            ->where(['id' => $id])
             ->find();
 
-        if (date("m",$data['begin_time']) < date("m",strtotime('-1 month'))) {
-            $this->ajaxReturn(['msg'=>"过去已结算过的比例不能删除","status"=>0]);
+        if (date("m", $data['begin_time']) < date("m", strtotime('-1 month'))) {
+            $this->ajaxReturn(['msg' => "过去已结算过的比例不能删除", "status" => 0]);
         }
 
-        $is_del = M("company_belong_game","tab_")
-            ->where(['id'=>$id])
+        $is_del = M("company_belong_game", "tab_")
+            ->where(['id' => $id])
             ->delete();
 
         if ($is_del) {
-            $this->ajaxReturn(['msg'=>"删除成功，请到对应时间段市场业绩重新结算，否则数据可能无法对上","status"=>1]);
+            $this->ajaxReturn(['msg' => "删除成功，请到对应时间段市场业绩重新结算，否则数据可能无法对上", "status" => 1]);
         } else {
-            $this->ajaxReturn(['msg'=>"删除失败","status"=>0]);
+            $this->ajaxReturn(['msg' => "删除失败", "status" => 0]);
         }
 
     }
 
-    public function showGame() {
+    public function showGame()
+    {
 
         $data = $_REQUEST;
 
         if (!$data['game_ids']) {
-            $this->ajaxReturn(['msg'=>"请选择游戏后点击确定","status"=>0]);
+            $this->ajaxReturn(['msg' => "请选择游戏后点击确定", "status" => 0]);
         }
 
-        $game_data = M("game","tab_")
+        $game_data = M("game", "tab_")
             ->field("relation_game_name,relation_game_id,game_type_name")
-            ->where(['relation_game_id'=>['in',$data['game_ids']]])
+            ->where(['relation_game_id' => ['in', $data['game_ids']]])
             ->group("relation_game_id")
             ->select();
 
-        $this->ajaxReturn(['msg'=>"选择游戏成功","status"=>1,"data"=>$game_data]);
+        $this->ajaxReturn(['msg' => "选择游戏成功", "status" => 1, "data" => $game_data]);
 
     }
 
@@ -1956,7 +1964,7 @@ class MarketPercentageController extends ThinkController
 
             $games = M('game', 'tab_')
                 ->field('relation_game_id id,relation_game_name game_name,short')
-                ->where(['game_status'=>1])
+                ->where(['game_status' => 1])
                 ->group("relation_game_id")
                 ->select();
             $data['data']['game_list'] = empty($games) ? '' : $games;
@@ -1969,4 +1977,32 @@ class MarketPercentageController extends ThinkController
         }
     }
 
+    //模板导出
+    public function downloadCoefficient()
+    {
+        header("Content-type: text/html; charset=utf-8");
+        error_reporting(E_ALL);
+        ini_set('display_errors', TRUE);
+        ini_set('display_startup_errors', TRUE);
+
+        define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+
+        Vendor("PHPExcel.PHPExcel");
+        $objPHPExcel = new \PHPExcel();
+        $objReader = \PHPExcel_IOFactory::createReader('Excel2007');
+
+        //设置模板文件
+        $objPHPExcel = $objReader->load("Public/Admin/excel/coefficient.xlsx");
+
+        $fileName = "绩效导入模板";
+
+        ob_end_clean();//清除缓冲区,避免乱码
+        header('pragma:public');
+        header('Content-type:application/vnd.ms-excel;charset=utf-8;name="' . $fileName .'".xls');
+        header("Content-Disposition:attachment;filename={$fileName}.xls");//attachment新窗口打印inline本窗口打印
+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
+        $objWriter->save('php://output');
+        exit;
+    }
+
 }
diff --git a/Application/Admin/View/MarketPercentage/addcoefficient.html b/Application/Admin/View/MarketPercentage/addcoefficient.html
index 15f0f19e1..1e3af9780 100644
--- a/Application/Admin/View/MarketPercentage/addcoefficient.html
+++ b/Application/Admin/View/MarketPercentage/addcoefficient.html
@@ -104,6 +104,9 @@
                 <button class="submit_btn" id="submit_btn">
                     保存
                 </button>
+                <a class="submit_btn " alt="下载模板" title="下载模板" href="{:U('downloadCoefficient')}">
+                    下载模板
+                </a>
                 <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();">
                     返回
                 </a>
diff --git a/Application/Payment/Controller/ExcelPaymentController.class.php b/Application/Payment/Controller/ExcelPaymentController.class.php
index 67571effc..65c35b158 100644
--- a/Application/Payment/Controller/ExcelPaymentController.class.php
+++ b/Application/Payment/Controller/ExcelPaymentController.class.php
@@ -534,4 +534,32 @@ class ExcelPaymentController extends BaseController
 
     }
 
+    //模板导出
+    public function downloadTemplate()
+    {
+        header("Content-type: text/html; charset=utf-8");
+        error_reporting(E_ALL);
+        ini_set('display_errors', TRUE);
+        ini_set('display_startup_errors', TRUE);
+
+        define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+
+        Vendor("PHPExcel.PHPExcel");
+        $objPHPExcel = new \PHPExcel();
+        $objReader = \PHPExcel_IOFactory::createReader('Excel2007');
+
+        //设置模板文件
+        $objPHPExcel = $objReader->load("Public/Admin/excel/underPayment.xlsx");
+
+        $fileName = "线下打款导入模板";
+
+        ob_end_clean();//清除缓冲区,避免乱码
+        header('pragma:public');
+        header('Content-type:application/vnd.ms-excel;charset=utf-8;name="' . $fileName .'".xls');
+        header("Content-Disposition:attachment;filename={$fileName}.xls");//attachment新窗口打印inline本窗口打印
+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
+        $objWriter->save('php://output');
+        exit;
+    }
+
 }
diff --git a/Application/Payment/View/ExcelPayment/add.html b/Application/Payment/View/ExcelPayment/add.html
index 62e13cf36..cffad901b 100644
--- a/Application/Payment/View/ExcelPayment/add.html
+++ b/Application/Payment/View/ExcelPayment/add.html
@@ -53,6 +53,9 @@
                 <button class="submit_btn" id="submit_btn">
                     保存
                 </button>
+                <a class="submit_btn " alt="下载模板" title="下载模板" href="{:U('downloadTemplate')}">
+                    下载模板
+                </a>
                 <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();">
                     返回
                 </a>
diff --git a/Public/Admin/excel/coefficient.xlsx b/Public/Admin/excel/coefficient.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..aa1f865fc4b1bfc024d211260d6049a611741a4b
GIT binary patch
literal 41121
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
Lq3A+0_E`T9Ev#;Q

literal 0
HcmV?d00001

diff --git a/Public/Admin/excel/underPayment.xlsx b/Public/Admin/excel/underPayment.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..3bd460b5a6d2249c5244305e92c93b214aaa98c6
GIT binary patch
literal 41329
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
TZhU}}XL1Z&R6C8#-T(a`_ixhY

literal 0
HcmV?d00001


From e775701c783624f0a828a393c7012be218588ea0 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Mon, 11 Jan 2021 16:12:19 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E5=AF=BC=E5=87=BA=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/SocietyInfoController.class.php        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index 1880870bd..f2182a0b0 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -76,10 +76,12 @@ class SocietyInfoController extends ThinkController
         $query = $model->where($map)->order("id desc");
         $count = $query->count();
         if($is_export){
-            $parseData = $query->field("province, city, company_name, register_capital, functionary, phone, wechat, qq, game_type, game_name, join_platform, promote_scale, turnover, address, league_info, is_potential, remark, interface_person, create_time, communication_time, create_account")
+            $parseData = $query->field("province, city, company_name, register_capital, functionary, phone, wechat, qq, game_type, game_name, join_platform, promote_scale,sociaty_level, turnover, address, league_info, is_potential, remark, interface_person, create_time, communication_time, create_account")
                 ->where($map)
+                ->order("id desc")
                 ->select();
             foreach ($parseData as &$v) {
+                $v['sociaty_level'] = $this->level[$v['sociaty_level']];
                 if ($v['is_potential'] == 1) $v['is_potential'] = "是";
                 else $v['is_potential'] = "否";
                 $v['communication_time'] = date('Y-m-d H:i:s', $v['communication_time']);
@@ -90,7 +92,7 @@ class SocietyInfoController extends ThinkController
             }
             addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME, I('get.*')),'menu'=>"推广-公会信息-导出"]);
             $head = ["省份", "城市", "公司", "注册资本", "负责人", "电话", "微信", "QQ", "游戏类型", "所做游戏",
-                "合作平台", "推广规模", "流水", "地址", "联盟信息", "是否为意向客户", "备注信息", "对接人", "录入时间", "最后沟通时间", "录入员"];
+                "合作平台", "推广规模", "公会等级", "流水", "地址", "联盟信息", "是否为意向客户", "备注信息", "对接人", "录入时间", "最后沟通时间", "录入员"];
             $this->export($head, $parseData, "公会信息-".date('Ymd'));
             return ;
         } else {

From f923f4d6674c7c7ad6f5347985a16725f31d043c Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 12 Jan 2021 10:48:55 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E4=BF=A1=E6=81=AF=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SocietyInfoController.class.php           | 131 +++++++++++----
 Application/Admin/View/SocietyInfo/add.html   |  12 +-
 Application/Admin/View/SocietyInfo/edit.html  |  12 +-
 Application/Admin/View/SocietyInfo/lists.html | 153 ++++++++++++------
 Public/Admin/excel/social_template.xls        | Bin 0 -> 39895 bytes
 5 files changed, 214 insertions(+), 94 deletions(-)
 create mode 100644 Public/Admin/excel/social_template.xls

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index f2182a0b0..85a72bd25 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -114,7 +114,9 @@ class SocietyInfoController extends ThinkController
             $v['num'] = $k+1+intval((I('get.p', 0)?I('get.p', 0):1)-1)*$row;
             $v['sociaty_level_str'] = $this->level[$v['sociaty_level']];
 
-            if (time() - $v['communication_time'] > $gap * 86400)
+            if (time() - $v['communication_time'] > $gap * 86400
+                && $v['is_potential'] == 1
+            )
                 $v['is_gap_time'] = 1;
         }
 
@@ -299,9 +301,24 @@ class SocietyInfoController extends ThinkController
 
         if ($_POST) {
             $save = I("post.");
+            if (empty($save['province'])) {
+                $this->error("省份为必填项");
+            }
+            if (empty($save['city'])) {
+                $this->error("城市为必填项");
+            }
             if (empty($save['company_name'])) {
                 $this->error("公司为必填项");
             }
+            if (empty($save['game_types'])) {
+                $this->error("游戏类型为必填项");
+            }
+            foreach ($save['game_types'] as $v) {
+                $save['game_type'] .= $v . "/";
+            }
+
+            $save['game_type'] = trim($save['game_type'], '/');
+//            dump($save['game_type']);die();
             if ($save['province'] == "请选择省份") $save['province'] = '';
             if ($save['city'] == "请选择城市") $save['city'] = '';
             $save['create_time'] = time();
@@ -331,6 +348,15 @@ class SocietyInfoController extends ThinkController
                 $save['province'] = '';
                 $save['city'] = '';
             }
+            if (empty($save['city'])) {
+                $this->error("城市为必填项");
+            }
+            if (empty($save['company_name'])) {
+                $this->error("公司为必填项");
+            }
+            if (empty($save['game_type'])) {
+                $this->error("游戏类型为必填项");
+            }
 
             $save['game_type'] = trim($save['game_type'], '/');
             $save['communication_time'] = time();
@@ -463,6 +489,7 @@ class SocietyInfoController extends ThinkController
 
     // 导入
     public function excelImport() {
+
         header("Content-Type:text/html;charset=utf-8");
         $upload = new \Think\Upload();// 实例化上传类
         $upload->maxSize   =     3145728 ;// 设置附件上传大小
@@ -473,8 +500,10 @@ class SocietyInfoController extends ThinkController
         $info   =   $upload->uploadOne($_FILES['excelData']);
         $filename = './Uploads/'.$info['savepath'].$info['savename'];
         $exts = $info['ext'];
+
         if(!$info) {// 上传错误提示错误信息
-            $this->error($upload->getError());
+            $this->ajaxReturn(['msg'=>$upload->getError(),"status"=>0]);
+//            $this->error($upload->getError());
         }
         // 上传成功
         $datas = $this->parseExcelIn($filename, $exts);
@@ -489,68 +518,83 @@ class SocietyInfoController extends ThinkController
             if ($flag == 0) continue;
             if ($k == 1) continue;
             $inserts[$k-2]['province'] = $v['A'] ?? '';
+            if (!$v['A']) {
+                $this->ajaxReturn(['msg'=>"省份不能为空".$k,"status"=>0]);
+            }
+
             $inserts[$k-2]['city'] = $v['B'] ?? '';
+            if (!$v['B']) {
+                $this->ajaxReturn(['msg'=>"城市不能为空".$k,"status"=>0]);
+            }
+
             $inserts[$k-2]['company_name'] = $v['C'] ?? '';
             if (mb_strlen($inserts[$k-2]['company_name'], "utf-8") > 100) {
-                $this->error("公司名太长".$k);
+                $this->ajaxReturn(['msg'=>"公司名太长".$k,"status"=>0]);
             }
             if (!$inserts[$k-2]['company_name']) {
-                $this->error("公司不能为空".$k);
+                $this->ajaxReturn(['msg'=>"公司不能为空".$k,"status"=>0]);
             }
             $inserts[$k-2]['register_capital'] = $v['D'] ?? '';
             if (strlen($inserts[$k-2]['register_capital']) > 50) {
-                $this->error("推荐人太长".$k);
+                $this->ajaxReturn(['msg'=>"推荐人太长".$k,"status"=>0]);
             }
             $inserts[$k-2]['functionary'] = $v['E'] ?? '';
             if (strlen($inserts[$k-2]['functionary']) > 50) {
-                $this->error("负责人太长".$k);
+                $this->ajaxReturn(['msg'=>"负责人太长".$k,"status"=>0]);
             }
             $inserts[$k-2]['phone'] = $v['F'] ?? '';
             if (strlen($inserts[$k-2]['phone']) > 50) {
-                $this->error("手机号太长".$k);
+                $this->ajaxReturn(['msg'=>"手机号太长".$k,"status"=>0]);
             }
             $inserts[$k-2]['wechat'] = $v['G'] ?? '';
             if (strlen($inserts[$k-2]['wechat']) > 50) {
-                $this->error("微信号太长".$k);
+                $this->ajaxReturn(['msg'=>"微信号太长".$k,"status"=>0]);
             }
             $inserts[$k-2]['qq'] = $v['H'] ?? '';
             if (strlen($inserts[$k-2]['qq']) > 50) {
-                $this->error("qq号太长".$k);
+                $this->ajaxReturn(['msg'=>"qq号太长".$k,"status"=>0]);
             }
             $inserts[$k-2]['game_type'] = $v['I'] ?? '';
             $inserts[$k-2]['game_name'] = $v['J'] ?? '';
             if (strlen($inserts[$k-2]['game_name']) > 50) {
-                $this->error("游戏名太长".$k);
+                $this->ajaxReturn(['msg'=>"游戏名太长".$k,"status"=>0]);
             }
             $inserts[$k-2]['join_platform'] = $v['K'] ?? '';
             if (strlen($inserts[$k-2]['join_platform']) > 50) {
-                $this->error("合作平台太长".$k);
+                $this->ajaxReturn(['msg'=>"合作平台太长".$k,"status"=>0]);
             }
             $inserts[$k-2]['promote_scale'] = $v['L'] ?? '';
             if (strlen($inserts[$k-2]['promote_scale']) > 50) {
-                $this->error("推广规模太长".$k);
+                $this->ajaxReturn(['msg'=>"推广规模太长".$k,"status"=>0]);
             }
+
             $inserts[$k-2]['turnover'] = $v['M'] ?? '';
             if (strlen($inserts[$k-2]['turnover']) > 50) {
-                $this->error("流水太长".$k);
+                $this->ajaxReturn(['msg'=>"公会等级".$k,"status"=>0]);
+            }
+
+            $inserts[$k-2]['turnover'] = $v['N'] ?? '';
+            if (strlen($inserts[$k-2]['turnover']) > 50) {
+                $this->ajaxReturn(['msg'=>"流水太长".$k,"status"=>0]);
             }
-            $inserts[$k-2]['address'] = $v['N'] ?? '';
+            $inserts[$k-2]['address'] = $v['O'] ?? '';
             if (mb_strlen($inserts[$k-2]['address'], 'utf-8') > 100) {
-                $this->error("地址太长".$k);
+                $this->ajaxReturn(['msg'=>"地址太长".$k,"status"=>0]);
             }
-            $inserts[$k-2]['league_info'] = $v['O'] ?? '';
+            $inserts[$k-2]['league_info'] = $v['P'] ?? '';
             if (strlen($inserts[$k-2]['league_info']) > 100) {
-                $this->error("联盟信息太长".$k);
+                $this->ajaxReturn(['msg'=>"联盟信息太长".$k,"status"=>0]);
             }
-            $inserts[$k-2]['is_potential'] = $v['P']=="是" ? 1 : 0;
-            $inserts[$k-2]['remark'] = $v['Q'] ?? '';
+            $inserts[$k-2]['is_potential'] = $v['Q']=="是" ? 1 : 0;
+            $inserts[$k-2]['remark'] = $v['R'] ?? '';
             if (strlen($inserts[$k-2]['remark']) > 100) {
-                $this->error("备注太长".$k);
+                $this->ajaxReturn(['msg'=>"备注太长".$k,"status"=>0]);
             }
-            $inserts[$k-2]['interface_person'] = $v['R'] ?? '';
+            $inserts[$k-2]['interface_person'] = $v['S'] ?? '';
             if (strlen($inserts[$k-2]['interface_person']) > 50) {
-                $this->error("对接人太长".$k);
+                $this->ajaxReturn(['msg'=>"对接人太长".$k,"status"=>0]);
             }
+
             $inserts[$k-2]['create_time'] = time();
             $inserts[$k-2]['update_time'] = time();
             $inserts[$k-2]['communication_time'] = time();
@@ -559,13 +603,14 @@ class SocietyInfoController extends ThinkController
             $gameTypes = explode('/', $v['I']);
             foreach ($gameTypes as $gameType) {
                 if (!M('game_type', 'tab_')->where(["type_name" => $gameType])->find()) {
-                    $this->error("游戏类型有误：{$gameType}");
+                    $this->ajaxReturn(['msg'=>"游戏类型有误：{$gameType}","status"=>0]);
                     return;
                 }
             }
         }
         M('society_info', 'tab_')->addAll($inserts);
-        $this->success("导入成功");
+        $this->ajaxReturn(['msg'=>"导入成功","status"=>1]);
+//        $this->success("导入成功");
     }
 
     private function parseExcelIn($filename, $exts) {
@@ -575,13 +620,13 @@ class SocietyInfoController extends ThinkController
         //创建PHPExcel对象，注意，不能少了\
         $PHPExcel=new \PHPExcel();
         //如果excel文件后缀名为.xls，导入这个类
-        if($exts == 'xls'){
+//        if($exts == 'xls'){
             //import("Org.Util.PHPExcel.Reader.Excel5");
             $PHPReader=new \PHPExcel_Reader_Excel5();
-        }else if($exts == 'xlsx'){
-            //import("Org.Util.PHPExcel.Reader.Excel2007");
-            $PHPReader=new \PHPExcel_Reader_Excel2007();
-        }
+//        }else if($exts == 'xlsx'){
+//            //import("Org.Util.PHPExcel.Reader.Excel2007");
+//            $PHPReader=new \PHPExcel_Reader_Excel2007();
+//        }
         //载入文件
         $PHPExcel=$PHPReader->load($filename);
         //获取表中的第一个工作表，如果要获取第二个，把0改为1，依次类推
@@ -606,4 +651,32 @@ class SocietyInfoController extends ThinkController
         return $data;
     }
 
+    //模板导出
+    public function downloadSocial()
+    {
+        header("Content-type: text/html; charset=utf-8");
+        error_reporting(E_ALL);
+        ini_set('display_errors', TRUE);
+        ini_set('display_startup_errors', TRUE);
+
+        define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+
+        Vendor("PHPExcel.PHPExcel");
+        $objPHPExcel = new \PHPExcel();
+        $objReader = \PHPExcel_IOFactory::createReader('Excel2007');
+
+        //设置模板文件
+        $objPHPExcel = $objReader->load("Public/Admin/excel/social_template.xls");
+
+        $fileName = "公会信息模板";
+
+        ob_end_clean();//清除缓冲区,避免乱码
+        header('pragma:public');
+        header('Content-type:application/vnd.ms-excel;charset=utf-8;name="' . $fileName .'".xls');
+        header("Content-Disposition:attachment;filename={$fileName}.xls");//attachment新窗口打印inline本窗口打印
+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
+        $objWriter->save('php://output');
+        exit;
+    }
+
 }
diff --git a/Application/Admin/View/SocietyInfo/add.html b/Application/Admin/View/SocietyInfo/add.html
index d6257700f..b6fc92202 100644
--- a/Application/Admin/View/SocietyInfo/add.html
+++ b/Application/Admin/View/SocietyInfo/add.html
@@ -32,7 +32,7 @@
                     <table  border="0" cellspacing="0" cellpadding="0">
                         <tbody>
                             <tr>
-                                <td class="l">省份:</td>
+                                <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>省份:</td>
                                 <td class="r" style="width: 50px;">
                                   <select name="province" id="province" class="select_gallery">
                                   </select>
@@ -40,7 +40,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="l">城市:</td>
+                                <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>城市:</td>
                                 <td class="r" style="width: 50px;">
                                     <select name="city" id="city" class="select_gallery">
                                     </select>
@@ -84,8 +84,8 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="l">游戏类型：</td>
-                                <input id="game_type" name="game_type" type="hidden" value="{$game_types[0]['type_name']}">
+                                <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>游戏类型：</td>
+<!--                                <input id="game_type" name="game_type" type="hidden" value="{$game_types[0]['type_name']}">-->
                                 <td class="r" style="">
                                     <volist name="game_types" id="vo">
                                         <span style="margin-right:18px;">{$vo['type_name']}: <input type="checkbox" name="game_types[]" value="{$vo['type_name']}"></span>
@@ -236,10 +236,10 @@
             var cres = $('form').serializeArray();
             console.log(cres);
             if ($("#province").val() == "请选择省份" || !$("#province").val()) {
-                // layer.msg('请选择省份');return ;
+                layer.msg('请选择省份');return ;
             }
             if (!$("#city").val()) {
-                // layer.msg('请选择城市');return ;
+                layer.msg('请选择城市');return ;
             }
             if (!$("#company_name").val()) {
                  layer.msg('请输入公司名');return ;
diff --git a/Application/Admin/View/SocietyInfo/edit.html b/Application/Admin/View/SocietyInfo/edit.html
index 0f2d6612e..604167269 100644
--- a/Application/Admin/View/SocietyInfo/edit.html
+++ b/Application/Admin/View/SocietyInfo/edit.html
@@ -33,7 +33,7 @@
                     <table  border="0" cellspacing="0" cellpadding="0">
                         <tbody>
                             <tr>
-                                <td class="l">省份:</td>
+                                <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>省份:</td>
                                 <td class="r" style="width: 50px;">
                                   <select name="province" id="province" class="select_gallery">
                                   </select>
@@ -41,7 +41,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="l">城市:</td>
+                                <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>城市:</td>
                                 <td class="r" style="width: 50px;">
                                     <select name="city" id="city" class="select_gallery">
                                     </select>
@@ -49,7 +49,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="l">公司：</td>
+                                <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>公司：</td>
                                 <td class="r table_radio">
                                   <input type="text" value="{$data['company_name']}" name="company_name" id="company_name" class="input" placeholder="请输入公司名称" maxlength="50">
                                 </td>
@@ -85,7 +85,7 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td class="l">游戏类型：</td>
+                                <td class="l"><i class="mustmark" style="margin-left:-7px">*</i>游戏类型：</td>
                                 <!--<input id="game_type" name="game_type" type="hidden" value="{$game_types[0]['type_name']}">-->
                                 <td class="r" style="">
                                     <volist name="game_types" id="vo">
@@ -268,10 +268,10 @@
         $("#submit").on("click",function(){
             var cres = $('form').serializeArray();
             if ($("#province").val() == "请选择省份" || !$("#province").val()) {
-                // layer.msg('请选择省份');return ;
+                layer.msg('请选择省份');return ;
             }
             if (!$("#city").val()) {
-                // layer.msg('请选择城市');return ;
+                layer.msg('请选择城市');return ;
             }
             if (!$("#company_name").val()) {
                 layer.msg('请输入公司名');return ;
diff --git a/Application/Admin/View/SocietyInfo/lists.html b/Application/Admin/View/SocietyInfo/lists.html
index 30e46c5fc..9b3e5f7da 100644
--- a/Application/Admin/View/SocietyInfo/lists.html
+++ b/Application/Admin/View/SocietyInfo/lists.html
@@ -126,7 +126,8 @@
             <form id="form" action="{:U('excelImport')}" method="post" class="form-horizontal" enctype="multipart/form-data">
             <div class="input-list">
                 <input type="file" id="excelData" name="excelData" accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet">
-                <button class="submit_btn" id="submit" type="submit" target-form="form-horizontal">确 定</button>
+                <button class="submit_btn " id="submit" type="submit" target-form="form-horizontal" url="{:U('excelImport')}">确 定</button>
+                <button id="downloads" class="submit_btn"  type="text" url="{:U('downloadSocial')}" target-form="form-horizontal" >下载模板</button>
                 <button id="excel_back" class="submit_btn"  type="text" target-form="form-horizontal">返 回</button>
             </div>
             </form>
@@ -220,58 +221,58 @@
             </table>
         </div>
     </div>
-    <div class="data_list data_game_list model" style="display: none;">
-        <div class="" style="margin-top: 25px;">
-            <table border="1">
-                <!-- 表头 -->
-                <thead>
-                <tr>
-                    <th>省份</th>
-                    <th>城市</th>
-                    <th>公司</th>
-                    <th>注册资本</th>
-                    <th>负责人</th>
-                    <th>电话</th>
-                    <th>微信</th>
-                    <th>QQ</th>
-                    <th>游戏类型</th>
-                    <th>所做游戏</th>
-                    <th>合作平台</th>
-                    <th>推广规模</th>
-                    <th>流水</th>
-                    <th>地址</th>
-                    <th>联盟信息</th>
-                    <th>是否为意向客户</th>
-                    <th>备注信息</th>
-                    <th>对接人</th>
-                </tr>
-                </thead>
-
-                <!-- 列表 -->
-                <tbody>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        <td rowspan="{$data.row}">--</td>
-                        </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
+<!--    <div class="data_list data_game_list model" style="display: none;">-->
+<!--        <div class="" style="margin-top: 25px;">-->
+<!--            <table border="1">-->
+<!--                &lt;!&ndash; 表头 &ndash;&gt;-->
+<!--                <thead>-->
+<!--                <tr>-->
+<!--                    <th>省份</th>-->
+<!--                    <th>城市</th>-->
+<!--                    <th>公司</th>-->
+<!--                    <th>注册资本</th>-->
+<!--                    <th>负责人</th>-->
+<!--                    <th>电话</th>-->
+<!--                    <th>微信</th>-->
+<!--                    <th>QQ</th>-->
+<!--                    <th>游戏类型</th>-->
+<!--                    <th>所做游戏</th>-->
+<!--                    <th>合作平台</th>-->
+<!--                    <th>推广规模</th>-->
+<!--                    <th>流水</th>-->
+<!--                    <th>地址</th>-->
+<!--                    <th>联盟信息</th>-->
+<!--                    <th>是否为意向客户</th>-->
+<!--                    <th>备注信息</th>-->
+<!--                    <th>对接人</th>-->
+<!--                </tr>-->
+<!--                </thead>-->
+
+<!--                &lt;!&ndash; 列表 &ndash;&gt;-->
+<!--                <tbody>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        <td rowspan="{$data.row}">&#45;&#45;</td>-->
+<!--                        </tr>-->
+<!--                </tbody>-->
+<!--            </table>-->
+<!--        </div>-->
+<!--    </div>-->
 
     <div class="page">
         {$_page|default=''}
@@ -375,6 +376,12 @@
     //导航高亮
     highlight_subnav("{:U('lists')}");
     $(function(){
+        $("#downloads").on("click",function(){
+            var url = $(this).attr("url");
+            window.location.href = url;
+            return  false;;
+
+        });
         $("#excel_in").click(function () {
             $(".search_list").hide();
             $(".excel_list").show();
@@ -382,6 +389,46 @@
             $(".model").show();
             return false;
         });
+
+        $("#submit").click(function () {
+            var fileObj = document.getElementById("excelData").files[0]; // js 获取文件对象
+            var url = $(this).attr('url');
+            var oReq = new XMLHttpRequest();
+
+            var formFile = new FormData();
+            formFile.append("excelData", fileObj,"excelData.xlsx"); //加入文件对象
+
+            layer.confirm('【提示】是否确认财务部编辑保存', {
+                btn: ['确认','取消'],
+                title:false
+            }, function(index){
+                $.ajax({
+                    url:url,
+                    type:"post",
+                    data:formFile,
+                    dataType:'json',
+                    cache: false,
+                    processData: false,
+                    contentType: false,
+                    success:function(data){
+                        if (data.status == 1) {
+                            layer.msg(data.msg);
+                            setTimeout(function(){
+                                // window.parent.reload()
+                                window.location.href = "{:U('lists')}";
+                            },2000)
+
+                        } else {
+                            layer.msg(data.msg);
+                        }
+
+                    }
+                })
+            });
+
+            return false;
+        });
+
         $("#excel_back").click(function () {
             $(".search_list").show();
             $(".excel_list").hide();
diff --git a/Public/Admin/excel/social_template.xls b/Public/Admin/excel/social_template.xls
new file mode 100644
index 0000000000000000000000000000000000000000..0c9502a7800b0a1c4cf3ea6c1a89e35578627285
GIT binary patch
literal 39895
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
Vy3*-GVI_pmXmohFins&P{{xD1D3AaE

literal 0
HcmV?d00001


From e0430cfb46fcc851564e4517636f55135a498737 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 12 Jan 2021 10:51:07 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E4=BF=A1=E6=81=AF=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/SocietyInfo/lists.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Admin/View/SocietyInfo/lists.html b/Application/Admin/View/SocietyInfo/lists.html
index 9b3e5f7da..f17dbc3e8 100644
--- a/Application/Admin/View/SocietyInfo/lists.html
+++ b/Application/Admin/View/SocietyInfo/lists.html
@@ -398,7 +398,7 @@
             var formFile = new FormData();
             formFile.append("excelData", fileObj,"excelData.xlsx"); //加入文件对象
 
-            layer.confirm('【提示】是否确认财务部编辑保存', {
+            layer.confirm('【提示】是否确认导入公会信息', {
                 btn: ['确认','取消'],
                 title:false
             }, function(index){

From 3beeb81063a8aed1a0f04c787dbfcc44a2f2798c Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 12 Jan 2021 11:07:43 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E4=BF=A1=E6=81=AF=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/SocietyInfoController.class.php   | 10 +++++-----
 Application/Admin/View/SocietyInfo/lists.html          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index 85a72bd25..f64a126c8 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -620,13 +620,13 @@ class SocietyInfoController extends ThinkController
         //创建PHPExcel对象，注意，不能少了\
         $PHPExcel=new \PHPExcel();
         //如果excel文件后缀名为.xls，导入这个类
-//        if($exts == 'xls'){
+        if($exts == 'xls'){
             //import("Org.Util.PHPExcel.Reader.Excel5");
             $PHPReader=new \PHPExcel_Reader_Excel5();
-//        }else if($exts == 'xlsx'){
-//            //import("Org.Util.PHPExcel.Reader.Excel2007");
-//            $PHPReader=new \PHPExcel_Reader_Excel2007();
-//        }
+        }else if($exts == 'xlsx'){
+            //import("Org.Util.PHPExcel.Reader.Excel2007");
+            $PHPReader=new \PHPExcel_Reader_Excel2007();
+        }
         //载入文件
         $PHPExcel=$PHPReader->load($filename);
         //获取表中的第一个工作表，如果要获取第二个，把0改为1，依次类推
diff --git a/Application/Admin/View/SocietyInfo/lists.html b/Application/Admin/View/SocietyInfo/lists.html
index f17dbc3e8..c7c6e72db 100644
--- a/Application/Admin/View/SocietyInfo/lists.html
+++ b/Application/Admin/View/SocietyInfo/lists.html
@@ -396,7 +396,7 @@
             var oReq = new XMLHttpRequest();
 
             var formFile = new FormData();
-            formFile.append("excelData", fileObj,"excelData.xlsx"); //加入文件对象
+            formFile.append("excelData", fileObj); //加入文件对象
 
             layer.confirm('【提示】是否确认导入公会信息', {
                 btn: ['确认','取消'],

From a199a12d4b220d168590b20013195406a27c5200 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 14 Jan 2021 16:10:24 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E4=BF=A1=E6=81=AFbug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SocietyInfoController.class.php           | 686 ++++++++++++++++++
 Public/static/area.js                         |  63 ++
 2 files changed, 749 insertions(+)
 create mode 100644 Application/Admin/Controller/SocietyInfoController.class.php
 create mode 100644 Public/static/area.js

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
new file mode 100644
index 000000000..a0c45772a
--- /dev/null
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -0,0 +1,686 @@
+<?php
+
+namespace Admin\Controller;
+
+use Base\Tool\AggregateClient;
+use User\Api\UserApi as UserApi;
+use Think\Controller;
+use Base\Service\PartnerService;
+
+/**
+ * 工会信息
+ */
+class SocietyInfoController extends ThinkController
+{
+    private $modelName = 'SocietyInfo';
+    private $admininfo = '';
+    private $level = [
+        1=>'S',
+        2=>'A',
+        3=>'B',
+        4=>'其他'
+    ];
+
+    public function _initialize()
+    {
+        $this->admininfo = $_SESSION['onethink_admin']['user_auth'];
+        parent::_initialize();
+    }
+    //列表
+    public function lists()
+    {
+        $model = M($this->modelName, 'tab_');
+        $map = [];
+        if ($this->admininfo['username'] == "admin" || isMarketLeader()) {
+            // admin 和 市场总监可以看所有数据
+        } else {
+            // 其他用户只能看自己的
+            $map['create_account'] = $this->admininfo['username'];
+        }
+
+        if ($_REQUEST['text']) {
+            $map['_string'] = "province like '%{$_REQUEST['text']}%' or city like '%{$_REQUEST['text']}%'
+            or company_name like '%{$_REQUEST['text']}%' or register_capital like '%{$_REQUEST['text']}%' or functionary like '%{$_REQUEST['text']}%' 
+            or phone like '%{$_REQUEST['text']}%' or wechat like '%{$_REQUEST['text']}%' or qq like '%{$_REQUEST['text']}%' or game_type like '%{$_REQUEST['text']}%'
+             or game_name like '%{$_REQUEST['text']}%' or join_platform like '%{$_REQUEST['text']}%' or promote_scale like '%{$_REQUEST['text']}%' or turnover= '{$_REQUEST['text']}'
+              or address like '%{$_REQUEST['text']}%' or league_info like '%{$_REQUEST['text']}%' or remark like '%{$_REQUEST['text']}%' or interface_person like '%{$_REQUEST['text']}%'";
+        }
+
+        $page = intval(I('get.p', 0));
+        $page = $page ? $page : 1; //默认显示第一页数据
+        $row = intval(I('row', 0));
+        $row = empty($row) ? 10 : $row;//每页条数
+
+        $is_export= false;
+        if (isset($_REQUEST['export']) && $_REQUEST['export']==1){
+            $is_export = true;
+        }
+        $config = M('config', 'sys_')->where([
+            'name' => 'SOCIETY_INFO_COMMUNITION_GAP'
+        ])->find();
+        $gap = $config['value'];
+
+        if (I('province') && I('province') != '请选择省份') $map['province'] = I('province');
+        if (I('city') && I('city') != '请选择城市') $map['city'] = I('city');
+        if (I('game_type') && I('game_type') != '请选择游戏类型') $map['game_type'] = array("exp", "like '%".I('game_type')."%'");
+        if (trim(I('interface_person'))) $map['interface_person'] = I('interface_person');
+        if (I('time_gap', '') == 1) {
+            $map['communication_time'] = array('gt', time() - $gap * 86400);
+        }
+        if (I('time_gap', -1) == 0) {
+            $map['communication_time'] = array('elt', time() - $gap * 86400);
+        }
+        if (I('sociaty_level') && I('sociaty_level') != '0') $map['sociaty_level'] = I('sociaty_level');
+        //获取分页数据
+        $query = $model->where($map)->order("communication_time desc");
+        $count = $query->count();
+        if($is_export){
+            $parseData = $query->field("province, city, company_name, register_capital, functionary, phone, wechat, qq, game_type, game_name, join_platform, promote_scale,sociaty_level, turnover, address, league_info, is_potential, remark, interface_person, create_time, communication_time, create_account")
+                ->where($map)
+                ->order("communication_time desc")
+                ->select();
+            foreach ($parseData as &$v) {
+                $v['sociaty_level'] = $this->level[$v['sociaty_level']];
+                if ($v['is_potential'] == 1) $v['is_potential'] = "是";
+                else $v['is_potential'] = "否";
+                $v['communication_time'] = date('Y-m-d H:i:s', $v['communication_time']);
+                $v['create_time'] = date('Y-m-d H:i:s', $v['create_time']);
+                unset($v['id']);
+                unset($v['game_id']);
+                unset($v['update_time']);
+            }
+            addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME, I('get.*')),'menu'=>"推广-公会信息-导出"]);
+            $head = ["省份", "城市", "公司", "注册资本", "负责人", "电话", "微信", "QQ", "游戏类型", "所做游戏",
+                "合作平台", "推广规模", "公会等级", "流水", "地址", "联盟信息", "是否为意向客户", "备注信息", "对接人", "录入时间", "最后沟通时间", "录入员"];
+            $this->export($head, $parseData, "公会信息-".date('Ymd'));
+            return ;
+        } else {
+            $societyInfos = $model->where($map)->order("communication_time desc")->field("*")->page($page,$row)->select();
+//            dump($societyInfos);die();
+        }
+
+        //分页
+        $parameter = I("get.");
+        $parameter['p'] = $page;
+        $parameter['row'] = $row;
+        $page = set_pagination($count, $row, $parameter);
+        if ($page) {
+            $this->assign('_page', $page);
+        }
+
+        foreach ($societyInfos as $k => &$v) {
+
+            $v['num'] = $k+1+intval((I('get.p', 0)?I('get.p', 0):1)-1)*$row;
+            $v['sociaty_level_str'] = $this->level[$v['sociaty_level']];
+
+            if (time() - $v['communication_time'] > $gap * 86400
+                && $v['is_potential'] == 1
+            )
+                $v['is_gap_time'] = 1;
+        }
+
+        $this->checkListOrCountAuthRestMap($map,[]);
+
+        if (IS_ROOT) {
+            $this->assign('timeset_check',true);
+            $this->assign('delset_check',true);
+        } else {
+            $this->assign('timeset_check',$this->checkRule("Admin/SocietyInfo/timeset" ,array('in','1,2')));
+            $this->assign('delset_check',$this->checkRule("Admin/SocietyInfo/delset" ,array('in','1,2')));
+        }
+
+
+//        $this->assign('time_gap', $config['value']);
+        $gameTypes = M('game_type', 'tab_')->field("id, type_name")->select();
+        $this->assign('game_types', $gameTypes);
+        $this->assign('listData', $societyInfos);
+        $this->assign('count', $count);
+        $this->meta_title = '公会信息登记表（说明：此功能是公会信息内容登记）';
+        $this->display();
+    }
+
+    // 导出
+    public function export($head, $body, $filename, $title='') {
+        Vendor("PHPExcel.PHPExcel");
+        $objPHPExcel = new \PHPExcel();
+        $startRow = 1;  //从第一行开始
+        $i='A';
+        foreach($head as $item){
+            $objPHPExcel->setActiveSheetIndex(0)->setCellValue($i.$startRow, $item);
+            $i++;
+        }
+
+        //主体数据
+        foreach($body as $key=>$value){
+            $startRow++;
+            $index='A';
+            foreach($value as $k=>$v){
+                $objPHPExcel->getActiveSheet()->getStyle($index.$startRow)->getNumberFormat()->setFormatCode("@"); //文本格式
+                $objPHPExcel->setActiveSheetIndex(0)->setCellValue($index.$startRow, $v);
+                $index++;
+            }
+        }
+        if ($title) {
+            $objPHPExcel->getActiveSheet()->setTitle($title);
+        }
+        $objPHPExcel->setActiveSheetIndex(0);
+        header('Content-Type: application/vnd.ms-excel');
+        header('Content-Disposition: attachment;filename="'.$filename.'.xlsx"');
+        header('Cache-Control: max-age=0');
+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
+        ob_end_clean();
+        $objWriter->save('php://output');
+    }
+
+    // 时间间隔设置
+    public function timeset() {
+        $config = M('config', 'sys_')->where([
+            'name' => 'SOCIETY_INFO_COMMUNITION_GAP'
+        ])->find();
+        $num = $config['value'];
+        if (IS_POST) {
+            $num = I('num');
+            if ($num < 0) {
+                $this->error("时间设置不能小于0");
+            }
+            M('config', 'sys_')->where([
+                'name' => 'SOCIETY_INFO_COMMUNITION_GAP'
+            ])->save([
+                'value' => $num
+            ]);
+            $this->success("设置成功");
+        }
+
+        $this->assign('num', $num);
+        $this->display();
+    }
+    //审核列表
+    public function index()
+    {
+        $page = intval(I('get.p', 0));
+        $page = $page ? $page : 1; //默认显示第一页数据
+        $row = intval(I('row', 0));
+        $row = empty($row) ? 10 : $row;//每页条数
+        $p = $_REQUEST;
+
+        if(!IS_ROOT){
+            $this->OpAuthList= getModuleControllerAuth();
+        }
+
+        $map = [];
+        if (!empty(I('partner_name'))) {
+            $map['partner_name'] = ['like', '%' . I('partner_name') . '%'];
+        }
+        if (!empty($p['verify_type'])) {
+            if($p['verify_type'] == 1){
+                $map['partner_id'] = 0;
+            }else{
+                $map['partner_id'] = ["neq",0];
+            }
+        }
+        if (isset($p['verify_status'])) {
+            $map['verify_status'] = $p['verify_status'];
+        }
+
+        if (isset($_REQUEST['timestart']) && isset($_REQUEST['timeend'])) {
+            $time_start = strtotime($_REQUEST['timestart']);
+            $time_end = strtotime($_REQUEST['timeend'])+ 86399;
+            $map["create_time"] =['BETWEEN',[$time_start, $time_end]];
+        } elseif (isset($_REQUEST['timestart'])) {
+            $time_start = strtotime($_REQUEST['timestart']);
+            $map["create_time"] =['EGT',$time_start];
+        } elseif (isset($_REQUEST['timeend'])) {
+            $time_end = strtotime($_REQUEST['timeend'])+ 86399;
+            $map["create_time"] =  ['ELT',$time_end];
+        }
+        $model = M("partner_verify", 'tab_');
+        $data =  $model->where($map)->page($page,$row)->order("FIELD(verify_status,0,1,-1),create_time desc")->select();
+        foreach ($data as $k => &$v) {
+            $v['partner_info'] = json_decode($v['partner_info'],true);
+            if($v['partner_id'] == 0){
+                $v['verify_type'] = "新增";
+            }else{
+                $v['verify_type'] = "修改";
+            }
+            $v['partner_info']['company_type'] = $v['partner_info']['company_type'] == 2 ? '个人' : '公司';
+
+            $contract_start_time = $v['partner_info']['contract_start_time'] ? time_format($v['partner_info']['contract_start_time'], 'Y/m/d') : '-';
+            if($v['partner_info']['contract_start_time']){
+                $contract_end_time = $v['partner_info']['contract_end_time'] ? date('Y/m/d', $v['partner_info']['contract_end_time']) : '永久';
+            }else{
+                $contract_end_time = $v['partner_info']['contract_end_time'] ? time_format($v['partner_info']['contract_end_time'], 'Y/m/d') : '-';
+            }
+            $v['contract_time'] = $contract_start_time . '-' . $contract_end_time;
+
+            $validity_start_time = $v['partner_info']['validity_start_time'] ?
+                time_format($v['partner_info']['validity_start_time'], 'Y/m/d') : '-';
+
+            if($v['partner_info']['validity_start_time']){
+                $validity_end_time = $v['partner_info']['validity_end_time'] ? date('Y/m/d', $v['partner_info']['validity_end_time']) : '永久';
+            }else{
+                $validity_end_time = $v['partner_info']['validity_end_time'] ? time_format($v['partner_info']['validity_end_time'], 'Y/m/d') : '-';
+            }
+            $v['validity_time'] = $validity_start_time . '-' . $validity_end_time;
+
+            $create_time = date("Y-m-d H:i:s",$v["create_time"]);
+
+            $v['verify_log'] = json_decode($v['verify_log'], true);
+            $v["create"]= "{$v['verify_log']['create_user']} <br> {$v['verify_log']['create_time']}";
+            if(isset($v['verify_log']['verify_user'])){
+                if($v['verify_status'] == -1){
+                    $ts = "审核拒绝";
+                }else{
+                    $ts = "审核通过";
+                }
+                $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);
+        $this->meta_title = '上游CP审核列表';
+        $this->display();
+    }
+
+    //添加
+    public function add()
+    {
+        $gameTypes = M('game_type', 'tab_')->field("id, type_name")->select();
+        $this->assign("game_types", $gameTypes);
+        $this->assign("interface_person", $this->admininfo['username']);
+
+        if ($_POST) {
+            $save = I("post.");
+            if (empty($save['province'])) {
+                $this->error("省份为必填项");
+            }
+            if (empty($save['city'])) {
+                $this->error("城市为必填项");
+            }
+            if (empty($save['company_name'])) {
+                $this->error("公司为必填项");
+            }
+            if (empty($save['game_types'])) {
+                $this->error("游戏类型为必填项");
+            }
+            foreach ($save['game_types'] as $v) {
+                $save['game_type'] .= $v . "/";
+            }
+
+            $save['game_type'] = trim($save['game_type'], '/');
+//            dump($save['game_type']);die();
+            if ($save['province'] == "请选择省份") $save['province'] = '';
+            if ($save['city'] == "请选择城市") $save['city'] = '';
+            $save['create_time'] = time();
+            $save['update_time'] = time();
+            $save['communication_time'] = time();
+            $save['create_account'] = $this->admininfo['username'];
+            M('society_info', 'tab_')->add($save);
+            $this->success('保存成功', U('lists'));
+        } else {
+            $this->meta_title = '新增公会信息';
+            $this->display();
+        }
+    }
+
+    //编辑
+    public function edit()
+    {
+        $model = M($this->modelName, 'tab_');
+
+        if ($_POST) {
+            $save = I("post.");
+            $id = $save['id'];
+            foreach ($save['game_types'] as $v) {
+                $save['game_type'] .= $v . "/";
+            }
+            if ($save['province'] == '请选择省份') {
+                $save['province'] = '';
+                $save['city'] = '';
+            }
+            if (empty($save['city'])) {
+                $this->error("城市为必填项");
+            }
+            if (empty($save['company_name'])) {
+                $this->error("公司为必填项");
+            }
+            if (empty($save['game_type'])) {
+                $this->error("游戏类型为必填项");
+            }
+
+            $save['game_type'] = trim($save['game_type'], '/');
+            $save['communication_time'] = time();
+            $save['update_time'] = time();
+            unset($save['id']);
+
+            $res = M('society_info', 'tab_')->where(['id' => $id])->save($save);
+            if ($res === false) {
+                $this->error('保存失败');
+            } else {
+                \Think\Log::actionLog('SocietyInfo/edit', 'SocietyInfo', $id);
+                addOperationLog(array(
+                    "op_type"=>1,
+                    "key"=>$id,
+                    "url"=>U("SocietyInfo/edit",array("id"=>$id))
+                ));
+                $this->success('保存成功', U('index'));
+            }
+        } else {
+            $id = intval(I('get.id', 0));
+            $map['id'] = $id;
+            $data = $model->find($id);
+            if (empty($data)) {
+                $this->error('数据异常', U('lists'));
+            }
+            $gameTypes = M('game_type', 'tab_')->field("id, type_name")->select();
+            $myGameTypes = explode('/', $data['game_type']);
+            foreach ($gameTypes as &$v) {
+                $v['check'] = 0;
+                foreach ($myGameTypes as $item) {
+                    if ($item == $v['type_name']) {
+                        $v['check'] = 1;
+                    }
+                }
+            }
+
+            $this->assign("game_types", $gameTypes);
+            $this->assign('data', $data);
+            $this->meta_title = '编辑';
+            $this->display();
+        }
+    }
+
+    //查看
+    public function view()
+    {
+        $model = M($this->modelName, 'tab_');
+
+
+        $id = intval(I('get.id', 0));
+        $map['id'] = $id;
+        $data = $model->find($id);
+        if (empty($data)) {
+            $this->error('数据异常', U('lists'));
+        }
+        $gameTypes = M('game_type', 'tab_')->field("id, type_name")->select();
+        $myGameTypes = explode('/', $data['game_type']);
+        foreach ($gameTypes as &$v) {
+            $v['check'] = 0;
+            foreach ($myGameTypes as $item) {
+                if ($item == $v['type_name']) {
+                    $v['check'] = 1;
+                }
+            }
+        }
+
+        $this->assign("game_types", $gameTypes);
+        $this->assign('data', $data);
+        $this->meta_title = '编辑';
+        $this->display();
+    }
+
+    //删除
+    public function del()
+    {
+        if (!empty($_POST['ids'])) {
+            if (!is_array($_POST['ids'])) {
+                $this->error('参数异常');
+            }
+
+            $id = implode(',', $_POST['ids']);
+        } else {
+            $id = intval(I('get.id', 0));
+            if ($id == 0) {
+                $this->error('参数异常');
+            }
+        }
+        $res = M($this->modelName, 'tab_')->delete($id);
+        if ($res === false) {
+            $this->error('删除失败');
+        }
+        addOperationLog(array(
+            "op_type"=>2,
+            "key"=>$id,
+            "url"=>U("Society/lists")
+        ));
+        $this->success('删除成功', U('lists'));
+    }
+
+    //批量删除
+    public function del_check() {
+        if (!empty($_POST['ids'])) {
+            if (!is_array($_POST['ids'])) {
+                $this->ajaxReturn(['status'=>0,'info'=>'参数异常']);
+//                $this->error('参数异常');
+            }
+
+            $id = implode(',', $_POST['ids']);
+        } else {
+            $id = intval(I('get.id', 0));
+            if ($id == 0) {
+                $this->ajaxReturn(['status'=>0,'info'=>'参数异常']);
+//                $this->error('参数异常');
+            }
+        }
+        $res = M($this->modelName, 'tab_')->delete($id);
+        if ($res === false) {
+//            $this->error('删除失败');
+            $this->ajaxReturn(['status'=>0,'info'=>'删除失败']);
+        }
+        addOperationLog(array(
+            "op_type"=>2,
+            "key"=>$id,
+            "url"=>U("Society/lists")
+        ));
+
+        $this->ajaxReturn(['status'=>1,'info'=>'删除成功']);
+
+    }
+
+    // 导入
+    public function excelImport() {
+
+        header("Content-Type:text/html;charset=utf-8");
+        $upload = new \Think\Upload();// 实例化上传类
+        $upload->maxSize   =     3145728 ;// 设置附件上传大小
+        $upload->exts      =     array('xls', 'xlsx');// 设置附件上传类
+        $upload->rootPath  =     './Uploads/'; // 设置附件上传目录
+        $upload->savePath  =      'excel/'; // 设置附件上传目录
+        // 上传文件
+        $info   =   $upload->uploadOne($_FILES['excelData']);
+        $filename = './Uploads/'.$info['savepath'].$info['savename'];
+        $exts = $info['ext'];
+
+        if(!$info) {// 上传错误提示错误信息
+            $this->ajaxReturn(['msg'=>$upload->getError(),"status"=>0]);
+//            $this->error($upload->getError());
+        }
+        // 上传成功
+        $datas = $this->parseExcelIn($filename, $exts);
+        $inserts = [];
+        foreach ($datas as $k => $v) {
+            $flag = 0;
+            foreach ($v as $p) {
+                if (!empty($p)) {
+                    $flag = 1;
+                }
+            }
+            if ($flag == 0) continue;
+            if ($k == 1) continue;
+            $inserts[$k-2]['province'] = $v['A'] ?? '';
+            if (!$v['A']) {
+                $this->ajaxReturn(['msg'=>"省份不能为空".$k,"status"=>0]);
+            }
+
+            $inserts[$k-2]['city'] = $v['B'] ?? '';
+            if (!$v['B']) {
+                $this->ajaxReturn(['msg'=>"城市不能为空".$k,"status"=>0]);
+            }
+
+            $inserts[$k-2]['company_name'] = $v['C'] ?? '';
+            if (mb_strlen($inserts[$k-2]['company_name'], "utf-8") > 100) {
+                $this->ajaxReturn(['msg'=>"公司名太长".$k,"status"=>0]);
+            }
+            if (!$inserts[$k-2]['company_name']) {
+                $this->ajaxReturn(['msg'=>"公司不能为空".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['register_capital'] = $v['D'] ?? '';
+            if (strlen($inserts[$k-2]['register_capital']) > 50) {
+                $this->ajaxReturn(['msg'=>"推荐人太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['functionary'] = $v['E'] ?? '';
+            if (strlen($inserts[$k-2]['functionary']) > 50) {
+                $this->ajaxReturn(['msg'=>"负责人太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['phone'] = $v['F'] ?? '';
+            if (strlen($inserts[$k-2]['phone']) > 50) {
+                $this->ajaxReturn(['msg'=>"手机号太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['wechat'] = $v['G'] ?? '';
+            if (strlen($inserts[$k-2]['wechat']) > 50) {
+                $this->ajaxReturn(['msg'=>"微信号太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['qq'] = $v['H'] ?? '';
+            if (strlen($inserts[$k-2]['qq']) > 50) {
+                $this->ajaxReturn(['msg'=>"qq号太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['game_type'] = $v['I'] ?? '';
+            $inserts[$k-2]['game_name'] = $v['J'] ?? '';
+            if (strlen($inserts[$k-2]['game_name']) > 50) {
+                $this->ajaxReturn(['msg'=>"游戏名太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['join_platform'] = $v['K'] ?? '';
+            if (strlen($inserts[$k-2]['join_platform']) > 50) {
+                $this->ajaxReturn(['msg'=>"合作平台太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['promote_scale'] = $v['L'] ?? '';
+            if (strlen($inserts[$k-2]['promote_scale']) > 50) {
+                $this->ajaxReturn(['msg'=>"推广规模太长".$k,"status"=>0]);
+            }
+
+            $inserts[$k-2]['turnover'] = $v['M'] ?? '';
+            if (strlen($inserts[$k-2]['turnover']) > 50) {
+                $this->ajaxReturn(['msg'=>"公会等级".$k,"status"=>0]);
+            }
+
+            $inserts[$k-2]['turnover'] = $v['N'] ?? '';
+            if (strlen($inserts[$k-2]['turnover']) > 50) {
+                $this->ajaxReturn(['msg'=>"流水太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['address'] = $v['O'] ?? '';
+            if (mb_strlen($inserts[$k-2]['address'], 'utf-8') > 100) {
+                $this->ajaxReturn(['msg'=>"地址太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['league_info'] = $v['P'] ?? '';
+            if (strlen($inserts[$k-2]['league_info']) > 100) {
+                $this->ajaxReturn(['msg'=>"联盟信息太长".$k,"status"=>0]);
+            }
+            if ($v['Q']) {
+                $inserts[$k-2]['is_potential'] = ($v['Q']=="是" ? 1 : 0);
+            } else {
+                $inserts[$k-2]['is_potential'] = 1;
+            }
+
+            $inserts[$k-2]['remark'] = $v['R'] ?? '';
+            if (strlen($inserts[$k-2]['remark']) > 100) {
+                $this->ajaxReturn(['msg'=>"备注太长".$k,"status"=>0]);
+            }
+            $inserts[$k-2]['interface_person'] = $v['S'] ?? '';
+            if (strlen($inserts[$k-2]['interface_person']) > 50) {
+                $this->ajaxReturn(['msg'=>"对接人太长".$k,"status"=>0]);
+            }
+
+            $inserts[$k-2]['create_time'] = time();
+            $inserts[$k-2]['update_time'] = time();
+            $inserts[$k-2]['communication_time'] = time();
+            $inserts[$k-2]['create_account'] = $this->admininfo['username'];
+
+            $gameTypes = explode('/', $v['I']);
+            foreach ($gameTypes as $gameType) {
+                if (!M('game_type', 'tab_')->where(["type_name" => $gameType])->find()) {
+                    $this->ajaxReturn(['msg'=>"游戏类型有误：{$gameType}","status"=>0]);
+                    return;
+                }
+            }
+        }
+        M('society_info', 'tab_')->addAll($inserts);
+        $this->ajaxReturn(['msg'=>"导入成功","status"=>1]);
+//        $this->success("导入成功");
+    }
+
+    private function parseExcelIn($filename, $exts) {
+        //导入PHPExcel类库，因为PHPExcel没有用命名空间，只能inport导入
+        //import("Org.Util.PHPExcel");
+        vendor("PHPExcel.PHPExcel");
+        //创建PHPExcel对象，注意，不能少了\
+        $PHPExcel=new \PHPExcel();
+        //如果excel文件后缀名为.xls，导入这个类
+        if($exts == 'xls'){
+            //import("Org.Util.PHPExcel.Reader.Excel5");
+            $PHPReader=new \PHPExcel_Reader_Excel5();
+        }else if($exts == 'xlsx'){
+            //import("Org.Util.PHPExcel.Reader.Excel2007");
+            $PHPReader=new \PHPExcel_Reader_Excel2007();
+        }
+        //载入文件
+        $PHPExcel=$PHPReader->load($filename);
+        //获取表中的第一个工作表，如果要获取第二个，把0改为1，依次类推
+        $currentSheet=$PHPExcel->getSheet(0);
+        //获取总列数
+        $allColumn=$currentSheet->getHighestColumn();
+        //获取总行数
+        $allRow=$currentSheet->getHighestRow();
+        //循环获取表中的数据，$currentRow表示当前行，从哪行开始读取数据，索引值从0开始
+        for($currentRow=1;$currentRow<=$allRow;$currentRow++){
+            //从哪列开始，A表示第一列
+            for($currentColumn='A';$currentColumn<=$allColumn;$currentColumn++){
+                //数据坐标
+                $address=$currentColumn.$currentRow;
+                //读取到的数据，保存到数组$arr中
+                $data[$currentRow][$currentColumn]=$currentSheet->getCell($address)->getValue();
+                if(is_object($data[$currentRow][$currentColumn]))  $data[$currentRow][$currentColumn] = $data[$currentRow][$currentColumn]->__toString();
+            }
+
+        }
+
+        return $data;
+    }
+
+    //模板导出
+    public function downloadSocial()
+    {
+        header("Content-type: text/html; charset=utf-8");
+        error_reporting(E_ALL);
+        ini_set('display_errors', TRUE);
+        ini_set('display_startup_errors', TRUE);
+
+        define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '<br />');
+
+        Vendor("PHPExcel.PHPExcel");
+        $objPHPExcel = new \PHPExcel();
+        $objReader = \PHPExcel_IOFactory::createReader('Excel2007');
+
+        //设置模板文件
+        $objPHPExcel = $objReader->load("Public/Admin/excel/social_template.xls");
+
+        $fileName = "公会信息模板";
+
+        ob_end_clean();//清除缓冲区,避免乱码
+        header('pragma:public');
+        header('Content-type:application/vnd.ms-excel;charset=utf-8;name="' . $fileName .'".xls');
+        header("Content-Disposition:attachment;filename={$fileName}.xls");//attachment新窗口打印inline本窗口打印
+        $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
+        $objWriter->save('php://output');
+        exit;
+    }
+
+}
diff --git a/Public/static/area.js b/Public/static/area.js
new file mode 100644
index 000000000..0dd4da02b
--- /dev/null
+++ b/Public/static/area.js
@@ -0,0 +1,63 @@
+var provinces = ['请选择省份','北京市','上海市','天津市','重庆市','河北省','山西省','内蒙古省','辽宁省','吉林省','黑龙江省','江苏省','浙江省','安徽省','福建省','江西省','山东省','河南省','湖北省','湖南省','广东省','广西省','海南省','四川省','贵州省','云南省','西藏省','陕西省','甘肃省','宁夏省','青海省','新疆省','香港','澳门','台湾','其他'];
+var citys = [['请选择城市'],
+    ["东城区", "西城区", "崇文区", "宣武区", "朝阳区", "丰台区", "石景山区", "海淀区", "门头沟区", "房山区", "通州区", "顺义区", "昌平区", "大兴区", "怀柔区", "平谷区", "密云县", "延庆县","其他"],
+    ["黄浦区", "卢湾区", "徐汇区", "长宁区", "静安区", "普陀区", "虹口区", "杨浦区", "闵行区", "宝山区", "嘉定区", "浦东新区", "金山区", "松江区", "青浦区", "南汇区", "奉贤区", "崇明县","其他"],
+    ["和平区", "河东区", "河西区", "南开区", "河北区", "红桥区", "塘沽区", "汉沽区", "大港区", "东丽区", "西青区", "津南区", "北辰区", "武清区", "宝坻区", "宁河县", "静海县", "蓟县","其他"],
+    ["万州区", "涪陵区", "渝中区", "大渡口区", "江北区", "沙坪坝区", "九龙坡区", "南岸区", "北碚区", "万盛区", "双桥区", "渝北区", "巴南区", "黔江区", "长寿区", "綦江县", "潼南县", "铜梁县", "大足县", "荣昌县", "璧山县", "梁平县", "城口县", "丰都县", "垫江县", "武隆县", "忠县", "开县", "云阳县", "奉节县", "巫山县", "巫溪县", "石柱土家族自治县", "秀山土家族苗族自治县", "酉阳土家族苗族自治县", "彭水苗族土家族自治县", "江津市", "合川市", "永川市", "南川市","其他"],
+    ["石家庄市","张家口市","承德市","秦皇岛市","唐山市","廊坊市","保定市","衡水市","沧州市","邢台市","邯郸市","其他"],
+    ["太原市","朔州市","大同市","阳泉市","长治市","晋城市","忻州市","晋中市","临汾市","吕梁市","运城市","其他"],
+    ["呼和浩特市","包头市","乌海市","赤峰市","通辽市","呼伦贝尔市","鄂尔多斯市","乌兰察布市","巴彦淖尔市","兴安盟","锡林郭勒盟","阿拉善盟","其他"],
+    ["沈阳市","朝阳市","阜新市","铁岭市","抚顺市","本溪市","辽阳市","鞍山市","丹东市","大连市","营口市","盘锦市","锦州市","葫芦岛市","其他"],
+    ["长春市","白城市","松原市","吉林市","四平市","辽源市","通化市","白山市","延边州","其他"],
+    ["哈尔滨市","齐齐哈尔市","七台河市","黑河市","大庆市","鹤岗市","伊春市","佳木斯市","双鸭山市","鸡西市","牡丹江市","绥化市","大兴安岭地区","其他"],
+    ["南京市","徐州市","连云港市","宿迁市","淮安市","盐城市","扬州市","泰州市","南通市","镇江市","常州市","无锡市","苏州市","其他"],
+    ["杭州市","湖州市","嘉兴市","舟山市","宁波市","绍兴市","衢州市","金华市","台州市","温州市","丽水市","其他"],
+    ["合肥市","宿州市","淮北市","亳州市","阜阳市","蚌埠市","淮南市","滁州市","马鞍山市","芜湖市","铜陵市","安庆市","黄山市","六安市","巢湖市","池州市","宣城市","其他"],
+    ["福州市","南平市","莆田市","三明市","泉州市","厦门市","漳州市","龙岩市","宁德市","其他"],
+    ["南昌市","九江市","景德镇市","鹰潭市","新余市","萍乡市","赣州市","上饶市","抚州市","宜春市","吉安市","其他"],
+    ["济南市","青岛市","聊城市","德州市","东营市","淄博市","潍坊市","烟台市","威海市","日照市","临沂市","枣庄市","济宁市","泰安市","莱芜市","滨州市","菏泽市","其他"],
+    ["郑州市","开封市","三门峡市","洛阳市","焦作市","新乡市","鹤壁市","安阳市","濮阳市","商丘市","许昌市","漯河市","平顶山市","南阳市","信阳市","周口市","驻马店市","济源市","其他"],
+    ["武汉市","十堰市","襄樊市","荆门市","孝感市","黄冈市","鄂州市","黄石市","咸宁市","荆州市","宜昌市","随州市","省直辖县级行政单位","恩施州","其他"],
+    ["长沙市","张家界市","常德市","益阳市","岳阳市","株洲市","湘潭市","衡阳市","郴州市","永州市","邵阳市","怀化市","娄底市","湘西州","其他"],
+    ["广州市","深圳市","清远市","韶关市","河源市","梅州市","潮州市","汕头市","揭阳市","汕尾市","惠州市","东莞市","珠海市","中山市","江门市","佛山市","肇庆市","云浮市","阳江市","茂名市","湛江市","其他"],
+    ["南宁市","桂林市","柳州市","梧州市","贵港市","玉林市","钦州市","北海市","防城港市","崇左市","百色市","河池市","来宾市","贺州市","其他"],
+    ["海口市","三亚市","省直辖县级行政单位","其他"],
+    ["成都市","广元市","绵阳市","德阳市","南充市","广安市","遂宁市","内江市","乐山市","自贡市","泸州市","宜宾市","攀枝花市","巴中市","达州市","资阳市","眉山市","雅安市","阿坝州","甘孜州","凉山州","其他"],
+    ["贵阳市","六盘水市","遵义市","安顺市","毕节地区","铜仁地区","黔东南州","黔南州","黔西南州","其他"],
+    ["昆明市","曲靖市","玉溪市","保山市","昭通市","丽江市","思茅市","临沧市","德宏州","怒江州","迪庆州","大理州","楚雄州","红河州","文山州","西双版纳州","其他"],
+    ["拉萨市","那曲地区","昌都地区","林芝地区","山南地区","日喀则地区","阿里地区","其他"],
+    ["西安市","延安市","铜川市","渭南市","咸阳市","宝鸡市","汉中市","榆林市","安康市","商洛市","其他"],
+    ["兰州市","嘉峪关市","白银市","天水市","武威市","酒泉市","张掖市","庆阳市","平凉市","定西市","陇南市","临夏州","甘南州","其他"],
+    ["西宁市","海东地区","海北州","海南州","黄南州","果洛州","玉树州","海西州","其他"],
+    ["银川市","石嘴山市","吴忠市","固原市","中卫市","其他"],
+    ["乌鲁木齐市","克拉玛依市","自治区直辖县级行政单位","喀什地区","阿克苏地区","和田地区","吐鲁番地区","哈密地区","克孜勒苏柯州","博尔塔拉州","昌吉州","巴音郭楞州","伊犁州","塔城地区","阿勒泰地区","其他"],
+    ["香港","其他"],
+    ["澳门","其他"],
+    ["台北市","高雄市","台中市","花莲市","基隆市","嘉义市","金门市","连江市","苗栗市","南投市","澎湖市","屏东市","台东市","台南市","桃园市","新竹市","宜兰市","云林市","彰化市","其他"],
+    ["其他"]
+];
+
+function areaInit(){
+    // 注意这里是要通过 id 获取元素，而不是通过 class 获取
+    var province = document.getElementById('province');
+    //给选择框一个高度，可直接写进数据，不然要先创建dom元素option再录值
+    province.length=provinces.length;
+    for(var i=0;i<provinces.length;i++){
+        province.options[i].text=provinces[i];
+        province.options[i].value=provinces[i];
+    }
+
+    document.getElementById("province").onchange = provinceChange;
+}
+function provinceChange(){
+    var province = document.getElementById("province");
+    var num = province.selectedIndex; // 选中option索引
+    var city = document.getElementById('city');
+    var citystemp=citys[num];
+    city.length=citystemp.length;
+    for(var i=0;i<citystemp.length;i++){
+        city.options[i].text=citystemp[i];
+        city.options[i].value=citystemp[i];
+    }
+    city.options[0].selected=true;
+}
\ No newline at end of file

From 99acaed9723652bfea755175226642869c3df5ca Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Thu, 14 Jan 2021 16:38:17 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E5=8A=9F=E8=83=BD=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/SocietyInfoController.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Application/Admin/Controller/SocietyInfoController.class.php b/Application/Admin/Controller/SocietyInfoController.class.php
index a0c45772a..84292f5c4 100644
--- a/Application/Admin/Controller/SocietyInfoController.class.php
+++ b/Application/Admin/Controller/SocietyInfoController.class.php
@@ -117,6 +117,10 @@ class SocietyInfoController extends ThinkController
                 && $v['is_potential'] == 1
             )
                 $v['is_gap_time'] = 1;
+
+            if($gap == 0 && $v['communication_time']!=$v['create_time']) {
+                $v['is_gap_time'] = 0;
+            }
         }
 
         $this->checkListOrCountAuthRestMap($map,[]);