diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..f11514d
Binary files /dev/null and b/dist.zip differ
diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal copy.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal copy.vue
new file mode 100644
index 0000000..7686107
--- /dev/null
+++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal copy.vue	
@@ -0,0 +1,1942 @@
+<template>
+  <div ref="refModal" class="custom-modal">
+    <a-modal
+      :title="title"
+      :visible="visible"
+      :mask-closable="false"
+      :centered="true"
+      :body-style="{ padding: '0px 40px 8px' }"
+      :get-container="() => $refs.refModal"
+      :confirm-loading="submitLoading"
+      :width="850"
+      @cancel="handleClose"
+    >
+      <a-tabs
+        v-if="title === '新建预约'"
+        v-model:activeKey="activeKey"
+        centered
+        @change="tabsChange"
+      >
+        <a-tab-pane key="1" tab="A类型客户"> </a-tab-pane>
+        <a-tab-pane key="2" tab="B类型客户" force-render> </a-tab-pane>
+      </a-tabs>
+
+      <a-tabs v-else v-model:activeKey="activeKey" centered>
+        <a-tab-pane v-if="formModel.customType === 0" key="1" tab="A类型客户"> </a-tab-pane>
+        <a-tab-pane v-if="formModel.customType === 1" key="2" tab="B类型客户" force-render>
+        </a-tab-pane>
+      </a-tabs>
+      <a-form
+        ref="formRef"
+        :model="formModel"
+        :rule="formRule"
+        :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
+        :wrapper-col="
+          title === '详情' || title === '回单'
+            ? { sm: { span: 24 }, md: { span: 16 } }
+            : { sm: { span: 24 }, md: { span: 19 } }
+        "
+      >
+        <a-form-item
+          label="称呼"
+          name="customName"
+          :rules="[{ required: true, message: '请输入称呼', trigger: 'blur' }]"
+          :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
+          :wrapper-col="
+            title === '详情' || title === '回单'
+              ? { sm: { span: 24 }, md: { span: 9 } }
+              : { sm: { span: 24 }, md: { span: 11 } }
+          "
+        >
+          <a-input
+            v-model:value="formModel.customName"
+            placeholder="请输入称呼"
+            style="width: 65%"
+            :readonly="title === '详情' || title === '回单'"
+          />
+        </a-form-item>
+        <a-form-item
+          label="联系方式"
+          name="customNid"
+          :rules="[
+            {
+              required: true,
+              message: '请输入正确的手机号码',
+              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+              trigger: ['blur', 'change']
+            }
+          ]"
+          :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
+          :wrapper-col="
+            title === '详情' || title === '回单'
+              ? { sm: { span: 24 }, md: { span: 9 } }
+              : { sm: { span: 24 }, md: { span: 11 } }
+          "
+        >
+          <a-input
+            v-model:value="formModel.customNid"
+            placeholder="请输入联系方式"
+            style="width: 65%"
+            :readonly="title === '详情' || title === '回单'"
+          />
+        </a-form-item>
+        <a-row>
+          <a-col :span="24">
+            <a-form-item
+              label="备注"
+              name="remark"
+              :label-col="{ sm: { span: 24 }, md: { span: 5 } }"
+              :wrapper-col="
+                title === '详情' || title === '回单'
+                  ? { sm: { span: 24 }, md: { span: 19 } }
+                  : { sm: { span: 24 }, md: { span: 19 } }
+              "
+            >
+              <a-textarea
+                v-model:value="formModel.remark"
+                placeholder="请输入备注"
+                :style="{ width: title === '详情' || title === '回单' ? '83%' : '100%' }"
+                :readonly="title === '详情' || title === '回单'"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row :gutter="16">
+          <a-col :xl="14" :md="14" :sm="14">
+            <a-form-item
+              label="请输入您的地址信息"
+              :label-col="{ sm: { span: 24 }, md: { span: 9 } }"
+              :wrapper-col="{ sm: { span: 24 }, md: { span: 15 } }"
+              :rules="[
+                {
+                  required:
+                    activeKey === '1' ||
+                    (activeKey === '2' && title === '编辑') ||
+                    (activeKey === '2' && title === '回单'),
+                  message: '请选择地址信息',
+                  trigger: ['blur', 'change']
+                }
+              ]"
+              name="address"
+            >
+              <a-cascader
+                v-model:value="formModel.address"
+                change-on-select
+                style="position: relative; z-index: 2; margin-right: 20px"
+                :options="provincesAndCitiesAndAutonomousOptions"
+                placeholder="请选择"
+                :show-search="{ filter }"
+                :disabled="isAddressDisabled"
+                :class="addressDynamicClass"
+                class="readonly-cascader"
+                :allow-clear="title === '新建预约' || title === '编辑预约' || title === '编辑'"
+                @change="addressChange"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="10" :md="10" :sm="10">
+            <a-form-item
+              :rules="[
+                {
+                  required:
+                    activeKey === '1' ||
+                    (activeKey === '2' && title === '编辑') ||
+                    (activeKey === '2' && title === '回单'),
+                  message: '请输入小区名称',
+                  trigger: 'change'
+                }
+              ]"
+              name="detailAddress"
+            >
+              <a-select
+                v-model:value="formModel.detailAddress"
+                show-search
+                placeholder="请输入小区名称"
+                :default-active-first-option="false"
+                :show-arrow="false"
+                :filter-option="false"
+                :not-found-content="null"
+                :options="searchDataList"
+                :disabled="isDetailAddressDisabled"
+                :class="detailAddressReadOnlyDynamicClass"
+                :title="
+                  (formModel.address && formModel.address.length < 2) || !formModel.address
+                    ? '请先选择省市区'
+                    : ''
+                "
+                @search="handleSearch"
+                @select="handleSelect"
+              ></a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-form-item
+          label="请输入区域半径"
+          class="radius"
+          name="radius"
+          :rules="[
+            {
+              required:
+                activeKey === '1' ||
+                (activeKey === '2' && title === '编辑') ||
+                (activeKey === '2' && title === '回单'),
+              message: '请选择区域半径',
+              trigger: 'blur'
+            }
+          ]"
+        >
+          <a-select
+            ref="select"
+            v-model:value="formModel.radius"
+            :style="{ width: title === '详情' || title === '回单' ? '37%' : '38%' }"
+            :options="radiusOptions"
+            :field-names="{ label: 'name', value: 'id', options: 'children' }"
+            :disabled="isRadiusDisabled"
+            :class="radiusDynamicClass"
+            @change="radiusChange"
+          ></a-select>
+          <div>
+            <a-button
+              v-if="title === '新建预约' || title === '编辑预约' || title === '编辑'"
+              type="primary"
+              @click="match(formModel.detailAddress)"
+              >匹配</a-button
+            >
+            <a-button v-if="title === '新建预约'" style="margin-left: 10px" @click="resetForm"
+              >重置</a-button
+            >
+          </div>
+        </a-form-item>
+        <a-form-item
+          v-if="title === '新建预约' || title === '编辑预约' || title === '编辑'"
+          style="display: flex; justify-content: center"
+        >
+          <!-- 地图 -->
+          <div class="clueImport-page">
+            <div class="drawStation">
+              <div class="input"></div>
+              <div id="draw-station-container">
+                <div
+                  v-if="listData.length > 0"
+                  id="aa"
+                  style="
+                    position: absolute;
+                    left: 0;
+                    top: 0;
+                    background-color: #fff;
+                    width: 175px;
+                    overflow-y: auto;
+                  "
+                >
+                  <!--_blank：链接会在新窗口或标签页中打开。-->
+                  <a-list item-layout="horizontal" :data-source="listData">
+                    <template #renderItem="{ item, index }">
+                      <a-list-item @click="storeItemClick(item, index)">
+                        <a-list-item-meta>
+                          <template #title>
+                            <a-tooltip :title="item.title" :overlay-style="tooltipStyle">
+                              <div
+                                style="
+                                  white-space: nowrap;
+                                  overflow: hidden;
+                                  text-overflow: ellipsis;
+                                  font-size: 14px;
+                                "
+                              >
+                                {{ item.title }}
+                              </div>
+                            </a-tooltip>
+                            <a-tooltip :title="item.description" :overlay-style="tooltipStyle">
+                              <div
+                                style="
+                                  color: rgba(0, 0, 0, 0.45);
+                                  font-size: 12px;
+                                  margin-top: 6px;
+                                  line-height: 1.5715;
+                                  white-space: nowrap;
+                                  overflow: hidden;
+                                  text-overflow: ellipsis;
+                                "
+                              >
+                                地址：{{ item.description }}
+                              </div>
+                            </a-tooltip>
+                            <a-tooltip
+                              :title="item.tel"
+                              :overlay-style="tooltipStyle"
+                              :mouse-enter-delay="0"
+                              :mouse-leave-delay="0"
+                            >
+                              <div
+                                style="
+                                  color: rgba(0, 0, 0, 0.45);
+                                  font-size: 12px;
+                                  margin-top: 6px;
+                                  line-height: 1.5715;
+                                  white-space: nowrap;
+                                  overflow: hidden;
+                                  text-overflow: ellipsis;
+                                "
+                              >
+                                电话：{{ item.tel }}
+                              </div>
+                            </a-tooltip>
+                          </template>
+                        </a-list-item-meta>
+                        <template #actions>
+                          <!-- <img width="35" height="35" alt="logo" :src="item.href" /> -->
+                          <a-button size="small" :disabled="item.disabled" @click="addStore(item)"
+                            >添加</a-button
+                          >
+                        </template>
+                      </a-list-item>
+                    </template>
+                  </a-list>
+                </div>
+              </div>
+            </div>
+          </div>
+        </a-form-item>
+        <!-- 门店预约信息表单 -->
+        <div v-if="formModel.customStoreEntities.length > 0">
+          <div
+            v-for="(item, index) in formModel.customStoreEntities"
+            :key="index"
+            style="display: flex; justify-content: space-between; align-items: center"
+          >
+            <a-form-item
+              style="width: 45%"
+              label="预约门店名称"
+              :label-col="
+                title === '详情' || title === '回单'
+                  ? { sm: { span: 24 }, md: { span: 11 } }
+                  : { sm: { span: 24 }, md: { span: 8 } }
+              "
+              :wrapper-col="
+                title === '详情' || title === '回单'
+                  ? { sm: { span: 24 }, md: { span: 13 } }
+                  : { sm: { span: 24 }, md: { span: 16 } }
+              "
+              :rules="{
+                required: activeKey === '1',
+                message: '请输入预约门店名称',
+                trigger: 'change'
+              }"
+              :name="['customStoreEntities', index, 'storeName']"
+            >
+              <a-input
+                v-model:value="item.storeName"
+                placeholder="请输入"
+                :readonly="title === '详情' || title === '回单'"
+                :style="{ width: title === '详情' || title === '回单' ? '103%' : '100%' }"
+              />
+            </a-form-item>
+            <!-- :rules="{
+              required: true,
+              message: '请选择预约日期',
+              trigger: 'change'
+            }" -->
+            <a-form-item
+              style="width: 30%"
+              label="预约时间"
+              :label-col="
+                title === '详情' || title === '回单'
+                  ? { sm: { span: 24 }, md: { span: 9 } }
+                  : { sm: { span: 24 }, md: { span: 9 } }
+              "
+              :wrapper-col="
+                title === '详情' || title === '回单'
+                  ? { sm: { span: 24 }, md: { span: 15 } }
+                  : { sm: { span: 24 }, md: { span: 15 } }
+              "
+              :name="['customStoreEntities', index, 'reservationDate']"
+            >
+              <a-space direction="vertical">
+                <a-date-picker
+                  v-model:value="item.reservationDate"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  :disabled="title === '详情' || title === '回单'"
+                  :class="reservationTimeClass"
+                />
+              </a-space>
+            </a-form-item>
+            <!-- :rules="{
+              required: true,
+              message: '请选择预约时间',
+              trigger: 'change'
+            }" -->
+            <a-form-item
+              style="width: 18%"
+              :label-col="
+                title === '详情' || title === '回单'
+                  ? { sm: { span: 24 }, md: { span: 0 } }
+                  : { sm: { span: 24 }, md: { span: 0 } }
+              "
+              :wrapper-col="
+                title === '详情' || title === '回单'
+                  ? { sm: { span: 24 }, md: { span: 24 } }
+                  : { sm: { span: 24 }, md: { span: 24 } }
+              "
+              :name="['customStoreEntities', index, 'reservationTime']"
+            >
+              <a-space style="width: 100%">
+                <a-select
+                  ref="select"
+                  v-model:value="item.reservationTime"
+                  :allow-clear="title === '新建预约' || title === '编辑预约' || title === '编辑'"
+                  :options="item.option"
+                  :class="reservationTimeClass"
+                  :style="{ width: title === '详情' || title === '回单' ? '103%' : '100%' }"
+                >
+                </a-select>
+              </a-space>
+            </a-form-item>
+            <a-form-item v-if="title === '新建预约' || title === '编辑预约' || title === '编辑'">
+              <delete-outlined @click="delReservationStore(item)" />
+            </a-form-item>
+          </div>
+        </div>
+      </a-form>
+      <template #footer>
+        <div v-if="title === '新建预约' || title === '编辑预约'">
+          <a-button @click="storeResetForm">重置</a-button>
+          <a-button type="primary" html-type="submit" style="margin-left: 10px" @click="showModal"
+            >报名</a-button
+          >
+          <a-button
+            type="primary"
+            html-type="submit"
+            style="margin-left: 10px"
+            @click="temporaryStorage"
+            >暂存</a-button
+          >
+        </div>
+        <a-button v-if="title === '详情'" type="primary" html-type="submit" @click="handleClose"
+          >确定</a-button
+        >
+        <div v-if="title === '编辑'">
+          <a-button @click="storeResetForm">重置</a-button>
+          <a-button @click="handleClose">取消</a-button>
+          <a-button type="primary" html-type="submit" style="margin-left: 10px" @click="distribute"
+            >确定</a-button
+          >
+        </div>
+        <div v-if="title === '回单'">
+          <a-button @click="handleClose">取消</a-button>
+          <a-button type="primary" html-type="submit" style="margin-left: 10px" @click="distribute"
+            >回单</a-button
+          >
+        </div>
+      </template>
+      <!-- 报名、审核信息确认弹窗 -->
+      <a-modal v-model:visible="registerVisible" title="确认信息" @ok="handleOk">
+        <p>您提交的表单信息为：</p>
+        <p>称呼：{{ formModel.customName }}</p>
+        <p>联系方式：{{ formModel.customNid }}</p>
+        <div style="overflow-y: auto; max-height: 100px">
+          <p v-for="(item, index) in formModel.customStoreEntities" :key="index">
+            <span>{{ `报名的门店${index + 1}为` }}：{{ item.storeName }}</span>
+            <span>&nbsp;{{ item.reservationDate?.toString().split(' ')[0] }}</span>
+            <span>&nbsp;{{ item.reservationTime }}</span>
+          </p>
+        </div>
+      </a-modal>
+      <!-- 匹配信息确认弹窗 -->
+      <a-modal
+        v-model:visible="matchregisterVisible"
+        title="确认信息"
+        @ok="matchhandleOk(formModel.detailAddress)"
+      >
+        <p>重新匹配将清空预约门店信息,是否重新匹配?</p>
+      </a-modal>
+    </a-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, onMounted, toRefs } from 'vue'
+import { useModal } from '@/hooks/modal'
+import { useAdminForm, useFormAction, FormAction } from '@/hooks/form'
+import type { FormRequestMapping } from '@/hooks/form'
+import { doRequest } from '@/utils/axios/request'
+import { message } from 'ant-design-vue'
+import type { FormInstance } from 'ant-design-vue'
+//预约时间
+import type { SelectValue } from 'ant-design-vue/es/select'
+import type { SelectProps } from 'ant-design-vue'
+import type { Dayjs } from 'dayjs'
+import 'dayjs/locale/zh-cn'
+import {
+  addCustomer,
+  updateCustomer,
+  auditCustomer,
+  getDetail,
+  getStoreData
+} from '@/api/geopoliticalCustomers'
+import type { CustomerDTO, GeopoliticalCustomersRecord } from '@/api/geopoliticalCustomers/types'
+import axios from 'axios'
+//获取当前账号角色
+import { useUserStore } from '@/stores/user-store'
+const { userInfo } = useUserStore()
+const userInfoCurrent = ref<string | undefined>('')
+
+//省市区二级
+// import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers'
+
+//dom中可以写成:rules = 'rulesData'
+// const rulesData = {
+//   required: true,
+//   trigger: 'change'
+// }
+
+onMounted(() => {
+  //省市区三级下拉框列表数据
+  provincesAndCitiesAndAutonomousOptions.value = window.globalProvincesAndCitiesAndAutonomousRegions
+  //省市区二级下拉框列表数据
+  // if (provincesAndCitiesAndAutonomousRegions) {
+  //   const addressArray = JSON.parse(JSON.stringify(provincesAndCitiesAndAutonomousRegions))
+  //   const arr: any[] = []
+  //   addressArray.forEach((item: any) => {
+  //     item.children.forEach((it: any) => {
+  //       if (it.children) {
+  //         delete it.children
+  //       }
+  //     })
+  //     arr.push(item)
+  //   })
+  //   provincesAndCitiesAndAutonomousOptions.value = arr
+  // }
+  //获取当前账号角色
+  userInfoCurrent.value = userInfo?.roleCodes?.toLocaleString()
+})
+
+//当前激活 tab 面板的 key
+const activeKey = ref('')
+//tabs change事件
+const tabsChange = (val: string) => {
+  handleMapInit()
+  // formRef.value?.resetFields()
+  formRef.value?.clearValidate()
+  if (val === '1') {
+    formModel.customType = 0
+  } else {
+    formModel.customType = 1
+  }
+}
+
+//省市区动态生成只读/禁用样式
+const isAddressDisabled = ref(false)
+const isAddressReadOnly = ref(false)
+const addressDynamicClass = computed(() => ({
+  'custom-disabled-style': isAddressDisabled.value,
+  'custom-readonly-style': isAddressReadOnly.value
+}))
+//半径动态生成只读/禁用样式
+const isRadiusDisabled = ref(false)
+const isRadiusReadOnly = ref(false)
+const radiusDynamicClass = computed(() => ({
+  'custom-disabled-style': isRadiusDisabled.value,
+  'custom-readonly-style': isRadiusReadOnly.value
+}))
+//预约日期、预约时间动态生成只读/禁用样式
+const isReservationTimeisReadOnly = ref(false)
+const reservationTimeClass = computed(() => ({
+  'custom-readonly-style': isReservationTimeisReadOnly.value
+}))
+//小区动态生成只读/禁用样式
+const isDetailAddressDisabled = ref(false)
+const isDetailAddressReadOnly = ref(false)
+const detailAddressReadOnlyDynamicClass = computed(() => ({
+  'custom-disabled-style': isDetailAddressDisabled.value,
+  'custom-readonly-style':
+    isDetailAddressReadOnly.value ||
+    (formModel.address && formModel.address.length < 2) ||
+    !formModel.address
+}))
+
+const formRef = ref<FormInstance>()
+
+// const city = ref<string | undefined>('')
+// const cityAnddistinguish = ref<string | undefined>('')
+
+//省市区下拉框列表数据
+const provincesAndCitiesAndAutonomousOptions: any = ref([])
+//省市区change
+const addressChange = async (value: any) => {
+  formModel.detailAddress = ''
+
+  if (value) {
+    formModel.economize = value[0]
+    formModel.market = value[1]
+    formModel.distinguish = value[2]
+    // if (value.length === 2) {
+    //   formModel.detailAddress = value[0] + value[1]
+    // } else if (value.length === 3) {
+    //   formModel.detailAddress = value[0] + value[1] + value[2]
+    // }
+    console.log('formModel.detailAddress', formModel.detailAddress)
+
+    // city.value = value[1].slice(0, -1)
+    // cityAnddistinguish.value = value[1] + value[2]
+    // await auto(value[1])
+  }
+}
+
+//区域半径下拉框列表数据(不需要改变的数据不要绑定ref)
+const radiusOptions = ref<SelectProps['options']>([
+  {
+    id: '3000',
+    name: '3km'
+  },
+  {
+    id: '5000',
+    name: '5km'
+  },
+  {
+    id: '10000',
+    name: '10km'
+  },
+  {
+    id: '50000',
+    name: '不计范围'
+  }
+])
+//区域半径change
+const radiusChange = (value: SelectValue) => {
+  formModel.radius = value
+}
+
+//根据地址搜索出来的门店数据
+const listData: any = ref([])
+
+//预约时间下拉框列表数据(根据后端返回的营业时间生成)
+const generateTimeSlots = (tradeStartTime: string, tradeEndTime: string) => {
+  const startHour = Number(tradeStartTime.split(':')[0])
+  const startMinute = Number(tradeStartTime.split(':')[1])
+  const endHour = Number(tradeEndTime.split(':')[0])
+  const endMinute = Number(tradeEndTime.split(':')[1])
+
+  const timeSlots = []
+  for (let hour = startHour; hour <= endHour; hour++) {
+    for (let minute = 0; minute < 60; minute += 30) {
+      if (hour === startHour && minute < startMinute) {
+        continue
+      }
+      if (hour === endHour && minute >= endMinute) {
+        break
+      }
+
+      const startTime = `${hour.toString().padStart(2, '0')}:${minute.toString().padStart(2, '0')}`
+      const endTime = `${(hour + Math.floor(minute / 30)).toString().padStart(2, '0')}:${(
+        (minute + 30) %
+        60
+      )
+        .toString()
+        .padStart(2, '0')}`
+      const timeSlot = {
+        label: `${startTime}~${endTime}`,
+        value: `${startTime}~${endTime}`
+      }
+      timeSlots.push(timeSlot)
+    }
+  }
+
+  return timeSlots
+}
+
+//创建 AMap.Geocoder 实例,AMap.Geocoder 是高德地图 JavaScript API 中的一个类，用于将地理描述转换为经纬度坐标或将经纬度坐标转换为地理描述
+const newAmapGeocoder = () => {
+  AMap.plugin('AMap.Geocoder', function () {
+    geocoder.value = new AMap.Geocoder({
+      city: '全国' // city 指定进行编码查询的城市，支持传入城市名、adcode 和 citycode
+    })
+  })
+}
+
+//通过接口获取小区下拉框提示列表数据
+const key = ref('435631c2ed6e33af778b42b46b2260ee') //web服务 高德api
+const searchData = (city: string, keywords: string, callback: any) => {
+  axios
+    .get(`https://restapi.amap.com/v3/place/text`, {
+      params: {
+        keywords,
+        city,
+        citylimit: true,
+        offset: 10,
+        page: 1,
+        key: key.value,
+        extensions: 'all'
+      }
+    })
+    .then(res => {
+      callback(res.data)
+    })
+    .catch(err => {
+      callback(err.data)
+      console.log(err)
+    })
+}
+
+//小区下拉框提示列表数据
+const searchDataList = ref<any[]>([])
+
+//获取小区下拉框提示列表数据
+let timeout: any
+function fetch(val: string, callback: any) {
+  const dist: string = formModel.distinguish ? formModel.distinguish : formModel.market || ''
+  if (timeout) {
+    clearTimeout(timeout)
+    timeout = null
+  }
+
+  function fake() {
+    if (formModel.address && formModel.address.length > 0) {
+      searchData(formModel.address[formModel.address.length - 1], dist + val, (res: any) => {
+        const data: any = []
+        if (res.info === 'OK') {
+          res.pois.forEach((res: any) => {
+            data.push({
+              label: res.name,
+              value: res.name,
+              location: res.location
+            })
+          })
+          callback(data)
+        } else {
+          callback([])
+        }
+      })
+    }
+  }
+  //节流控制
+  timeout = setTimeout(fake, 300)
+}
+
+//小区a-select鼠标移入/移出触发事件(文本框值变化时回调)
+const handleSearch = (val: string) => {
+  if (val) {
+    formModel.detailAddress = val
+  }
+  if (searchDataList.value.length > 0) {
+    searchDataList.value = []
+  }
+  fetch(val, (d: any[]) => (searchDataList.value = d))
+}
+
+//小区a-select select事件
+const handleSelect = (val: string) => {
+  formModel.detailAddress = val
+  // map.value.clearMap()
+  // formModel.customStoreEntities=[]
+  // listData.value=[]
+  newAmapGeocoder()
+  getCenterMarkerAddress()
+}
+//小区a-select的select事件时根据门店名称去获取中心点
+const accordingStorenameGetCenter = (pois: any) => {
+  isName.value = false
+  getCenterMarker('select', pois[0].location.lng, pois[0].location.lat)
+}
+//小区a-select的select事件时根据详细地址区获取中心点
+const accordingAddressGetCenter = () => {
+  isName.value = true
+  newAmapGeocoder()
+  getLocation('select')
+}
+
+//输入详细地址去获取经纬度从而标记中心点封装的方法
+const getLocation = (type: string) => {
+  const addressValue =
+    //标记中心点
+    formModel.address?.toString().split(',').join('') + formModel.detailAddress
+  geocoder.value.getLocation(addressValue, function (status: any, result: any) {
+    if (status === 'complete' && result.info === 'OK') {
+      console.log(result, 'result')
+      // result中对应详细地理坐标信息
+      lng.value = result.geocodes[0].location.lng
+      lat.value = result.geocodes[0].location.lat
+      formModel.otherAddressesInfo = `${lng.value},${lat.value}`
+      // 设置地图中心点
+      map.value.setCenter([lng.value, lat.value]) // 将经度和纬度作为参数传入
+      if (type === 'match') {
+        //修改地图的缩放级别
+        map.value.setZoom(12) // 设置新的缩放级别，例如12
+      }
+      if (previousMarker.value && type === 'select') {
+        map.value.remove(markerCenter.value) // 从地图上移除之前的中心点标记物
+      }
+      // 创建标记并添加到地图上
+      markerCenter.value = new AMap.Marker({
+        position: [lng.value, lat.value], // 设定标记的位置为地图中心点
+        zIndex: 100 // 设置标记点的 z-index 值为 100
+      })
+
+      // 设置标记点的样式
+      markerCenter.value.setIcon(
+        new AMap.Icon({
+          image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_r.png', // 使用红色标记点的图标 URL
+          size: new AMap.Size(18, 30), // 图标尺寸
+          imageSize: new AMap.Size(18, 30) // 图片尺寸
+        })
+      )
+      markerCenter.value.setMap(map.value) // 将标记添加到地图上
+      previousMarker.value = markerCenter.value // 将新的中心点标记物赋值给 previousMarker
+    }
+    if (type === 'match') {
+      pagingQuery(lng.value, lat.value)
+    }
+  })
+}
+//标记中心点封装的方法
+const getCenterMarker = (type: string, lng: number, lat: number) => {
+  formModel.otherAddressesInfo = `${lng},${lat}`
+  // 设置地图中心点
+  map.value.setCenter([lng, lat]) // 将经度和纬度作为参数传入
+  if (type === 'match' || type === 'select') {
+    //修改地图的缩放级别
+    map.value.setZoom(12) // 设置新的缩放级别，例如12
+  }
+
+  if (previousMarker.value && type === 'select') {
+    map.value.remove(markerCenter.value) // 从地图上移除之前的中心点标记物
+  }
+  // 创建标记并添加到地图上
+  markerCenter.value = new AMap.Marker({
+    position: [lng, lat], // 设定标记的位置为地图中心点
+    zIndex: 100 // 设置标记点的 z-index 值为 100
+  })
+
+  // 设置标记点的样式
+  markerCenter.value.setIcon(
+    new AMap.Icon({
+      image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_r.png', // 使用红色标记点的图标 URL
+      size: new AMap.Size(18, 30), // 图标尺寸
+      imageSize: new AMap.Size(18, 30) // 图片尺寸
+    })
+  )
+
+  markerCenter.value.setMap(map.value) // 将标记添加到地图上
+  previousMarker.value = marker // 将新的中心点标记物赋值给 previousMarker
+
+  if (type === 'match') {
+    pagingQuery(lng, lat)
+  }
+}
+//标记中心点封装的方法
+const getCenterMarkerAddress = () => {
+  createSearchService()
+  const addressValue = formModel.address?.toString().split(',').join('') + formModel.detailAddress
+  // 执行地点搜索
+  searchService.value.search(addressValue, (status: any, result: any) => {
+    if (status === 'complete' && result.info === 'OK') {
+      // 处理搜索结果
+      const pois = result.poiList.pois
+      console.log(pois, 'pois')
+      // 对获取到的兴趣点列表进行处理
+      if (pois[0].name.includes('小区')) {
+        const result = pois[0].name.replace('小区', '')
+        if (
+          result.length > formModel.detailAddress.length ||
+          pois[0].address > formModel.detailAddress.length
+        ) {
+          if (
+            result.includes(formModel.detailAddress) ||
+            pois[0].address.includes(formModel.detailAddress)
+          ) {
+            console.log('1111')
+            accordingStorenameGetCenter(pois)
+          } else {
+            console.log('2222')
+            accordingAddressGetCenter()
+          }
+        } else {
+          if (
+            formModel.detailAddress.includes(result) ||
+            formModel.detailAddress.includes(pois[0].address)
+          ) {
+            console.log('3333')
+            accordingStorenameGetCenter(pois)
+          } else {
+            console.log('4444')
+            accordingAddressGetCenter()
+          }
+        }
+      } else {
+        if (
+          pois[0].name.length > formModel.detailAddress.length ||
+          pois[0].address.length > formModel.detailAddress.length
+        ) {
+          if (
+            pois[0].name.includes(formModel.detailAddress) ||
+            pois[0].address.includes(formModel.detailAddress)
+          ) {
+            console.log('1111')
+            accordingStorenameGetCenter(pois)
+          } else {
+            console.log('2222')
+            accordingAddressGetCenter()
+          }
+        } else {
+          if (
+            formModel.detailAddress.includes(pois[0].name) ||
+            formModel.detailAddress.includes(pois[0].address)
+          ) {
+            console.log('3333')
+            accordingStorenameGetCenter(pois)
+          } else {
+            console.log('4444')
+            accordingAddressGetCenter()
+          }
+        }
+      }
+    } else {
+      // 地点搜索失败的处理逻辑
+      console.log('地点搜索失败')
+    }
+  })
+}
+
+//经纬度
+const lng = ref<number | undefined>()
+const lat = ref<number | undefined>()
+//圆形覆盖物
+const circle = ref()
+//标记物数组
+const pois: any = reactive([])
+//信息窗体
+const infoWindows = ref<any>({})
+//上一次点击的标记物id
+let previousId: any = null
+//匹配查询
+const pagingQuery = (lng: number | undefined, lat: number | undefined) => {
+  if (circle.value) {
+    map.value.remove(circle.value)
+  }
+  const color = '#DFEBF3'
+  // 创建圆形覆盖物
+  circle.value = new AMap.Circle({
+    center: [lng, lat], // 圆心坐标
+    radius: formModel.radius, // 半径，单位为米
+    fillColor: color, // 填充颜色
+    strokeColor: '#a1ceeb', // 边框颜色
+    strokeWeight: 1 // 边框宽度
+  })
+  // 将圆形覆盖物添加到地图
+  map.value.add(circle.value)
+
+  doRequest(getStoreData({ longitude: lng, latitude: lat, distance: formModel.radius }), {
+    onSuccess: (result: any) => {
+      if (result.code === 200) {
+        if (result.data.length === 0) {
+          message.info('当前位置附近暂无相关门店')
+        } else {
+          const ids = formModel.customStoreEntities.map(item => item.storeId)
+          listData.value.length = 0
+          result.data &&
+            result.data.forEach((item: any) => {
+              const disabled = ids.includes(Number(item.id))
+              listData.value.push({
+                title: item.storeName,
+                description: item.address,
+                content: item.nid ? item.nid : '',
+                disabled: disabled,
+                lat: item.latitude,
+                lng: item.longitude,
+                id: item.id,
+                index: item.index,
+                tel: item.nid ? item.nid : '',
+                reservationDate: item.reservationDate,
+                option: generateTimeSlots(item.tradeStartTime, item.tradeEndTime)
+              })
+            })
+          pois.push(...listData.value)
+          // 设置缩放级别,设置地图视图级别为
+          const targetZoom = 12
+
+          //回调函数
+          const placeSearch_CallBack = (data: any) => {
+            const poiArr = data
+            infoWindows.value = new AMap.InfoWindow({
+              autoMove: true,
+              isCustom: true,
+              offset: { x: 0, y: -30 } // 信息窗体的偏移量
+            })
+            //添加marker
+            const markers = new AMap.Marker({
+              map: map.value,
+              position: [poiArr.lng, poiArr.lat],
+              // clickable: true,//表示某个元素可以接收用户点击事件,默认值为true
+              // offset: new AMap.Pixel(-90, -70), // 设置偏移量以调整卡片位置
+              zIndex: 0, // 设置标记点的层级为 1000
+              extData: {
+                id: `${poiArr.id}`
+                // 其他属性...
+              }
+            })
+            markers.on('click', function (data: any) {
+              const currentId = data.target.getExtData().id
+
+              if (
+                infoWindows.value.getIsOpen() &&
+                (currentId === previousId || currentId === currentStoreId.value)
+              ) {
+                // 信息窗体已打开,并且当前点击的标记物与上一次点击的标记物相同，或者与当前存储的门店标记物相同
+                currentStoreId.value = currentId
+                previousId = currentId
+                return false
+              }
+
+              infoWindows.value.open(map.value, markers.getPosition()) // 在地图上打开信息弹窗，并将信息弹窗显示在标记点的位置
+              map.value.setZoomAndCenter(targetZoom, [data.lnglat.lng, data.lnglat.lat]) // 设置地图的缩放级别和中心点，使地图以指定的缩放级别和中心点进行显示
+              map.value.setCenter(markers.getPosition()) // 将地图的中心点设置为标记点的位置
+              infoWindows.value.setContent(createContent(poiArr)) // 将生成的内容设置到信息弹窗中
+
+              // 更新上一次点击的标记物ID
+              currentStoreId.value = currentId
+              previousId = currentId
+            })
+          }
+          for (let i = 0; i < pois.length; i++) {
+            placeSearch_CallBack(pois[i])
+          }
+        }
+      }
+    }
+  })
+}
+//匹配时根据门店名称去获取中心点
+const accordingStorenameMatch = (pois: any) => {
+  isName.value = false
+  getCenterMarker('match', pois[0].location.lng, pois[0].location.lat)
+}
+//匹配时根据详细地址区获取中心点
+const accordingAddressMatch = () => {
+  isName.value = true
+  newAmapGeocoder()
+  getLocation('match')
+}
+const idThen = (detailAddress: string) => {
+  pois.length = 0
+  listData.value = []
+  lng.value = undefined
+  lat.value = undefined
+  // if (map.value && typeof map.value.clearMap === 'function') {
+  map.value.clearMap()
+  // }
+
+  // city.value = formModel.market?.slice(0, -1)
+  //标记中心点
+  // 创建地点搜索服务实例
+  const searchService = new AMap.PlaceSearch({
+    // 在这里填写您的高德地图 API Key
+    key: '1d3839a0fe4ad113f7d88ec3775107b7',
+    // 指定地点搜索服务的版本号
+    version: '2.0'
+  })
+  const addressValue = formModel.address?.toString().split(',').join('') + detailAddress
+  // 执行地点搜索
+  searchService.search(addressValue, (status: any, result: any) => {
+    if (status === 'complete' && result.info === 'OK') {
+      // 处理搜索结果
+      const pois = result.poiList.pois
+      console.log(pois, 'pois')
+      // 对获取到的兴趣点列表进行处理
+      if (pois[0].name.includes('小区')) {
+        const result = pois[0].name.replace('小区', '')
+        if (
+          result.length > formModel.detailAddress.length ||
+          pois[0].address > formModel.detailAddress.length
+        ) {
+          if (
+            result.includes(formModel.detailAddress) ||
+            pois[0].address.includes(formModel.detailAddress)
+          ) {
+            console.log('1111')
+            accordingStorenameMatch(pois)
+          } else {
+            console.log('2222')
+            accordingAddressMatch()
+          }
+        } else {
+          if (
+            formModel.detailAddress.includes(result) ||
+            formModel.detailAddress.includes(pois[0].address)
+          ) {
+            console.log('3333')
+            accordingStorenameMatch(pois)
+          } else {
+            console.log('4444')
+            accordingAddressMatch()
+          }
+        }
+      } else {
+        if (
+          pois[0].name.length > formModel.detailAddress.length ||
+          pois[0].address.length > formModel.detailAddress.length
+        ) {
+          if (
+            pois[0].name.includes(formModel.detailAddress) ||
+            pois[0].address.includes(formModel.detailAddress)
+          ) {
+            console.log('1111')
+            accordingStorenameMatch(pois)
+          } else {
+            console.log('2222')
+            accordingAddressMatch()
+          }
+        } else {
+          if (
+            formModel.detailAddress.includes(pois[0].name) ||
+            formModel.detailAddress.includes(pois[0].address)
+          ) {
+            console.log('3333')
+            accordingStorenameMatch(pois)
+          } else {
+            console.log('4444')
+            accordingAddressMatch()
+          }
+        }
+      }
+      // if (pois[0].name === formModel.detailAddress) {
+      //   isName.value = false
+      //   getCenterMarker('match', pois[0].location.lng, pois[0].location.lat)
+      // } else {
+      //   isName.value = true
+      //   newAmapGeocoder()
+      //   getCenterMarkerAddress('match')
+      // }
+    } else {
+      // 地点搜索失败的处理逻辑
+      console.log('地点搜索失败')
+    }
+  })
+}
+//匹配
+const match = async (detailAddress: string) => {
+  if (activeKey.value === '1') {
+    if (title.value === '新建预约' && formModel.customStoreEntities.length !== 0) {
+      matchregisterVisible.value = true
+    } else {
+      const fields = ['address', 'detailAddress', 'radius'] // 指定要校验的字段名
+      formRef.value
+        ?.validateFields(fields)
+        .then(() => {
+          idThen(detailAddress)
+        })
+        .catch(() => {
+          // 校验失败
+          console.log('校验失败')
+        })
+    }
+  } else {
+    if (title.value === '新建预约' && formModel.customStoreEntities.length !== 0) {
+      matchregisterVisible.value = true
+    } else {
+      if (formModel.address && formModel.address.length === 0) {
+        return message.info('请输入您的地址信息')
+      }
+      if (!formModel.detailAddress) {
+        return message.info('请输入您的详细地址信息')
+      }
+      if (!formModel.radius) {
+        return message.info('请选择区域半径')
+      }
+      if (
+        formModel.address &&
+        formModel.address.length > 0 &&
+        formModel.detailAddress &&
+        formModel.radius
+      ) {
+        idThen(detailAddress)
+      }
+    }
+  }
+}
+//重置
+const resetForm = () => {
+  formModel.address = []
+  formModel.detailAddress = ''
+  formModel.radius = '5000'
+  listData.value.length = 0
+  map.value.clearMap()
+}
+//提示文字样式
+const tooltipStyle = {
+  fontSize: '12px',
+  borderRadius: '4px'
+}
+//添加
+const addStore = (item: any) => {
+  item.disabled = true
+  formModel.customStoreEntities.push({
+    storeName: item.title,
+    reservationTime: '',
+    storeId: item.id,
+    reservationDate: '',
+    option: item.option,
+    disabled: item.disabled
+  })
+}
+
+//删除预约门店
+const delReservationStore = (i: any) => {
+  listData.value.forEach((item: any) => {
+    if (item.id == i.storeId) {
+      item.disabled = false
+    }
+  })
+  formModel.customStoreEntities = formModel.customStoreEntities.filter((item: any) => {
+    return item.storeId != i.storeId
+  })
+}
+//门店重置
+const storeResetForm = () => {
+  formModel.customName = ''
+  formModel.customNid = ''
+  formModel.remark = ''
+  if (title.value === '详情' || title.value === '回单' || title.value === '新建预约') {
+    formModel.address = []
+    formModel.detailAddress = ''
+    formModel.radius = '5000'
+  }
+  formModel.customStoreEntities.length = 0
+
+  listData.value.length = 0
+  // 清除地图上的所有标记物
+  map.value.clearMap()
+}
+//控制报名信息确认弹窗显隐
+const registerVisible = ref<boolean>(false)
+//匹配信息确认弹窗显隐
+const matchregisterVisible = ref<boolean>(false)
+//报名
+const showModal = () => {
+  formRef.value
+    ?.validate()
+    .then(() => {
+      if (activeKey.value === '1') {
+        if (formModel.customStoreEntities.length === 0) {
+          message.info('请先添加预约门店')
+        } else {
+          formModel.enrollStatus = 1
+          registerVisible.value = true
+        }
+      } else {
+        formModel.enrollStatus = 1
+        registerVisible.value = true
+      }
+    })
+    .catch(err => {
+      console.log('校验失败err', err)
+    })
+}
+interface customStoreEntitiesItem {
+  //门店id
+  customStoreId?: number
+  //预约id
+  storeId: number
+  //门店名称
+  storeName?: string
+  //预约日期
+  reservationDate?: Dayjs | string
+  //预约时间
+  reservationTime: string
+}
+//是否发送请求了,发送了就要执行表格刷新
+const isSubmit = ref(false)
+//报名、暂存提交请求操作
+const submitOperate = () => {
+  //移除address属性
+  const filteredObj = Object.fromEntries(
+    Object.entries(formModel).filter(([key]) => key !== 'address')
+  ) as CustomerDTO
+  //移除customStoreEntities中的storeName属性
+  filteredObj.customStoreEntities = filteredObj.customStoreEntities.map(
+    (item: customStoreEntitiesItem) => {
+      const obj: customStoreEntitiesItem = {
+        storeId: item.storeId,
+        reservationTime: item.reservationTime,
+        reservationDate: item.reservationDate
+      }
+      if (title.value === '编辑预约' || title.value === '编辑') {
+        if (item.customStoreId) {
+          obj.customStoreId = item.customStoreId
+        }
+      }
+      return obj
+    }
+  )
+  const handleSuccess = (res: any) => {
+    if (res.code === 200) {
+      isSubmit.value = true
+      registerVisible.value = false
+      handleSubmit()
+      message.success('操作成功')
+    }
+  }
+
+  if (title.value === '新建预约' || title.value === '编辑预约' || title.value === '编辑') {
+    const requestFn = title.value === '新建预约' ? addCustomer : updateCustomer
+    doRequest(requestFn(filteredObj), {
+      onSuccess: handleSuccess
+    })
+  } else if (title.value === '回单') {
+    doRequest(auditCustomer({ customId: formModel.customId, status: 1 }), {
+      onSuccess: handleSuccess
+    })
+  }
+}
+//报名信息确认弹窗确定点击事件
+const handleOk = async () => {
+  await submitOperate()
+}
+//匹配信息确认弹窗确定点击事件
+const matchhandleOk = async (detailAddress: string) => {
+  matchregisterVisible.value = false
+  listData.value.forEach((item: any) => {
+    item.disabled = false
+  })
+  if (infoWindows.value) {
+    infoWindows.value.close() // 关闭气泡卡片
+  }
+  formModel.customStoreEntities = []
+  // listData.value=[]
+  const fields = ['address', 'detailAddress', 'radius'] // 指定要校验的字段名
+  formRef.value
+    ?.validateFields(fields)
+    .then(() => {
+      idThen(detailAddress)
+    })
+    .catch(() => {
+      // 校验失败
+      console.log('校验失败')
+    })
+  // await submitOperate()
+}
+//暂存
+const temporaryStorage = async () => {
+  const fields = ['customName', 'customNid'] // 指定要校验的字段名
+  formRef.value
+    ?.validateFields(fields)
+    .then(() => {
+      formModel.enrollStatus = 0
+      submitOperate()
+    })
+    .catch(err => {
+      console.log('校验失败err', err)
+    })
+}
+
+//回单
+const distribute = () => {
+  formRef.value
+    ?.validate()
+    .then(() => {
+      if (formModel.customStoreEntities.length === 0) {
+        message.info('请先添加预约门店')
+      } else {
+        registerVisible.value = true
+      }
+    })
+    .catch(err => {
+      console.log('校验失败err', err)
+    })
+}
+
+const emits = defineEmits<{
+  (e: 'submit-success', resetPageIndex?: boolean): void
+}>()
+
+const { title, visible, openModal, closeModal } = useModal()
+
+const { formAction } = useFormAction()
+// 表单模型
+const formModel = reactive<CustomerDTO>({
+  customType: undefined,
+  customId: undefined,
+  customName: '',
+  customNid: '',
+  remark: '',
+  address: [],
+  economize: '',
+  market: '',
+  distinguish: '',
+  detailAddress: '',
+  otherAddressesInfo: '',
+  radius: '',
+  enrollStatus: 1,
+  customStoreEntities: []
+})
+
+const formRule = ref<any>({
+  customName: [{ required: true, message: '请输入称呼', trigger: ['blur', 'change'] }],
+  customNid: [
+    {
+      required: true,
+      message: '请输入正确的手机号码',
+      pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+      trigger: ['blur', 'change']
+    }
+  ],
+  address: [{ required: true, message: '请选择地址信息', trigger: ['blur', 'change'] }],
+  detailAddress: [{ required: true, message: '请输入小区名称', trigger: 'change' }],
+  radius: [{ required: true, message: '请选择区域半径', trigger: 'change' }]
+})
+
+// 表单的提交请求
+const formRequestMapping: FormRequestMapping<CustomerDTO> = {
+  [FormAction.CREATE]: addCustomer,
+  [FormAction.UPDATE]: auditCustomer
+}
+
+// 获取 useAdminForm 的返回值
+const adminForm = useAdminForm(formAction, formRequestMapping, formModel, formRule)
+
+// 使用 toRefs 创建响应式解构副本
+const { submitLoading, validateAndSubmit, resetFields, validateInfos } = toRefs(adminForm)
+
+//表单提交处理
+const handleSubmit = () => {
+  handleClose()
+  emits('submit-success')
+}
+
+//弹窗关闭方法
+const handleClose = () => {
+  // activeKey.value = '1'
+  //去除禁用/只读
+  isAddressDisabled.value =
+    isAddressReadOnly.value =
+    isDetailAddressDisabled.value =
+    isDetailAddressReadOnly.value =
+    isRadiusDisabled.value =
+    isRadiusReadOnly.value =
+    isReservationTimeisReadOnly.value =
+      false
+  if (isSubmit.value) {
+    emits('submit-success')
+  }
+  closeModal()
+  formRule.value = {
+    customName: [{ required: true, message: '请输入称呼' }],
+    customNid: [
+      { required: true, message: '请输入正确的手机号码', pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/ }
+    ]
+  }
+  // listData.value.length = 0
+  formRef.value?.resetFields()
+
+  resetFields.value()
+  // formModel.customType = undefined
+  delete formModel.description
+  submitLoading.value = false
+}
+
+interface openObj {
+  newFormAction: FormAction
+  type?: string
+  record?: GeopoliticalCustomersRecord
+}
+//创建地图
+const handleMapInit = async () => {
+  await nextTick(async () => {
+    await initMap()
+  })
+}
+
+defineExpose({
+  open(opendata: openObj) {
+    isSubmit.value = false
+    // console.log('formModel.customType resssssssss', formModel.customType)
+    //不写resetFields.value()预约门店信息会反复追加进去,但是加了resetFields.value()会导致formModel.customType为0
+    // resetFields.value()
+    // formModel.customType = undefined
+    formModel.customStoreEntities = []
+    // console.log('formModel.customType ddddddddddd', formModel.customType)
+    // if (userInfoCurrent.value === 'ROLE_REVIEWER') {
+    //   formModel.customType = 1
+    // } else if (userInfoCurrent.value === 'ROLE_PRELIMINARY_EXAMINER') {
+    //   formModel.customType = 0
+    // }
+    const handleSuccess = (res: any) => {
+      const data = res.data || {}
+      const {
+        customId,
+        customName,
+        customNid,
+        remark,
+        economize,
+        market,
+        distinguish,
+        detailAddress,
+        otherAddressesInfo,
+        radius,
+        customStoreVOList,
+        customType
+      } = data
+
+      formModel.customId = customId
+      formModel.customName = customName
+      formModel.customNid = customNid
+      formModel.remark = remark
+      if (economize) {
+        formModel.address = [economize, market, distinguish]
+      } else {
+        formModel.address = []
+      }
+
+      formModel.economize = economize
+      formModel.market = market
+      formModel.distinguish = distinguish
+      formModel.detailAddress = detailAddress
+      formModel.customType = customType
+
+      formModel.otherAddressesInfo = otherAddressesInfo
+      formModel.radius = radius
+      formModel.customStoreEntities.push(...customStoreVOList)
+      //获取预约时间段下拉框回显数据
+      formModel.customStoreEntities.forEach((i: any) => {
+        i.option = generateTimeSlots(i.tradeStartTime, i.tradeEndTime)
+      })
+      const getActiveKey = () => {
+        if (formModel.customType === 0) {
+          activeKey.value = '1'
+        } else {
+          activeKey.value = '2'
+        }
+      }
+      if (opendata.type === 'audit') {
+        getActiveKey()
+        title.value = '编辑'
+        if (formModel.address.length !== 0) {
+          isAddressDisabled.value = true
+        }
+        if (formModel.radius) {
+          isRadiusDisabled.value = true
+        }
+        if (formModel.detailAddress) {
+          isDetailAddressDisabled.value = true
+        }
+        handleMapInit().then(() => {
+          if (formModel.address?.length !== 0 && formModel.detailAddress && formModel.radius) {
+            match(formModel.detailAddress)
+          }
+        })
+      } else if (opendata.type === 'edit') {
+        getActiveKey()
+        title.value = '编辑预约'
+        if (formModel.address.length !== 0) {
+          isAddressDisabled.value = true
+        }
+        if (formModel.radius) {
+          isRadiusDisabled.value = true
+        }
+        if (formModel.detailAddress) {
+          isDetailAddressDisabled.value = true
+        }
+        handleMapInit().then(() => {
+          if (formModel.address?.length !== 0 && formModel.detailAddress && formModel.radius) {
+            match(formModel.detailAddress)
+          }
+        })
+      } else if (opendata.type === 'view') {
+        if (formModel.customType === 0) {
+          activeKey.value = '1'
+        } else {
+          activeKey.value = '2'
+        }
+        title.value = '详情'
+        isAddressReadOnly.value = true
+        isRadiusReadOnly.value = true
+        isDetailAddressReadOnly.value = true
+        isReservationTimeisReadOnly.value = true
+      } else if (opendata.type === 'distribute') {
+        getActiveKey()
+        title.value = '回单'
+        isAddressReadOnly.value = true
+        isRadiusReadOnly.value = true
+        isDetailAddressReadOnly.value = true
+        isReservationTimeisReadOnly.value = true
+        formModel.description = 1
+      }
+      openModal()
+    }
+
+    if (opendata.newFormAction === FormAction.CREATE) {
+      activeKey.value = '1'
+      handleMapInit()
+      title.value = '新建预约'
+      formModel.customStoreEntities.length = 0
+      formModel.customType = 0
+      openModal()
+    } else if (opendata.newFormAction === FormAction.UPDATE) {
+      doRequest(getDetail({ id: opendata.record?.customId }), {
+        onSuccess: handleSuccess
+      })
+    }
+    formAction.value = opendata.newFormAction
+  }
+})
+
+//地图
+// import { provincesAndCitiesAndAutonomousRegions } from '@/utils/geopolitical-customers'
+import type { ShowSearchType } from 'ant-design-vue/es/cascader'
+// import { compileStyle } from 'vue/compiler-sfc'
+
+declare const AMap: any
+
+const filter: ShowSearchType['filter'] = (inputValue, path) => {
+  return path.some(option => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1)
+}
+
+//POI搜索插件AMap.PlaceSearch
+// const placeSearch = ref()
+//点标记AMap.Marker
+//创建的一个 Marker 实例
+const marker = ref<any>({})
+//创建的一个 中心点Marker 实例
+const markerCenter = ref<any>({})
+const previousMarker = ref<any>({})
+//创建地图AMap.Map
+const map = ref<any>({})
+
+//使用geocoder做地理/逆地理编码
+//正向地理编码： 将地址 描述信息 转换成 地理坐标（经纬度），对应为AMap.Geocoder的getLocation方法
+//逆向地理编码：将 地理坐标（经纬度） 转换成 地址描述信息，对应为AMap.Geocoder的getAddress方法
+const geocoder = ref<any>({})
+
+const searchService = ref<any>({})
+// 创建地点搜索服务实例
+const createSearchService = () => {
+  searchService.value = new AMap.PlaceSearch({
+    // 在这里填写您的高德地图 API Key
+    key: '1d3839a0fe4ad113f7d88ec3775107b7',
+    // 指定地点搜索服务的版本号
+    version: '2.0'
+  })
+}
+
+const isName = ref<boolean>(false)
+
+//创建地图
+const initMap = async () => {
+  map.value = new AMap.Map('draw-station-container', {
+    // center: [120.1551, 30.2741], // 地图中心点经纬度
+    zoom: 18 // 缩放级别
+  })
+  // await auto('全国')
+  if (
+    (title.value === '编辑预约' && formModel.otherAddressesInfo) ||
+    (title.value === '编辑' && formModel.otherAddressesInfo)
+  ) {
+    //标记中心点
+    getCenterMarker(
+      'init',
+      Number(formModel.otherAddressesInfo?.split(',')[0]),
+      Number(formModel.otherAddressesInfo?.split(',')[1])
+    )
+  }
+}
+// 创建自定义气泡卡片
+const createContent = (poi: any) => {
+  //信息窗体内容
+  const parentBox = document.createElement('div')
+  parentBox.className = 'amap-content-body'
+  Object.assign(parentBox.style, {
+    marginTop: '-4px',
+    minWidth: '200px',
+    maxWidth: '240px',
+    fontFamily: 'Helvetica, Hiragino Sans GB, Microsoft Yahei, 微软雅黑, Arial, sans-serif',
+    boxShadow: '0 0 0.5px rgba(0, 0, 100, .6)',
+    background: 'none repeat scroll 0 0 #fff',
+    borderRadius: '2px',
+    textAlign: 'left',
+    border: '1px solid silver'
+  })
+  const childBox = document.createElement('div')
+  childBox.className = 'amap-lib-infowindow'
+  Object.assign(childBox.style, {
+    padding: '0',
+    position: 'relative',
+    backgroundColor: '#fff',
+    margin: '6.855px 8px 0px 8px'
+  })
+  parentBox.appendChild(childBox)
+  const titleBox = document.createElement('div')
+  titleBox.className = 'amap-lib-infowindow-title'
+  Object.assign(titleBox.style, {
+    lineHeight: '22px',
+    fontSize: '14px',
+    marginBottom: '1px',
+    borderBottom: '1px solid #99adce',
+    paddingRight: '15px'
+  })
+  titleBox.innerHTML = `${poi.index + 1}.${poi.title}`
+  childBox.appendChild(titleBox)
+  const contentBox = document.createElement('div')
+  contentBox.className = 'amap-lib-infowindow-content'
+  Object.assign(contentBox.style, {
+    paddingTop: '5px',
+    overflow: 'hidden',
+    fontSize: '12px'
+  })
+  childBox.appendChild(contentBox)
+  const contentWrapBox = document.createElement('div')
+  contentWrapBox.className = 'amap-lib-infowindow-content-wrap'
+  Object.assign(contentWrapBox.style, {
+    wordBreak: 'break-all',
+    overflow: 'hidden'
+  })
+  contentBox.appendChild(contentWrapBox)
+  const createDivBox = (text: string) => {
+    const divBox = document.createElement('div')
+    Object.assign(divBox.style, {
+      fontSize: '12px',
+      boxSizing: 'border-box',
+      display: 'block',
+      wordBreak: 'break-all'
+    })
+    divBox.textContent = text
+    contentWrapBox.appendChild(divBox)
+  }
+
+  createDivBox(`地址：${poi.description}`)
+  if (poi.tel) {
+    createDivBox(`电话：${poi.tel}`)
+  }
+  const closeBox = document.createElement('div')
+  closeBox.className = 'amap-combo-close'
+  Object.assign(closeBox.style, {
+    position: 'absolute',
+    top: '2px',
+    right: '1px',
+    background: 'url(http://webapi.amap.com/theme/v1.3/images/amap-info.png) no-repeat -1px -151px',
+    width: '12px',
+    height: '12px',
+    cursor: 'pointer'
+  })
+  childBox.appendChild(closeBox)
+  closeBox.addEventListener('click', function () {
+    infoWindows.value.close()
+  })
+  const triangleBox = document.createElement('div')
+  triangleBox.className = 'amap-combo-sharp'
+  Object.assign(triangleBox.style, {
+    margin: '0 auto',
+    bottom: '-8px',
+    position: 'relative',
+    background: 'url(http://webapi.amap.com/theme/v1.3/images/amap-info.png) no-repeat -5px -564px',
+    width: '18px',
+    height: '8.15px'
+  })
+  childBox.appendChild(triangleBox)
+  return parentBox
+}
+const currentStoreId = ref<number | null>()
+//门店点击定位
+const storeItemClick = (item: any, index: number) => {
+  previousId = null
+  currentStoreId.value = item.id
+  map.value.remove(marker.value)
+  infoWindows.value = new AMap.InfoWindow({
+    autoMove: true,
+    isCustom: true,
+    offset: { x: 0, y: -30 }
+  })
+  // 创建标记点
+  marker.value = new AMap.Marker({
+    // map: map.value,
+    position: [item.lng, item.lat],
+    clickable: true,
+    // content: content,
+    offset: new AMap.Pixel(-90, -60), // 设置偏移量以调整卡片位置
+    zIndex: 1000 // 设置标记点的层级为 1000
+  })
+
+  infoWindows.value.setContent(
+    createContent({
+      title: item.title,
+      description: item.description,
+      index: index,
+      tel: item.tel
+    })
+  )
+
+  // 添加标记点到地图上
+  // map.value.add(marker.value)
+  // 设置定位点和缩放级别
+  const targetPosition = [item.lng, item.lat]
+  const targetZoom = 12 //设置地图视图级别为
+
+  infoWindows.value.open(map.value, targetPosition)
+  // 定义定位函数
+  map.value.setZoomAndCenter(targetZoom, targetPosition)
+}
+</script>
+<style lang="less" scoped>
+//必填校验置灰移除
+// ::v-deep .ant-form-item-explain-success {
+//   display: none !important;
+// }
+
+//请输入区域半径
+.radius {
+  ::v-deep .ant-form-item-control-input-content {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+
+//动态只读/禁用(请输入您的地址信息/请输入区域半径)
+.custom-disabled-style ::v-deep .ant-select-selector {
+  /* 自定义禁用状态下的样式 */
+  background-color: #f5f5f5;
+  color: #ccc;
+}
+
+.custom-readonly-style ::v-deep .ant-select-selector {
+  /* 自定义只读状态下的样式 */
+  border-color: #ddd;
+  background-color: #fff;
+  pointer-events: none;
+
+  background: #fff;
+  cursor: not-allowed;
+  cursor: context-menu;
+  color: black;
+  // color: rgba(0, 0, 0, 0.25);
+}
+
+//动态只读/禁用(预约时间)
+::v-deep .ant-picker.ant-picker-disabled {
+  background-color: #fff;
+  pointer-events: none;
+}
+
+::v-deep .ant-space-item {
+  cursor: pointer;
+}
+
+::v-deep .ant-picker-input > input[disabled] {
+  color: rgba(0, 0, 0, 0.85);
+}
+
+.custom-readonly-style ::v-deep .ant-picker {
+  /* 自定义只读状态下的样式 */
+  border-color: #ddd;
+  background-color: #fff;
+  pointer-events: none;
+  background: #fff;
+  cursor: not-allowed;
+  cursor: context-menu;
+  color: rgba(0, 0, 0, 0.25);
+}
+
+//日期选择器
+::v-deep .ant-picker,
+.ant-space {
+  width: 100%;
+}
+
+//地图
+.drawStation {
+  //地图
+  #draw-station-container,
+  #draw-station {
+    padding: 0px;
+    margin: 0px;
+    width: 100%;
+    min-height: 400px;
+    max-height: 800px;
+    // height: calc(100vh - 184px);
+  }
+
+  //地图展示容器
+  #aa {
+    padding: 0px;
+    margin: 0px;
+    // width: 100%;
+    // height: calc(100% - 20px);
+    // min-height: 100px;
+    max-height: calc(100% - 20px);
+    // max-height: 800px;
+    // height: calc(100vh - 214px);
+  }
+}
+
+//地图展示容器item
+::v-deep .ant-list-item {
+  //width: 330px;
+  padding: 8px 0;
+  width: 165px;
+  padding-right: 3px;
+}
+
+//添加按钮区域
+::v-deep .ant-list-item-action {
+  margin-left: 5px;
+}
+
+//添加按钮
+.ant-btn-sm {
+  font-size: 12px;
+  height: 20px;
+  padding: 0px 3px;
+}
+
+//地图的最大宽度
+::v-deep .ant-col-md-19 {
+  max-width: 100%;
+}
+
+//预约时间
+::v-deep .ant-space-item {
+  width: 100% !important;
+}
+
+//a-input鼠标移入提示请先选择省市区
+.custom-tooltip {
+  position: relative;
+}
+
+.custom-tooltip::before {
+  content: attr(title);
+  position: absolute;
+  top: 100%;
+  left: 0;
+  width: 100%;
+  padding: 5px;
+  background-color: #f8f8f8;
+  border: 1px solid #ccc;
+  border-top: none;
+  font-size: 14px;
+  color: #333;
+  pointer-events: none;
+  opacity: 0;
+  transition: opacity 0.2s ease-in-out;
+}
+
+.custom-tooltip:hover::before {
+  opacity: 1;
+}
+//modal头部
+.custom-modal /deep/ .ant-modal-header {
+  padding: 16px 24px 0px !important;
+  border-bottom: unset !important;
+}
+//a-tabs距离下面的距离
+::v-deep .ant-tabs-top > .ant-tabs-nav {
+  margin: 0 0 25px 0;
+  line-height: 0.5715;
+}
+// ::v-deep .ant-modal-body {
+//   padding: 0px 40px 8px !important;
+// }
+
+// ::v-deep .amap-sug-result {
+//   margin-left: 222px !important;
+// }
+// .searchAddress:hover .detailAddress {
+//   border-color: blue;
+// }
+</style>
diff --git a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
index 7686107..4dfac70 100644
--- a/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
+++ b/src/views/geopoliticalCustomers/geopoliticalCustomersModal.vue
@@ -563,6 +563,9 @@ const formRef = ref<FormInstance>()
 const provincesAndCitiesAndAutonomousOptions: any = ref([])
 //省市区change
 const addressChange = async (value: any) => {
+  // if (infoWindows.value) {
+  //   infoWindows.value.close() // 关闭气泡卡片
+  // }
   formModel.detailAddress = ''
 
   if (value) {
@@ -726,6 +729,9 @@ const handleSearch = (val: string) => {
 //小区a-select select事件
 const handleSelect = (val: string) => {
   formModel.detailAddress = val
+  if (infoWindows.value && infoWindows.value.close) {
+    infoWindows.value.close() // 关闭气泡卡片
+  }
   // map.value.clearMap()
   // formModel.customStoreEntities=[]
   // listData.value=[]
@@ -934,6 +940,8 @@ const pagingQuery = (lng: number | undefined, lat: number | undefined) => {
           listData.value.length = 0
           result.data &&
             result.data.forEach((item: any) => {
+              // const disabled = ids.includes(Number(item.id))
+
               const disabled = ids.includes(Number(item.id))
               listData.value.push({
                 title: item.storeName,
@@ -1131,6 +1139,17 @@ const match = async (detailAddress: string) => {
   } else {
     if (title.value === '新建预约' && formModel.customStoreEntities.length !== 0) {
       matchregisterVisible.value = true
+    } else if (title.value === '编辑') {
+      const fields = ['address', 'detailAddress', 'radius'] // 指定要校验的字段名
+      formRef.value
+        ?.validateFields(fields)
+        .then(() => {
+          idThen(detailAddress)
+        })
+        .catch(() => {
+          // 校验失败
+          console.log('校验失败')
+        })
     } else {
       if (formModel.address && formModel.address.length === 0) {
         return message.info('请输入您的地址信息')
@@ -1171,7 +1190,7 @@ const addStore = (item: any) => {
   formModel.customStoreEntities.push({
     storeName: item.title,
     reservationTime: '',
-    storeId: item.id,
+    storeId: Number(item.id),
     reservationDate: '',
     option: item.option,
     disabled: item.disabled
@@ -1508,15 +1527,15 @@ defineExpose({
       if (opendata.type === 'audit') {
         getActiveKey()
         title.value = '编辑'
-        if (formModel.address.length !== 0) {
-          isAddressDisabled.value = true
-        }
-        if (formModel.radius) {
-          isRadiusDisabled.value = true
-        }
-        if (formModel.detailAddress) {
-          isDetailAddressDisabled.value = true
-        }
+        // if (formModel.address.length !== 0) {
+        //   isAddressDisabled.value = true
+        // }
+        // if (formModel.radius) {
+        //   isRadiusDisabled.value = true
+        // }
+        // if (formModel.detailAddress) {
+        //   isDetailAddressDisabled.value = true
+        // }
         handleMapInit().then(() => {
           if (formModel.address?.length !== 0 && formModel.detailAddress && formModel.radius) {
             match(formModel.detailAddress)
diff --git a/vite.config.ts b/vite.config.ts
index 17cb009..4014482 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -32,7 +32,7 @@ export const serverAddress = 'http://39.100.77.21:8000'
 
 //线上ip
 // export const serverAddress = 'http://175.27.212.74:80'
-//线上域名
+//线上域名,现在用这个
 // export const serverAddress = 'https://byffp.top'
 // export const serverAddress = 'http://8.130.96.163:8100'
 // https://vitejs.dev/config/