diff --git a/src/api/consumer.ts b/src/api/consumer.ts
index 38fceed..e7075ec 100644
--- a/src/api/consumer.ts
+++ b/src/api/consumer.ts
@@ -12,7 +12,10 @@ export function getUserList(params: any) {
 export function getUserDetail(params: any) {
   return request.get({ url: "/user.user/detail", params });
 }
-
+// 导出用户
+export function exportUerLists(params: any) {
+  return request.get({ url: "/user.user/lists?export=2", params });
+}
 // 用户编辑
 export function userEdit(params: any) {
   return request.post({ url: "/user.user/edit", params });
diff --git a/src/views/consumer/lists/index.vue b/src/views/consumer/lists/index.vue
index f33efd9..390ee01 100644
--- a/src/views/consumer/lists/index.vue
+++ b/src/views/consumer/lists/index.vue
@@ -7,48 +7,51 @@
             @keyup.enter="resetPage" />
         </el-form-item>
         <el-form-item label="时间段">
-          <el-date-picker v-model="queryParams.time" type="daterange" unlink-panels range-separator="-"
-            start-placeholder="开始时间" end-placeholder="结束时间" />
+          <el-date-picker v-model="queryTime" type="daterange" unlink-panels range-separator="-" start-placeholder="开始时间"
+            end-placeholder="结束时间" @change="changeTime" value-format="YYYY-MM-DD" />
         </el-form-item>
-
-        <el-form-item label="区" prop="area" >
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.area"
-            clearable
-            placeholder="请输入区"
-          />
+        <el-form-item label="省" >
+          <el-select class="w-[280px]" v-model="queryParams.province" placeholder="请选择省" clearable @change="province_change"
+            >
+            <el-option v-for="(item, index) in datas.provinceOptions" :key="index" :label="item.province_name"
+              :value="item.province_code"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="镇" prop="street" >
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.street"
-            clearable
-            placeholder="请输入镇"
-          />
+        <el-form-item label="市">
+          <el-select class="w-[280px]" v-model="queryParams.city" placeholder="请选择市" clearable @change="city_change"
+           >
+            <el-option v-for="(item, index) in datas.cityOptions" :key="index" :label="item.city_name"
+              :value="item.city_code"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="村社" prop="street" >
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.brigade"
-            clearable
-            placeholder="请输入村社"
-          />
+        <el-form-item label="区县" >
+          <el-select class="w-[280px]" v-model="queryParams.area" placeholder="请选择区县" clearable @change="area_change"
+            >
+            <el-option v-for="(item, index) in datas.areaOptions" :key="index" :label="item.area_name"
+              :value="item.area_code"></el-option>
+          </el-select>
         </el-form-item>
-
-
+        <el-form-item label="乡镇" >
+          <el-select class="w-[280px]" v-model="queryParams.street" placeholder="请选择乡镇" clearable @change="street_change"
+            >
+            <el-option v-for="(item, index) in datas.streetOptions" :key="index" :label="item.street_name"
+              :value="item.street_code"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="村社" >
+          <el-select class="w-[280px]" v-model="queryParams.village" placeholder="请选择村社" clearable @change="village_change"
+           >
+            <el-option v-for="(item, index) in datas.villageOptions" :key="index" :label="item.village_name"
+              :value="item.village_code"></el-option>
+          </el-select>
+        </el-form-item>
+      
+      
+      
         <el-form-item>
           <el-button type="primary" @click="resetPage">查询</el-button>
           <el-button @click="resetParams">重置</el-button>
-          <el-button type="primary" @click="resetPage">导出</el-button>
-
-          <!-- <export-data
-            class="ml-2.5"
-            :fetch-fun="getUserList"
-            :params="queryParams"
-            :page-size="pager.size"
-          /> -->
-
+          <el-button type="primary" @click="exportUerListsFn">导出</el-button>
           <router-link :to="{
             path: getRoutePath('user.user/edit'),
           }">
@@ -79,28 +82,7 @@
         </el-table-column>
         <el-table-column label="所在乡镇" prop="street_name" min-width="120" />
         <el-table-column label="授权身份" prop="role_name" min-width="120">
-          <!-- <template #default="{ row }">
-            <span
-              v-if="row.admin_id == row.company?.admin_id"
-              style="color: #67c23a"
-              >公司后台管理人员</span
-            >
-            <span v-else style="color: #fe0000">无</span>
-          </template> -->
         </el-table-column>
-        <!-- <el-table-column
-          label="是否签约"
-          prop="is_contract"
-          align="center"
-          min-width="120"
-        >
-          <template #default="{ row }">
-            <span v-if="row.is_contract == 1" style="color: #67c23a"
-              >已签约</span
-            >
-            <span v-else style="color: #fe0000">未签约</span>
-          </template>
-        </el-table-column> -->
         <el-table-column label="操作" min-width="300" align="center" fixed="right">
           <template #default="{ row }">
             <el-button v-perms="['user.user/detail']" type="primary" link>
@@ -125,94 +107,11 @@
                 编辑
               </router-link>
             </el-button>
-
-
-            <!-- <template v-if="row.is_contract == 0">
-              <el-button
-                v-perms="['user.user/launch']"
-                type="primary"
-                link
-                v-if="!row.contract"
-              >
-                <router-link
-                  :to="{
-                    path: getRoutePath('user.user/detail'),
-                    query: {
-                      id: row.id,
-                      mode: 'initiate',
-                    },
-                  }"
-                >
-                  生成合同
-                </router-link>
-              </el-button>
-
-              <el-button
-                v-perms="['user.user/uplode']"
-                type="primary"
-                link
-                v-if="row.contract?.check_status == 1"
-              >
-                <router-link
-                  :to="{
-                    path: getRoutePath('user.user/detail'),
-                    query: {
-                      id: row.id,
-                      mode: 'uplode',
-                      mdoeid: row.contract.id,
-                    },
-                  }"
-                >
-                  上传合同
-                </router-link>
-              </el-button>
-              <el-button
-                v-perms="['user.user/launch']"
-                type="primary"
-                v-if="row.contract?.check_status == 2"
-                link
-                @click="
-                  (showPop = true),
-                    (showConctactPop = true),
-                    (contractId = row.id)
-                "
-                >发送合同</el-button
-              >
-              <el-button
-                v-if="row.is_contract == 0 && row.contract?.check_status == 3"
-                v-perms="['user.user/launch']"
-                type="primary"
-                link
-                @click="(showPop = true), (contractId = row.id)"
-                >重新发送短信</el-button
-              >
-            </template> -->
           </template>
         </el-table-column>
       </el-table>
 
-      <!-- <el-dialog v-model="showPop" @close="offPop">
-        <h1>重要提醒</h1>
-        <div class="content" v-if="showConctactPop">
-          请确认信息是否有误,发送合同,请确认信息是否有误,发送电子合同后短时间内将不可再次发送.
-        </div>
-        <div class="content" v-else>
-          确认签约短信将在60秒后发送,请注意查收,并点击短信链接进行线上合同签约
-        </div>
-        <p class="btn_menu">
-          <el-button
-            type="primary"
-            size="large"
-            v-if="showConctactPop"
-            @click="creContct"
-            >确认创建</el-button
-          >
-          <el-button type="primary" size="large" v-else @click="sendMsg"
-            >确认</el-button
-          >
-          <el-button type="info" size="large" @click="offPop">返回</el-button>
-        </p>
-      </el-dialog> -->
+
       <div class="flex justify-end mt-4">
         <pagination v-model="pager" @change="getLists" />
       </div>
@@ -222,65 +121,92 @@
 <script lang="ts" setup name="consumerLists">
 import { usePaging } from "@/hooks/usePaging";
 import { getRoutePath } from "@/router";
-import { getUserList, creatContact, sendMsgApi } from "@/api/consumer";
-import { ClientMap } from "@/enums/appEnums";
-import feedback from "@/utils/feedback";
-const route = useRoute();
+import { getUserList, exportUerLists } from "@/api/consumer";
+import {
+  apiCityList,
+  apiAreaList,
+  apiStreetList,
+  apiProvinceList,
+  apiVillageList,
+  apiBrigadeList
+} from "@/api/common";
+
+const queryTime = ref('')
+const changeTime = () => {
+  queryParams.create_time_start = queryTime.value[0]
+  queryParams.create_time_end = queryTime.value[1]
+}
+const datas: any = reactive({
+  provinceOptions: [],
+  cityOptions: [],
+  areaOptions: [],
+  streetOptions: [],
+  villageOptions:[],
+  brigadeOptions:[],
+});
 
 const queryParams = reactive({
   keyword: "",
-  channel: "",
   create_time_start: "",
   create_time_end: "",
-  company_id: "",
-  time: "",
+  province:"",
+  city:"",
   area:"",
   street:"",
-  brigade:""
+  village:"",
 });
-if (route.query.company_id) {
-  queryParams.company_id = route.query.company_id;
+
+//获取省份
+function province_change(value: string) {
+  getCityList();
 }
-const contractId = ref(0);
-const showPop = ref(false);
-const showConctactPop = ref(false);
-const offPop = () => {
-  showPop.value = false;
-  showConctactPop.value = false;
+function city_change(value: string) {
+  getAreaList();
+}
+function area_change(value: string) {
+  getStreetList();
+}
+function street_change(value: string) {
+  getVillageList()
+}
+function village_change(value: string) {
+}
+
+const getProvinceList = async () => {
+  const data = await apiProvinceList({});
+  datas["provinceOptions"] = data;
 };
-const creContct = () => {
-  console.log(contractId.value);
-  //   feedback.msgSuccess("复制成功");
-  creatContact({ id: contractId.value }).then(() => {
-    feedback.msgSuccess("发送成功");
-  });
-  offPop();
+const getCityList = async () => {
+  const data = await apiCityList({ city: queryParams.province });
+  datas["cityOptions"] = data;
 };
-const sendMsg = () => {
-  sendMsgApi({ id: contractId.value }).then((res) => {
-    feedback.msgSuccess("发送成功");
-  });
-  offPop();
+const getAreaList = async () => {
+  const data = await apiAreaList({ area: queryParams.city });
+  datas["areaOptions"] = data;
 };
-// const handleDelete = async (id: number) => {
-//     await feedback.confirm('确定要删除？')
-//     await adminDelete({ id })
-//     getLists()
-// }
-// const handleAbolition = async (id: number) => {
-//     await feedback.confirm('确定要废除合同？')
-//     await abolition({ id })
-//     getLists()
-// }
+const getStreetList = async () => {
+  const data = await apiStreetList({ street: queryParams.area });
+  datas["streetOptions"] = data;
+};
+const getVillageList = async () => {
+  const data = await apiVillageList({ village: queryParams.street });
+  datas["villageOptions"] = data;
+
+  // datas["streetOptions"] = data;
+};
+
+
+
 const { pager, getLists, resetPage, resetParams } = usePaging({
   fetchFun: getUserList,
   params: queryParams,
 });
-onActivated(() => {
-  getLists();
-});
-
 getLists();
+getProvinceList()
+//导出
+const exportUerListsFn = () => {
+  exportUerLists({ ...queryParams })
+}
 </script>
 <style scoped>
 h1 {