From fec49d35bc5bae5730003790f120fd9e125f57e9 Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Tue, 1 Aug 2023 17:27:11 +0800
Subject: [PATCH] bug fix and performance improvements

---
 src/views/components/FieldOptions/index.vue | 166 ++++-----
 src/views/website/activity/active/index.vue | 384 ++++++++++----------
 2 files changed, 278 insertions(+), 272 deletions(-)

diff --git a/src/views/components/FieldOptions/index.vue b/src/views/components/FieldOptions/index.vue
index eb9411e..831303e 100644
--- a/src/views/components/FieldOptions/index.vue
+++ b/src/views/components/FieldOptions/index.vue
@@ -1,30 +1,31 @@
 <template>
   <el-form
-    ref="formRef"
-    :disabled="disabled"
-    :inline="inline"
-    :label-width="labelWidth + 'px'"
-    :model="modelValue"
-    :rules="rules"
-    :size="size"
+      ref="formRef"
+      :disabled="disabled"
+      :inline="inline"
+      :label-width="labelWidth + 'px'"
+      :model="modelValue"
+      :rules="rules"
+      :size="size"
   >
     <el-row>
       <el-col :span="24">
-        <el-form-item :show-message="false" label="所属领域:" prop="industrys">
+        <!--        :show-message="false"-->
+        <el-form-item label="所属领域:" prop="industrys">
           <el-row justify="space-between" type="flex">
             <el-col :span="6">
               <el-form-item>
                 <el-select
-                  v-model="fields[0]"
-                  placeholder="请选择"
-                  value-key="id"
-                  @change="levelIChange"
+                    v-model="fields[0]"
+                    placeholder="请选择"
+                    value-key="id"
+                    @change="levelIChange"
                 >
                   <el-option
-                    v-for="item in levelI"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
+                      v-for="item in levelI"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
                   >
                   </el-option>
                 </el-select>
@@ -32,33 +33,33 @@
             </el-col>
             <el-col :span="6">
               <el-select
-                v-model="fields[1]"
-                :disabled="levelII.length === 0"
-                placeholder="请选择"
-                value-key="id"
-                @change="levelIIChange"
+                  v-model="fields[1]"
+                  :disabled="levelII.length === 0"
+                  placeholder="请选择"
+                  value-key="id"
+                  @change="levelIIChange"
               >
                 <el-option
-                  v-for="item in levelII"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
+                    v-for="item in levelII"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
                 >
                 </el-option>
               </el-select>
             </el-col>
             <el-col :span="6">
               <el-select
-                v-model="fields[2]"
-                :disabled="levelIII.length === 0"
-                placeholder="请选择"
-                value-key="id"
+                  v-model="fields[2]"
+                  :disabled="levelIII.length === 0"
+                  placeholder="请选择"
+                  value-key="id"
               >
                 <el-option
-                  v-for="item in levelIII"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
+                    v-for="item in levelIII"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
                 >
                 </el-option>
               </el-select>
@@ -70,10 +71,10 @@
           </el-row>
           <div class="e_tag">
             <el-tag
-              v-for="(tag, index) in industrysTags"
-              :key="index"
-              :closable="!disabled"
-              @close="handleFieldClose(index)"
+                v-for="(tag, index) in industrysTags"
+                :key="index"
+                :closable="!disabled"
+                @close="handleFieldClose(index)"
             >
               {{ getFieldNameById(tag) }}
               <!-- <template v-if="Array.isArray(tag)">
@@ -94,9 +95,9 @@
 </template>
 <script name="FieldOptions" setup>
 // import { industry } from "@/api/config";
-import { listSysIndustry } from "@/api/platform/industry";
-import { ElMessage } from "element-plus";
-import { reactive, toRefs, watch } from "vue";
+import {listSysIndustry} from "@/api/platform/industry";
+import {ElMessage} from "element-plus";
+import {reactive, ref, toRefs, watch} from "vue";
 
 const props = defineProps({
   modelValue: Object,
@@ -117,7 +118,7 @@ const props = defineProps({
     default: "default",
   },
 });
-const { modelValue, labelWidth, disabled } = toRefs(props);
+const {modelValue, labelWidth, disabled} = toRefs(props);
 const formRef = ref(null);
 const levelI = ref([]); // I级数据
 const levelII = ref([]); // II级数据
@@ -136,11 +137,11 @@ const data = reactive({
     ],
   },
 });
-const { rules } = toRefs(data);
+const {rules} = toRefs(data);
 
 // 获取领域树形列表
 const getIndustryTreeData = async () => {
-  const { data } = await listSysIndustry();
+  const {data} = await listSysIndustry();
   levelI.value = data;
 };
 
@@ -213,6 +214,7 @@ const handleFieldClose = (index) => {
 };
 
 const validateForm = async () => {
+  console.log(modelValue.value.industrys)
   try {
     return await formRef.value.validate();
   } catch (error) {
@@ -221,46 +223,46 @@ const validateForm = async () => {
 };
 
 getIndustryTreeData();
-
+fields.value = []
 watch(
-  modelValue,
-  (newVal) => {
-    modelValue.value.industrys = [];
-    // console.log(modelValue.value.industry ? 1 : 0);
-    let industrysList = modelValue.value.industry
-      ? modelValue.value.industry.split(",")
-      : [];
-    modelValue.value.industrys.push(...industrysList);
-    for (const field of industrysList) {
-      industrysTags.value.push(field.split("-").map((el) => parseInt(el)));
-    }
-    // let _key = [];
-    // let _value = [];
-    // for (let i = 0; i < newVal.industrys.length; i++) {
-    //   const item = newVal.industrys[i];
-    //   _key.push(item.key);
-    //   _value.push(item.value);
-    // }
-    // newVal.industrys = _key;
-    // let keyObj = [];
-    // for (let i = 0; i < _key.length; i++) {
-    //   keyObj.push([]);
-    //   let array = _key[i].split("-");
-    //   for (let j = 0; j < array.length; j++) {
-    //     keyObj[i].push({
-    //       id: array[j],
-    //     });
-    //   }
-    // }
-    // for (let i = 0; i < _value.length; i++) {
-    //   let array = _value[i].split(">");
-    //   for (let j = 0; j < array.length; j++) {
-    //     keyObj[i][j]["name"] = array[j];
-    //   }
-    // }
-    // industrysTags.value = keyObj;
-  },
-  { immediate: true }
+    modelValue,
+    (newVal) => {
+      modelValue.value.industrys = [];
+      // console.log(modelValue.value.industry ? 1 : 0);
+      let industrysList = modelValue.value.industry
+          ? modelValue.value.industry.split(",")
+          : [];
+      modelValue.value.industrys.push(...industrysList);
+      for (const field of industrysList) {
+        industrysTags.value.push(field.split("-").map((el) => parseInt(el)));
+      }
+      // let _key = [];
+      // let _value = [];
+      // for (let i = 0; i < newVal.industrys.length; i++) {
+      //   const item = newVal.industrys[i];
+      //   _key.push(item.key);
+      //   _value.push(item.value);
+      // }
+      // newVal.industrys = _key;
+      // let keyObj = [];
+      // for (let i = 0; i < _key.length; i++) {
+      //   keyObj.push([]);
+      //   let array = _key[i].split("-");
+      //   for (let j = 0; j < array.length; j++) {
+      //     keyObj[i].push({
+      //       id: array[j],
+      //     });
+      //   }
+      // }
+      // for (let i = 0; i < _value.length; i++) {
+      //   let array = _value[i].split(">");
+      //   for (let j = 0; j < array.length; j++) {
+      //     keyObj[i][j]["name"] = array[j];
+      //   }
+      // }
+      // industrysTags.value = keyObj;
+    },
+    {immediate: true}
 );
 
 defineExpose({
diff --git a/src/views/website/activity/active/index.vue b/src/views/website/activity/active/index.vue
index 9c2d217..117b531 100644
--- a/src/views/website/activity/active/index.vue
+++ b/src/views/website/activity/active/index.vue
@@ -1,54 +1,56 @@
 <template>
   <div class="app-container">
     <el-form
-      :model="queryParams"
-      ref="queryFormRef"
-      v-show="showSearch"
-      :inline="true"
+        :model="queryParams"
+        ref="queryFormRef"
+        v-show="showSearch"
+        :inline="true"
     >
       <el-form-item label="活动名称" prop="title">
         <el-input
-          v-model="queryParams.title"
-          placeholder="请输入活动名称"
-          clearable
-          size="default"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.title"
+            placeholder="请输入活动名称"
+            clearable
+            size="default"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="所属站点" prop="tenantId">
-        <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
-      </el-form-item>
+      <!--      <el-form-item label="所属站点" prop="tenantId">-->
+      <!--        <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />-->
+      <!--      </el-form-item>-->
       <el-form-item label="联系人" prop="contact">
         <el-input
-          v-model="queryParams.contact"
-          placeholder="请输入联系人"
-          clearable
-          size="default"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.contact"
+            placeholder="请输入联系人"
+            clearable
+            size="default"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="手机号码" prop="contactMobile">
         <el-input
-          v-model="queryParams.contactMobile"
-          placeholder="请输入手机号码"
-          clearable
-          size="default"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
+            v-model="queryParams.contactMobile"
+            placeholder="请输入手机号码"
+            clearable
+            size="default"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item>
         <el-button
-          type="primary"
-          icon="search"
-          size="default"
-          @click="handleQuery"
-          >搜索</el-button
+            type="primary"
+            icon="search"
+            size="default"
+            @click="handleQuery"
+        >搜索
+        </el-button
         >
         <el-button icon="refresh" size="default" @click="resetQuery"
-          >重置</el-button
+        >重置
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -56,53 +58,54 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-          type="primary"
-          plain
-          icon="plus"
-          size="default"
-          @click="handleAdd"
-          >新增</el-button
+            type="primary"
+            plain
+            icon="plus"
+            size="default"
+            @click="handleAdd"
+        >新增
+        </el-button
         >
       </el-col>
       <right-toolbar
-        v-model:showSearch="showSearch"
-        @queryTable="getList"
+          v-model:showSearch="showSearch"
+          @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="dataList">
-      <el-table-column label="数据编号" prop="id" align="center" />
+      <el-table-column label="数据编号" prop="id" align="center"/>
       <el-table-column
-        label="活动名称"
-        prop="title"
-        align="center"
-        show-overflow-tooltip
+          label="活动名称"
+          prop="title"
+          align="center"
+          show-overflow-tooltip
       />
       <el-table-column
-        label="开始时间"
-        prop="beginTime"
-        align="center"
-        width="100"
+          label="开始时间"
+          prop="beginTime"
+          align="center"
+          width="100"
       >
         <template #default="{ row }">
           <span>{{ row.beginTime }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="结束时间"
-        prop="finishTime"
-        align="center"
-        width="100"
+          label="结束时间"
+          prop="finishTime"
+          align="center"
+          width="100"
       >
         <template #default="{ row }">
           <span>{{ row.finishTime }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="截止时间"
-        prop="joinDeadline"
-        align="center"
-        width="100"
+          label="截止时间"
+          prop="joinDeadline"
+          align="center"
+          width="100"
       >
         <template #default="{ row }">
           <span>{{ row.joinDeadline }}</span>
@@ -111,8 +114,8 @@
       <el-table-column label="活动分类" align="center" show-overflow-tooltip>
         <template #default="{ row }"> {{ row.industryName }}</template>
       </el-table-column>
-      <el-table-column label="人数上限" prop="maxNumber" align="center" />
-      <el-table-column label="报名费用" prop="amount" align="center" />
+      <el-table-column label="人数上限" prop="maxNumber" align="center"/>
+      <el-table-column label="报名费用" prop="amount" align="center"/>
       <!-- <el-table-column label="已报名" prop="join_count" align="center">
         <template #default="{ row }">
           <router-link
@@ -125,103 +128,116 @@
           </router-link>
         </template>
       </el-table-column> -->
-      <el-table-column label="站点" align="center">
-        <template #default="{ row }">
-          {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
-        </template>
-      </el-table-column>
-      <el-table-column label="联系人" prop="contact" align="center" />
-      <el-table-column label="手机号码" prop="contactMobile" align="center" />
+      <!--      <el-table-column label="站点" align="center">-->
+      <!--        <template #default="{ row }">-->
+      <!--          {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <el-table-column label="联系人" prop="contact" align="center"/>
+      <el-table-column label="手机号码" prop="contactMobile" align="center"/>
       <el-table-column label="发布时间" align="center" width="100">
         <template #default="{ row }">
           <span>{{ row.createTime }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="操作"
-        align="center"
-        width="120"
-        class-name="small-padding fixed-width"
+          label="操作"
+          align="center"
+          width="120"
+          class-name="small-padding fixed-width"
       >
         <template #default="{ row }">
           <el-button
-            size="small"
-            type="text"
-            icon="notebook"
-            @click="router.push(`./signUp?id=${row.id}`)"
-            >报名名单</el-button
+              size="small"
+              type="text"
+              icon="notebook"
+              @click="router.push(`./signUp?id=${row.id}`)"
+          >报名名单
+          </el-button
           >
           <el-button
-            size="small"
-            type="text"
-            icon="edit"
-            @click="handleUpdate(row)"
-            >编辑</el-button
+              size="small"
+              type="text"
+              icon="edit"
+              @click="handleUpdate(row)"
+          >编辑
+          </el-button
           >
           <el-button
-            size="small"
-            type="text"
-            icon="delete"
-            @click="handleDelete(row)"
-            >删除</el-button
+              size="small"
+              type="text"
+              icon="delete"
+              @click="handleDelete(row)"
+          >删除
+          </el-button
           >
         </template>
       </el-table-column>
     </el-table>
     <pagination
-      v-show="total > 0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
     />
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" v-model="showEditDialog" width="55%">
+    <el-dialog :title="title" v-model="showEditDialog" width="55%" destroy-on-close>
       <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="所属站点" prop="tenantId">
-          <SiteOptions v-model="form.tenantId" :site-list="siteList" />
-        </el-form-item>
+        <!--        <el-form-item label="所属站点" prop="tenantId">-->
+        <!--          <SiteOptions v-model="form.tenantId" :site-list="siteList" />-->
+        <!--        </el-form-item>-->
         <el-form-item label="活动名称:" prop="title">
-          <el-input v-model="form.title" placeholder="请输入活动名称" />
+          <el-input v-model="form.title" placeholder="请输入活动名称"/>
         </el-form-item>
         <el-form-item label="联系人:" prop="contact">
-          <el-input v-model="form.contact" placeholder="请输入联系人" />
+          <el-input v-model="form.contact" placeholder="请输入联系人"/>
         </el-form-item>
         <el-form-item label="手机号码:" prop="contactMobile">
           <el-input
-            v-model="form.contactMobile"
-            placeholder="请输入手机号码"
-            maxlength="11"
+              v-model="form.contactMobile"
+              placeholder="请输入手机号码"
+              maxlength="11"
           />
         </el-form-item>
         <el-form-item label="开始时间:" prop="beginTime">
           <el-date-picker
-            value-format="YYYY-MM-DD HH:mm:ss"
-            v-model="form.beginTime"
-            type="datetime"
-            placeholder="选择开始时间"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="form.beginTime"
+              type="datetime"
+              placeholder="选择开始时间"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="结束时间:" prop="finishTime">
           <el-date-picker
-            value-format="YYYY-MM-DD HH:mm:ss"
-            v-model="form.finishTime"
-            type="datetime"
-            placeholder="选择结束时间"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="form.finishTime"
+              type="datetime"
+              placeholder="选择结束时间"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="截止时间:" prop="joinDeadline">
           <el-date-picker
-            value-format="YYYY-MM-DD HH:mm:ss"
-            v-model="form.joinDeadline"
-            type="datetime"
-            placeholder="选择截止时间"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              v-model="form.joinDeadline"
+              type="datetime"
+              placeholder="选择截止时间"
           >
           </el-date-picker>
         </el-form-item>
-        <CityOptions v-model="form" ref="cityOptionsRef" />
+        <!--        国家-->
+        <el-form-item
+            label="国家"
+            prop="country"
+        >
+          <el-input
+              v-model="form.country"
+              placeholder="请输入国家"
+          />
+        </el-form-item>
+        <!--        <CityOptions v-model="form" ref="cityOptionsRef"/>-->
         <!-- <el-form-item label="地点:" required>
           <el-row type="flex" justify="space-between" :gutter="10">
             <el-col :span="8">
@@ -283,9 +299,9 @@
           </el-row>
         </el-form-item> -->
         <el-form-item label="详细地址:" prop="address">
-          <el-input v-model="form.address" placeholder="请输入详细地址" />
+          <el-input v-model="form.address" placeholder="请输入详细地址"/>
         </el-form-item>
-        <FieldOptions v-model="form" ref="fieldOptionsRef" />
+        <FieldOptions v-model="form" ref="fieldOptionsRef"/>
 
         <!-- <el-form-item label="活动分类:" required>
           <el-row type="flex" justify="space-between">
@@ -347,29 +363,35 @@
 
         <el-form-item label="通知人群:" prop="notifyCrowds">
           <el-select v-model="form.notifyCrowds" multiple placeholder="请选择">
-            <el-option label="企业" value="1"> </el-option>
-            <el-option label="专家" value="2"> </el-option>
+            <el-option label="企业" value="1"></el-option>
+            <el-option label="专家" value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="报名人数上限:" prop="maxNumber">
           <el-input
-            v-model.number="form.maxNumber"
-            placeholder="请输入报名人数"
+              v-model.number="form.maxNumber"
+              placeholder="请输入报名人数"
           />
         </el-form-item>
         <el-form-item label="宣传图:" prop="image">
-          <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
+          <ImageUpload v-model="form.image" :isShowTip="false" :limit="1"/>
         </el-form-item>
         <el-form-item label="活动简介:" prop="description">
           <el-input
-            v-model="form.description"
-            placeholder="请输入活动简介"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4 }"
+              v-model="form.description"
+              placeholder="请输入活动简介"
+              type="textarea"
+              :autosize="{ minRows: 2, maxRows: 4 }"
           />
         </el-form-item>
         <el-form-item label="活动介绍:" prop="content">
-          <WangEditor v-model="form.content" minHeight="150px" />
+          <!--          <WangEditor v-model="form.content" minHeight="150px" />-->
+          <el-input
+              v-model="form.content"
+              placeholder="请输入活动介绍"
+              type="textarea"
+              :autosize="{ minRows: 6, maxRows: 8 }"
+          />
         </el-form-item>
         <el-form-item label="报名费用:" prop="amount">
           <el-input v-model.number="form.amount">
@@ -386,32 +408,17 @@
 </template>
 
 <script setup name="Active">
-import SiteOptions from "@/views/components/SiteOptions";
-// import CityOptions from "../../../components/CityOptions";
-import {
-  activityList,
-  activityAdd,
-  activityDetail,
-  activityEdit,
-  activityDelete,
-} from "@/api/website/activity";
-import { tenantSelect } from "@/api/subPlatform/tenant";
-import {
-  areaList,
-  industry,
-  identity,
-  provinceList,
-  cityList,
-  districtList,
-} from "@/api/config";
+import {activityAdd, activityDelete, activityDetail, activityEdit, activityList,} from "@/api/website/activity";
+import {tenantSelect} from "@/api/subPlatform/tenant";
+import {cityList, districtList, industry, provinceList,} from "@/api/config";
 import FieldOptions from "@/views/components/FieldOptions";
 // import { cloneDeep } from "lodash";
-import { reactive, toRefs } from "vue";
+import {reactive, ref, toRefs} from "vue";
 // import { constants } from "buffer";
-import { ElMessage, ElMessageBox } from "element-plus";
-import WangEditor from "@/components/WangEditor/index.vue";
+import {ElMessage, ElMessageBox} from "element-plus";
 // import SiteOptions from "@/views/components/SiteOptions";
-import { useRouter } from "vue-router";
+import {useRouter} from "vue-router";
+
 const router = useRouter();
 const dataList = ref([]);
 const loading = ref(true);
@@ -453,15 +460,10 @@ const data = reactive({
     // industrys: [],
   },
   rules: {
-    title: [{ required: true, message: "活动名称不能为空", trigger: "blur" }],
-    contact: [{ required: true, message: "联系人不能为空", trigger: "blur" }],
+    title: [{required: true, message: "活动名称不能为空", trigger: "blur"}],
+    contact: [{required: true, message: "联系人不能为空", trigger: "blur"}],
     contactMobile: [
-      { required: true, message: "手机号码不能为空", trigger: "blur" },
-      {
-        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-        message: "请输入正确的手机号码",
-        trigger: ["blur", "change"],
-      },
+      {required: true, message: "手机号码不能为空", trigger: "blur"},
     ],
     tenantId: [
       {
@@ -471,18 +473,19 @@ const data = reactive({
       },
     ],
     beginTime: [
-      { required: true, message: "开始时间不能为空", trigger: "change" },
+      {required: true, message: "开始时间不能为空", trigger: "change"},
     ],
+    country: [{required: true, message: "请输入国家", trigger: "change"}],
     finishTime: [
-      { required: true, message: "结束时间不能为空", trigger: "change" },
+      {required: true, message: "结束时间不能为空", trigger: "change"},
     ],
     joinDeadline: [
-      { required: true, message: "截止时间不能为空", trigger: "change" },
+      {required: true, message: "截止时间不能为空", trigger: "change"},
     ],
-    province: [{ required: true, message: "请选择", trigger: "change" }],
-    city: [{ required: true, message: "请选择", trigger: "change" }],
-    district: [{ required: true, message: "请选择", trigger: "change" }],
-    address: [{ required: true, message: "详细地址不能为空", trigger: "blur" }],
+    province: [{required: true, message: "请选择", trigger: "change"}],
+    city: [{required: true, message: "请选择", trigger: "change"}],
+    district: [{required: true, message: "请选择", trigger: "change"}],
+    address: [{required: true, message: "详细地址不能为空", trigger: "blur"}],
     industrys: [
       {
         type: "array",
@@ -500,17 +503,17 @@ const data = reactive({
       },
     ],
     maxNumber: [
-      { required: true, message: "报名人数不能为空", trigger: "blur" },
+      {required: true, message: "报名人数不能为空", trigger: "blur"},
     ],
-    image: [{ required: true, message: "请上传宣传图", trigger: "blur" }],
+    image: [{required: true, message: "请上传宣传图", trigger: "blur"}],
     description: [
-      { required: true, message: "活动简介不能为空", trigger: "blur" },
+      {required: true, message: "活动简介不能为空", trigger: "blur"},
     ],
-    content: [{ required: true, message: "活动介绍不能为空", trigger: "blur" }],
-    amount: [{ required: true, message: "报名费用不能为空", trigger: "blur" }],
+    content: [{required: true, message: "活动介绍不能为空", trigger: "blur"}],
+    amount: [{required: true, message: "报名费用不能为空", trigger: "blur"}],
   },
 });
-const { queryParams, form, rules } = toRefs(data);
+const {queryParams, form, rules} = toRefs(data);
 
 const resetQuery = () => {
   if (queryFormRef.value) {
@@ -565,17 +568,17 @@ const handleAdd = () => {
 
 // 获取省列表
 const getProvinceList = async () => {
-  const { data } = await provinceList();
+  const {data} = await provinceList();
   provinceSelectList.value = data;
 };
 // 根据省id获取地级市列表
 const getCityListByProvinceId = async (provinceId) => {
-  const { data } = await cityList(provinceId);
+  const {data} = await cityList(provinceId);
   citySelectList.value = data;
 };
 // 根据市id获取县区列表
 const getAreaListByCityId = async (cityId) => {
-  const { data } = await districtList(cityId);
+  const {data} = await districtList(cityId);
   districtSelectList.value = data;
 };
 
@@ -599,18 +602,18 @@ const cityChange = () => {
 
 const getFieldByParent = (id) => {
   return new Promise((resolve, reject) => {
-    industry({ parent_id: id })
-      .then(({ code, msg, data }) => {
-        if (code == 200) {
-          resolve(data);
-        } else {
-          ElMessage.error(msg);
-          reject({ msg, code });
-        }
-      })
-      .catch((error) => {
-        reject(error);
-      });
+    industry({parent_id: id})
+        .then(({code, msg, data}) => {
+          if (code == 200) {
+            resolve(data);
+          } else {
+            ElMessage.error(msg);
+            reject({msg, code});
+          }
+        })
+        .catch((error) => {
+          reject(error);
+        });
   });
 };
 const field1Change = async (id) => {
@@ -648,7 +651,7 @@ const handleUpdate = async (row) => {
 };
 
 // const siteOptionsRef = ref();
-const cityOptionsRef = ref();
+// const cityOptionsRef = ref();
 const fieldOptionsRef = ref();
 const submitForm = async () => {
   // let notifys = 0;
@@ -656,11 +659,11 @@ const submitForm = async () => {
   // formData.notifyCrowd = notifys;
   // formData.industrys = [form.value.industrys.join("-")];
   // const siteOptionsValid =
-  const cityOptionsValid = await cityOptionsRef.value.validateForm();
+  // const cityOptionsValid = await cityOptionsRef.value.validateForm();
   const fieldOptionsValid = await fieldOptionsRef.value.validateForm();
   const valid = await formRef.value.validate();
   form.value.notifyCrowd = form.value.notifyCrowds.join(",");
-  if (!valid || !cityOptionsValid || !fieldOptionsValid) {
+  if (!valid || !fieldOptionsValid) {
     console.log("校验未通过");
     return;
   }
@@ -682,12 +685,13 @@ const submitForm = async () => {
 /** 删除按钮操作 */
 const handleDelete = (row) => {
   ElMessageBox.confirm(`是否确认删除名为${row.title}的数据项？`)
-    .then(async () => {
-      await activityDelete(row.id);
-      getList();
-      ElMessage.success("删除成功");
-    })
-    .catch(() => {});
+      .then(async () => {
+        await activityDelete(row.id);
+        getList();
+        ElMessage.success("删除成功");
+      })
+      .catch(() => {
+      });
 };
 
 getList();