diff --git a/src/views/modules/user/user.vue b/src/views/modules/user/user.vue
index 26014be0..06c1d4e4 100644
--- a/src/views/modules/user/user.vue
+++ b/src/views/modules/user/user.vue
@@ -2,12 +2,74 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-epdc__user}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-row>
+            <el-button type="primary" plain>主要按钮</el-button>
+            <el-button type="primary" plain>成功按钮</el-button>
+            <el-button type="primary" plain>信息按钮</el-button>
+        </el-row>
+        <template>
+          <span>街道&nbsp;&nbsp;&nbsp;&nbsp;</span>
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+      </template>
+      <template>
+          <span>社区&nbsp;&nbsp;&nbsp;&nbsp;</span>
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+      </template>
+      <template>
+          <span>网格&nbsp;&nbsp;&nbsp;&nbsp;</span>
+          <el-select v-model="value" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+      </template>
+      <p></p>
+        <span >姓名&nbsp;&nbsp;&nbsp;&nbsp;</span>
         <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
         </el-form-item>
+        <span>手机号&nbsp;&nbsp;&nbsp;&nbsp;</span>
         <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+          <span>身份证号&nbsp;&nbsp;&nbsp;&nbsp;</span>
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <p></p>
+        <div class="block">
+        <span class="demonstration">注册时间</span>
+          <el-date-picker
+             v-model="value1"
+             type="daterange"
+             range-separator="至"
+             start-placeholder="开始日期"
+             end-placeholder="结束日期">
+          </el-date-picker>&nbsp;
+          <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+         <el-form-item>
+          <el-button type="info" @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+        </div>
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:user:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
@@ -17,12 +79,17 @@
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="nickname" label="昵称" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column> -->
+        <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="nickname" label="昵称" header-align="center" align="center"></el-table-column> -->
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="password" label="密码" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="partyFlag" label="是否是党员(0-否，1-是)" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="state" label="审核状态" header-align="center" align="center"></el-table-column>
         <el-table-column prop="registerTime" label="注册时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="faceImg" label="头像" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="phoneProvince" label="手机号所属省份" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="address" label="居民住址" header-align="center" align="center"></el-table-column>
+        <!-- <el-table-column prop="faceImg" label="头像" header-align="center" align="center"></el-table-column>
         <el-table-column prop="sex" label="性别(女性-female，男性-male)" header-align="center" align="center"></el-table-column>
         <el-table-column prop="birthday" label="生日" header-align="center" align="center"></el-table-column>
         <el-table-column prop="email" label="邮箱" header-align="center" align="center"></el-table-column>
@@ -36,14 +103,9 @@
         <el-table-column prop="lastLoginIp" label="最近登录IP" header-align="center" align="center"></el-table-column>
         <el-table-column prop="lastLongitude" label="最近登录位置经度" header-align="center" align="center"></el-table-column>
         <el-table-column prop="lastLatitude" label="最近登录位置维度" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="realName" label="真实姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="identityNo" label="身份证号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="居民住址" header-align="center" align="center"></el-table-column>
         <el-table-column prop="wxOpenId" label="微信OPENID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="partyFlag" label="是否是党员(0-否，1-是)" header-align="center" align="center"></el-table-column>
         <el-table-column prop="registerWay" label="注册方式（wx：微信注册）" header-align="center" align="center"></el-table-column>
         <el-table-column prop="registerSource" label="用户来源(wp:公众号)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="phoneProvince" label="手机号所属省份" header-align="center" align="center"></el-table-column>
         <el-table-column prop="phoneCity" label="手机号所属城市" header-align="center" align="center"></el-table-column>
         <el-table-column prop="phoneCarrier" label="手机号所属运营商" header-align="center" align="center"></el-table-column>
         <el-table-column prop="points" label="用户积分" header-align="center" align="center"></el-table-column>
@@ -54,11 +116,11 @@
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
         <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标记" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标记" header-align="center" align="center"></el-table-column> -->
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('epdc:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('epdc:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button  type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button  type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -85,14 +147,46 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/epdc/user/page',
+        getDataListURL: 'app-user/epdc/user/page',
         getDataListIsPage: true,
-        deleteURL: '/epdc/user',
-        deleteIsBatch: true
+        deleteURL: '/app-use/epdc/user',
+        deleteIsBatch: true,
+        exportURL: '/sys/log/login/export'
       },
       dataForm: {
         id: ''
-      }
+      },
+      options: [{
+        value: '选项1',
+        label: '黄金糕'
+      }, {
+        value: '选项2',
+        label: '双皮奶'
+      }, {
+        value: '选项3',
+        label: '蚵仔煎'
+      }, {
+        value: '选项4',
+        label: '龙须面'
+      }, {
+        value: '选项5',
+        label: '北京烤鸭'
+      }],
+      value: ''
+    }
+  },
+  created () {
+    this.getDeptList()
+  },
+  methods: {
+    // 获取部门列表
+    getDeptList () {
+      return this.$http.get('/sys/dept/list').then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.deptList = res.data
+      }).catch(() => {})
     }
   },
   components: {