diff --git a/application/admin/controller/agent/AgentManage.php b/application/admin/controller/agent/AgentManage.php
index fcac6257..39a6ba02 100644
--- a/application/admin/controller/agent/AgentManage.php
+++ b/application/admin/controller/agent/AgentManage.php
@@ -57,7 +57,7 @@ class AgentManage extends AuthController
         ];
         $uidAll = UserModel::getAll($where);
         $this->assign(compact('limitTimeList','uidAll'));
-        $this->assign(UserModel::systemPage($where));
+        $this->assign(UserModel::agentSystemPage($where));
         return $this->fetch();
     }
 
diff --git a/application/admin/model/wechat/WechatUser.php b/application/admin/model/wechat/WechatUser.php
index 3a0f928e..99821250 100644
--- a/application/admin/model/wechat/WechatUser.php
+++ b/application/admin/model/wechat/WechatUser.php
@@ -102,6 +102,49 @@ use service\SystemConfigService;
      * @return array
      */
     public static function systemPage($where = array(),$isall=false){
+        $model = new self;
+        $model = $model->where('openid','NOT NULL');
+        if($where['nickname'] !== '') $model = $model->where('nickname','LIKE',"%$where[nickname]%");
+        if($where['data'] !== ''){
+            list($startTime,$endTime) = explode(' - ',$where['data']);
+            $model = $model->where('add_time','>',strtotime($startTime));
+            $model = $model->where('add_time','<',strtotime($endTime));
+        }
+        if(isset($where['tagid_list']) && $where['tagid_list'] !== ''){
+            $tagid_list = explode(',',$where['tagid_list']);
+            foreach ($tagid_list as $v){
+                $model = $model->where('tagid_list','LIKE',"%$v%");
+            }
+        }
+        if(isset($where['groupid']) && $where['groupid'] !== '-1' ) $model = $model->where('groupid',"$where[groupid]");
+        if(isset($where['sex']) && $where['sex'] !== '' ) $model = $model->where('sex',"$where[sex]");
+        if(isset($where['subscribe']) && $where['subscribe'] !== '' ) $model = $model->where('subscribe',"$where[subscribe]");
+        $model = $model->order('uid desc');
+        if(isset($where['export']) && $where['export'] == 1){
+            $list = $model->select()->toArray();
+            $export = [];
+            foreach ($list as $index=>$item){
+                $export[] = [
+                    $item['nickname'],
+                    $item['sex'],
+                    $item['country'].$item['province'].$item['city'],
+                    $item['subscribe'] == 1? '关注':'未关注',
+                ];
+                $list[$index] = $item;
+            }
+            PHPExcelService::setExcelHeader(['名称','性别','地区','是否关注公众号'])
+                ->setExcelTile('微信用户导出','微信用户导出'.time(),' 生成时间：'.date('Y-m-d H:i:s',time()))
+                ->setExcelContent($export)
+                ->ExcelSave();
+        }
+        return self::page($model,$where);
+    }
+/**
+     * 获取分销用户
+     * @param array $where
+     * @return array
+     */
+    public static function agentSystemPage($where = array(),$isall=false){
         self::setWechatUserOrder();//设置 一级推荐人 二级推荐人 一级推荐人订单 二级推荐人订单 佣金
         $model = new self;
         if($isall==false) {
diff --git a/application/admin/view/wechat/wechat_user/index.php b/application/admin/view/wechat/wechat_user/index.php
index f61802b5..bfdceb99 100644
--- a/application/admin/view/wechat/wechat_user/index.php
+++ b/application/admin/view/wechat/wechat_user/index.php
@@ -164,131 +164,7 @@
                                     </div>
                                 </th>
                                 <th class="text-center no-sort">地区</th>
-                                <th class="text-center">
-                                    <div class="btn-group">
-                                        <button data-toggle="dropdown" class="btn btn-white btn-xs dropdown-toggle" style="font-weight: bold;background-color: #f5f5f6;border: solid 0;"
-                                                aria-expanded="false">一级推荐人
-                                            <span class="stair caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu search-item" data-name="stair">
-                                            <li data-value="">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-arrows-v"></i>默认
-                                                </a>
-                                            </li>
-                                            <li data-value="stair desc">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-sort-numeric-desc"></i>降序
-                                                </a>
-                                            </li>
-                                            <li data-value="stair asc">
-                                                <a class="save_mark" href="javascript:void(0);">
-                                                    <i class="fa fa-sort-numeric-asc"></i>升序
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </th>
-                                <th class="text-center">
-                                    <div class="btn-group">
-                                        <button data-toggle="dropdown" class="btn btn-white btn-xs dropdown-toggle" style="font-weight: bold;background-color: #f5f5f6;border: solid 0;"
-                                                aria-expanded="false">二级推荐人
-                                            <span class="second caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu search-item" data-name="second">
-                                            <li data-value="">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-arrows-v"></i>默认
-                                                </a>
-                                            </li>
-                                            <li data-value="second desc">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-sort-numeric-desc"></i>降序
-                                                </a>
-                                            </li>
-                                            <li data-value="second asc">
-                                                <a class="save_mark" href="javascript:void(0);">
-                                                    <i class="fa fa-sort-numeric-asc"></i>升序
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </th>
-                                <th class="text-center">
-                                    <div class="btn-group">
-                                        <button data-toggle="dropdown" class="btn btn-white btn-xs dropdown-toggle" style="font-weight: bold;background-color: #f5f5f6;border: solid 0;"
-                                                aria-expanded="false">一级推广订单
-                                            <span class="order_stair caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu search-item" data-name="order_stair">
-                                            <li data-value="">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-arrows-v"></i>默认
-                                                </a>
-                                            </li>
-                                            <li data-value="order_stair desc">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-sort-numeric-desc"></i>降序
-                                                </a>
-                                            </li>
-                                            <li data-value="order_stair asc">
-                                                <a class="save_mark" href="javascript:void(0);">
-                                                    <i class="fa fa-sort-numeric-asc"></i>升序
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </th>
-                                <th class="text-center">
-                                    <div class="btn-group">
-                                        <button data-toggle="dropdown" class="btn btn-white btn-xs dropdown-toggle" style="font-weight: bold;background-color: #f5f5f6;border: solid 0;"
-                                                aria-expanded="false">所有推广订单
-                                            <span class="caret order_second"></span>
-                                        </button>
-                                        <ul class="dropdown-menu search-item" data-name="order_second">
-                                            <li data-value="">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-arrows-v"></i>默认
-                                                </a>
-                                            </li>
-                                            <li data-value="order_second desc">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-sort-numeric-asc"></i>降序
-                                                </a>
-                                            </li>
-                                            <li data-value="order_second asc">
-                                                <a class="save_mark" href="javascript:void(0);">
-                                                    <i class="fa fa-sort-numeric-desc"></i>升序
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </th>
-                                <th class="text-center">
-                                    <div class="btn-group">
-                                        <button data-toggle="dropdown" class="btn btn-white btn-xs dropdown-toggle" style="font-weight: bold;background-color: #f5f5f6;border: solid 0;"
-                                                aria-expanded="false">获得佣金
-                                            <span class="now_money caret"></span>
-                                        </button>
-                                        <ul class="dropdown-menu search-item" data-name="now_money">
-                                            <li data-value="">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-arrows-v"></i>默认
-                                                </a>
-                                            </li>
-                                            <li data-value="now_money desc">
-                                                <a class="save_mark" href="javascript:void(0);"  >
-                                                    <i class="fa fa-sort-numeric-asc"></i>降序
-                                                </a>
-                                            </li>
-                                            <li data-value="now_money asc">
-                                                <a class="save_mark" href="javascript:void(0);">
-                                                    <i class="fa fa-sort-numeric-desc"></i>升序
-                                                </a>
-                                            </li>
-                                        </ul>
-                                    </div>
-                                </th>
+
                                 <th class="text-center">
                                     <div class="btn-group">
                                         <button data-toggle="dropdown" class="btn btn-white btn-xs dropdown-toggle" style="font-weight: bold;background-color: #f5f5f6;border: solid 0;"
@@ -314,7 +190,7 @@
                                         </ul>
                                     </div>
                                 </th>
-                                <th class="text-center">推广二维码</th>
+
                                 <th class="text-center">
                                     <div class="btn-group">
                                         <button data-toggle="dropdown" class="btn btn-white btn-xs dropdown-toggle" style="font-weight: bold;padding: 6px 50px;background-color: #f5f5f6;border: solid 0;"
@@ -373,27 +249,9 @@
                                     <td class="text-center">
                                         {$vo.country}{$vo.province}{$vo.city}
                                     </td>
-                                    <td class="text-center">
-                                        <button class="btn btn-white  btn-xs"  onclick="$eb.createModalFrame('推荐人列表','{:Url('stair',['uid'=>$vo['uid']])}',{'w':800})">
-                                            <i class="fa fa-street-view"></i>
-                                            {$vo.stair}
-                                        </button>
-                                    </td>
-                                    <td class="text-center">
-                                        {$vo.second}
-                                    </td>
-                                    <td class="text-center">
-                                        {$vo.order_stair}
-                                    </td>
-                                    <td class="text-center">
-                                        {$vo.order_second}
-                                    </td>
-                                    <td class="text-center">
-                                        <button class="btn btn-white  btn-xs"  onclick="$eb.createModalFrame('佣金记录','{:Url('now_money',['uid'=>$vo['uid']])}',{'w':800})">
-                                            <i class="fa fa-dollar"></i>
-                                            {$vo.now_money}
-                                        </button>
-                                    </td>
+
+
+
                                     <td class="text-center">
                                         {if condition="$vo['subscribe']"}
                                         关注
@@ -401,9 +259,7 @@
                                         未关注
                                         {/if}
                                     </td>
-                                    <td class="text-center">
-                                        <img src="{$vo.qr_code.url}" alt="{$vo.nickname}" title="{$vo.nickname}" style="width:50px;height: 50px;cursor: pointer;" class="head_image" data-image="{$vo.qr_code.url}">
-                                    </td>
+
                                     <td class="text-center">
                                         <?php if(!is_array($groupList)){ ?>
                                             无