From 7288eca14beb835dd715318e7d8ca0dc85f127e2 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 18 Dec 2024 11:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=B4=BB=E5=9C=88=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../volunteer/LifeCircleManagement/add.vue    | 942 ++++++++----------
 .../volunteer/LifeCircleManagement/index.vue  |   6 +-
 2 files changed, 401 insertions(+), 547 deletions(-)

diff --git a/src/views/modules/volunteer/LifeCircleManagement/add.vue b/src/views/modules/volunteer/LifeCircleManagement/add.vue
index 39db4f339..e79745a24 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/add.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/add.vue
@@ -5,19 +5,15 @@
 
             <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
                 <el-row>
-                    <!-- <el-col :span="12">
-            <el-form-item label="所属组织" prop="agencyName" label-width="100px">
-              <el-input v-model.trim="formData.agencyName" size="small" clearable placeholder="请输入活动名称" :disabled="true"
-                class="u-item-width-normal"></el-input>
-            </el-form-item>
-          </el-col> -->
+
                     <el-col :span="12">
                         <el-form-item label="类型" prop="type" label-width="100px">
-                            <!-- <el-cascader    @change="handleChangeAgency" :options="options"  :disabled="showdisabled"  :props="{ checkStrictly: true }"></el-cascader>
-              <el-form-item label="类型" prop="type" label-width="100px"> -->
+
                             <el-cascader v-model="this.formData.type" @change="handleChangeAgency" :options="options"
-                                :disabled="showdisabled" :props="{emitPath: false,
-                multiple: false, }"></el-cascader>
+                                :disabled="showdisabled" :props="{
+                                    emitPath: false,
+                                    multiple: false,
+                                }"></el-cascader>
                         </el-form-item>
 
 
@@ -28,16 +24,7 @@
                                 :disabled="showdisabled" class="u-item-width-normal"></el-input>
                         </el-form-item>
                     </el-col>
-                    <!-- <el-col :span="12">
-                        <el-form-item label="组织类型" label-width="100px" prop="orgType">
-                            <el-select class="u-item-width-normal" v-model.trim="formData.orgType" placeholder="请选择"
-                                clearable>
-                                <el-option v-for="item in OrganizationaltypeList" :key="item.value" :label="item.label"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col> -->
+
                     <el-col :span="24">
                         <el-form-item label="位置" prop="searchValue" label-width="100px" style="display: block">
                             <div style="width: 634px">
@@ -65,30 +52,17 @@
                                 :disabled="showdisabled" class="u-item-width-normal"></el-input>
                         </el-form-item>
                     </el-col>
-                    <!-- <el-col :span="12">
-            <div  style="display: flex; ">
-              <div >
-                <div v-for="(item, index) in formData.tags" :label="index" :key="item.name" :prop=index style="display: flex;">
-                <el-form-item label="标签" prop="tags" label-width="100px" >
-                    <el-input :disabled="showdisabled" v-model="formData.tags" placeholder="请输入(最多添加四个)"  lass="u-item-width-normal"></el-input>
-      </el-form-item>
-                  <div  v-if="index > 0"  @click="removeDomain(item)" style="color: blue; font-size: 12px;  margin-top: 15px">删除
-                  </div>
-                </div>
-              </div>
-              <div  @click="addDomain" style="color: blue; font-size: 12px;  margin-top: 15px">添加
-                </div>
-              <i class="el-icon-circle-plus" @click="addDomain" style="font-size: 20px; margin-top:7px;"></i>
-            </div>
-          </el-col> -->
+
                     <el-col :span="12">
-                        <div v-if="formData.tags1" style="display: flex;">
+                        <div v-if="tags1" style="display: flex;">
                             <div>
-                                <div v-for="(item, index) in formData.tags1" :key="item.name + index"
+                                <div v-for="(item, index) in tags1" :key="index"
                                     style="display: flex;">
-                                    <el-form-item label="标签" prop="tags1" label-width="100px">
-                                        <el-input :disabled="showdisabled" v-model="item.tab" placeholder="请输入(最多添加四个)"
-                                            class="u-item-width-normal"></el-input>
+                                    <el-form-item label="标签" label-width="100px"  :rules="[
+                    { required: true, message: '请输入', trigger: 'blur' },
+                  ]">
+                                        <el-input :disabled="showdisabled" v-model="tags1[index].tag"
+                                            placeholder="请输入(最多添加四个)" class="u-item-width-normal"></el-input>
                                     </el-form-item>
                                     <div v-if="index > 0" @click="removeDomain(index)"
                                         style="color: blue; font-size: 12px; margin-top: 15px">
@@ -122,27 +96,6 @@
                                 :disabled="showdisabled" class="u-item-width-normal"></el-input>
                         </el-form-item>
                     </el-col>
-                    <!-- <el-form-item label="组织介绍" prop="introduction" label-width="100px" style="display: block">
-                        <div class="item_width_1">
-                            <el-input type="textarea" autosize placeholder="请填写组织介绍"
-                                v-model.trim="formData.introduction" :autosize="{ minRows:4., maxRows: 10}">
-                            </el-input>
-                        </div>
-                    </el-form-item> -->
-                    <!-- 
-                    <el-form-item label="志愿品牌" prop="brand" label-width="100px" style="display: block">
-                        <div class="item_width_1">
-                            <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.brand"
-                                :autosize="{ minRows:4., maxRows: 10}">
-                            </el-input>
-                        </div>
-                    </el-form-item>
-                    <el-form-item label="品牌展示图" label-width="100px" prop="brandImg">
-                        <template>
-                            <upload-image :defaultFileList="formData.brandImg" :limit="1" @change="onChangeFileList1"
-                                @file-removed="removedImg"></upload-image>
-                        </template>
-                    </el-form-item> -->
                 </el-row></el-form>
         </div>
         <div class="div_btn">
@@ -153,25 +106,25 @@
         </div>
     </div>
 </template>
- 
- <script>
- import { mapGetters } from 'vuex'
+
+<script>
+import { mapGetters } from 'vuex'
 //  import { Loading } from 'element-ui' // 引入Loading服务
- import { requestPost,requestGet } from '@/js/dai/request'
- import Tinymce from '@c/tinymce2/index.vue'
- import daiMap from "@/utils/dai-map";
- import util from '@js/util.js';
- // import UploadImage from './upload-image.vue'
- import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
- 
- var map
- var search
- var markers
- var infoWindowList
- var geocoder // 新建一个正逆地址解析类
- 
-
- export default {
+import { requestPost, requestGet } from '@/js/dai/request'
+import Tinymce from '@c/tinymce2/index.vue'
+import daiMap from "@/utils/dai-map";
+import util from '@js/util.js';
+// import UploadImage from './upload-image.vue'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+
+export default {
     data() {
         return {
             orgOptionProps: {
@@ -182,223 +135,221 @@
                 multiple: false,
                 checkStrictly: true
             },
-          showdisabled:false,
-          searchOptions:[],
-          options:[
-        {
-
-            "children": [
-                {
-                    "pv":"1",
-                    "value": "11",
-                    "label": "托儿所"
-                },
-                {
-                    "pv":"1",
-                    "value": "12",
-                    "label": "幼儿园"
-                },
-                {
-                    "pv":"1",
-                    "value": "13",
-                    "label": "小学"
-                },
-                {
-                    "pv":"1",
-                    "value": "14",
-                    "label": "中学"
-                },
-                {
-                    "pv":"1",
-                    "value": "15",
-                    "label": "培训机构"
-                },
-                {
-                    "pv":"1",
-                    "value": "16",
-                    "label": "其它"
-                }
-            ],
-            "value": "1",
-            "label": "教育培训"
-        },
-        {
-            "children": [
-                {
-                    "pv":"2",
-                    "value": "21",
-                    "label": "门诊"
-                },
-                {
-                    "pv":"2",
-                    "value": "22",
-                    "label": "社区医院"
-                },
-                {
-                    "pv":"2",
-                    "value": "23",
-                    "label": "医院"
-                },
-                {
-                    "pv":"2",
-                    "value": "24",
-                    "label": "其它"
-                }
-            ],
-            "value": "2",
-            "label": "医疗卫生"
-        },
-        {
-            "children": [
-                {
-                    "pv":"3",
-                    "value": "31",
-                    "label": "餐饮"
-                },
-                {
-                    "pv":"3",
-                    "value": "32",
-                    "label": "超市"
-                },
-                {
-                    "pv":"3",
-                    "value": "33",
-                    "label": "理发"
-                },
-                {
-                    "pv":"3",
-                    "value": "34",
-                    "label": "书店"
-                },
-                {
-                    "pv":"3",
-                    "value": "35",
-                    "label": "便利店"
-                },
-                {
-                    "pv":"3",
-                    "value": "36",
-                    "label": "市场"
-                },
+            showdisabled: false,
+            searchOptions: [],
+            options: [
                 {
-                    "pv":"3",
-                    "value": "37",
-                    "label": "五金"
-                },
-                {
-                    "pv":"3",
-                    "value": "38",
-                    "label": "照相"
-                },
-                {
-                    "pv":"3",
-                    "value": "39",
-                    "label": "综合修理"
-                },
-                {
-                    "pv":"3",
-                    "value": "30",
-                    "label": "服务站"
-                },
-                {
-                    "pv":"3",
-                    "value": "330",
-                    "label": "农贸市场"
-                },
-                {
-                    "pv":"3",
-                    "value": "331",
-                    "label": "其它"
-                }
-            ],
-            "value": "3",
-            "label": "商业服务"
-        },
-        {
-            "children": [
-                 {
-                    "pv":"4",
-                    "value": "41",
-                    "label": "电影院"
-                },
-                {
-                    "pv":"4",
-                    "value": "42",
-                    "label": "歌剧院"
-                },
-                {
-                    "pv":"4",
-                    "value": "43",
-                    "label": "图书馆"
+
+                    "children": [
+                        {
+                            "pv": "1",
+                            "value": "11",
+                            "label": "托儿所"
+                        },
+                        {
+                            "pv": "1",
+                            "value": "12",
+                            "label": "幼儿园"
+                        },
+                        {
+                            "pv": "1",
+                            "value": "13",
+                            "label": "小学"
+                        },
+                        {
+                            "pv": "1",
+                            "value": "14",
+                            "label": "中学"
+                        },
+                        {
+                            "pv": "1",
+                            "value": "15",
+                            "label": "培训机构"
+                        },
+                        {
+                            "pv": "1",
+                            "value": "16",
+                            "label": "其它"
+                        }
+                    ],
+                    "value": "1",
+                    "label": "教育培训"
                 },
                 {
-                    "pv":"4",
-                    "value": "44",
-                    "label": "游泳馆"
+                    "children": [
+                        {
+                            "pv": "2",
+                            "value": "21",
+                            "label": "门诊"
+                        },
+                        {
+                            "pv": "2",
+                            "value": "22",
+                            "label": "社区医院"
+                        },
+                        {
+                            "pv": "2",
+                            "value": "23",
+                            "label": "医院"
+                        },
+                        {
+                            "pv": "2",
+                            "value": "24",
+                            "label": "其它"
+                        }
+                    ],
+                    "value": "2",
+                    "label": "医疗卫生"
                 },
                 {
-                    "pv":"4",
-                    "value": "45",
-                    "label": "活动中心"
+                    "children": [
+                        {
+                            "pv": "3",
+                            "value": "31",
+                            "label": "餐饮"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "32",
+                            "label": "超市"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "33",
+                            "label": "理发"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "34",
+                            "label": "书店"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "35",
+                            "label": "便利店"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "36",
+                            "label": "市场"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "37",
+                            "label": "五金"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "38",
+                            "label": "照相"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "39",
+                            "label": "综合修理"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "30",
+                            "label": "服务站"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "330",
+                            "label": "农贸市场"
+                        },
+                        {
+                            "pv": "3",
+                            "value": "331",
+                            "label": "其它"
+                        }
+                    ],
+                    "value": "3",
+                    "label": "商业服务"
                 },
                 {
-                    "pv":"4",
-                    "value": "46",
-                    "label": "体育馆"
+                    "children": [
+                        {
+                            "pv": "4",
+                            "value": "41",
+                            "label": "电影院"
+                        },
+                        {
+                            "pv": "4",
+                            "value": "42",
+                            "label": "歌剧院"
+                        },
+                        {
+                            "pv": "4",
+                            "value": "43",
+                            "label": "图书馆"
+                        },
+                        {
+                            "pv": "4",
+                            "value": "44",
+                            "label": "游泳馆"
+                        },
+                        {
+                            "pv": "4",
+                            "value": "45",
+                            "label": "活动中心"
+                        },
+                        {
+                            "pv": "4",
+                            "value": "46",
+                            "label": "体育馆"
+                        },
+                        {
+                            "pv": "4",
+                            "value": "47",
+                            "label": "其它"
+                        }
+                    ],
+                    "value": "4",
+                    "label": "文化体育"
                 },
                 {
-                    "pv":"4",
-                    "value": "47",
+                    "value": "5",
                     "label": "其它"
                 }
             ],
-            "value": "4",
-            "label": "文化体育"
-        },
-        {
-            "value": "5",
-            "label": "其它"
-        }
-    ],
-            fileList:[],
-            searchValue:"",
-            OrganizationaltypeList:[],
-            ServicetypeListName:[],
-            Organizationaltype:[
+            fileList: [],
+            searchValue: "",
+            OrganizationaltypeList: [],
+            ServicetypeListName: [],
+            Organizationaltype: [
                 { label: "社区", value: 1 },
                 { label: "企业", value: 2 },
                 { label: "学校", value: 3 },
             ],
-            tableDate:{},
-            formData:    
-                {
-              agencyName:"",
-              linkman: "",
-              linkPhone: "",
-              workTime: "",
-              type: "",
-              tags1: [
-                {}
-              ],
-              tags:"",//标签
-              agencyId: this.$store.state.user.agencyId,
-              address: "",//地址
-              longitude: this.$store.state.user.longitude, //经度
-              latitude: this.$store.state.user.latitude,//纬度
-                },
+            tableDate: {},
+            tags1: [],
+            formData:
+            {
+                agencyName: "",
+                linkman: "",
+                linkPhone: "",
+                workTime: "",
+                type: "",
+                tags: "",//标签
+                agencyId: this.$store.state.user.agencyId,
+                address: "",//地址
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude,//纬度
+            },
             corganizerList: [],
             uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
             customerId: localStorage.getItem('customerId'),
- 
+
         }
-        
+
     },
- 
+
     components: { Tinymce, UploadImage },
     mounted() {
-       this.formData.agencyId=this.$store.state.user.agencyId
-       this.formData.agencyName=this.$store.state.user.agencyName
-       let { latitude, longitude } = this.$store.state.user;
+        this.formData.agencyId = this.$store.state.user.agencyId
+        this.formData.agencyName = this.$store.state.user.agencyName
+        let { latitude, longitude } = this.$store.state.user;
         if (!latitude || latitude == "" || latitude == "0") {
             latitude = 39.9088810666821;
             longitude = 116.39743841556731;
@@ -406,105 +357,77 @@
         this.formData.latitude = latitude;
         this.formData.longitude = longitude;
         this.activityType()
-        this.listServerOrg()
- 
+
     },
- 
+
     methods: {
-      //父组件传的
-      async initForm(type, unitId) {
-        console.log(type, unitId,"i就理解哦i");
-        if(type=="info"){
-          this.showdisabled=true
-        }
-        if (type=="edit") {
-              this.getTableDetail(unitId)
-          }
-      // await this.getDemandOptions()
-      // console.log(this.demandOptions);
-      // let { latitude, longitude } = this.$store.state.user;
-
-      // this.formType = type;
-      // if (unitId) {
-      //   this.unitId = unitId;
-      //   this.formData.id = unitId;
-      //   await this.loadFormData();
-      // } else {
-      //   this.formData.latitude = latitude;
-      //   this.formData.longitude = longitude;
-      // }
-
-      // // if (!map) {
-      // this.initMap(this.formData.latitude, this.formData.longitude);
-      // // }
-
-      // this.endLoading();
-    },
-    //获取类型
-    handleChangeAgency(val) {
+        //父组件传的
+        async initForm(type, unitId) {
+            if (type == "info") {
+                this.showdisabled = true
+            }
+            this.$nextTick(() => {
+                 let { latitude, longitude } = this.$store.state.user;
+                  this.formData.latitude = latitude;
+                  this.formData.longitude = longitude;
+                if (!map) {
+                    this.initMap(this.formData.latitude, this.formData.longitude);
+                    map.setMarker(this.formData.latitude, this.formData.longitude);
+                } else {
+                    map.setCenter(this.formData.latitude, this.formData.longitude);
+                    map.setMarker(this.formData.latitude, this.formData.longitude);
+                }
+            })
+            if (type == "edit") {
+                await this.getTableDetail(unitId)
+            }
+            if (type == "add") {
+                  this.tags1.push({tag:''})
+            }
+        },
+        //获取类型
+        handleChangeAgency(val) {
             console.log(val);
             this.formData.type = val
-       },
-          //获取详情
-          getTableDetail(id) {
-          console.log(id,"dskljfksdljf");
+        },
+        //获取详情
+        async getTableDetail(id) {
           let url = `/voluntary/sphereLife/detail/${id}`;
-          console.log(url,"url");
-            requestGet(url).then((res) => {
-              if (res.code == 0) {
+          const res =  await requestGet(url)
+          if (res.code == 0) {
                   this.formData = res.data
                   this.fileList=[{fileUrl:res.data.attrs[0].url}]
                   this.searchValue=res.data.address
-                  this.formData.tags1=res.data.tags.split(',').map(item => ({ tab: item.trim() }));
-              } else {
+                  this.fileList1=[{fileUrl:res.data.couponUrl}]
+                  this.tags1=res.data.tags.split(',').map(item => ({ tag: item.trim() }));
+                  map.setCenter(this.formData.latitude, this.formData.longitude);
+                  map.setMarker(this.formData.latitude, this.formData.longitude);
+          } else {
                   this.$message.error(res.msg)
-              }
-          })
-           
+          }
           
       },
-      //添加标签
-      addDomain() {
-
-        
-        if (this.formData.tags1.length < 4) {
-            this.formData.tags1.push({tab: '' });
-        
-        }else{
-          this.$message.error("最多添加4个标签");
-        }
-   
-      },
-      //删除动态
-      removeDomain(item) {
-        console.log(item);
-        this.formData.tags1.splice(item, 1);
-        // var index = this.formData.sponsors.indexOf(item)
-        // if (index !== -1) {
-        //   this.formData.sponsors.splice(index, 1)
-        //   this.tableDate = {}
-        // }
-      },
-        validateContent() {
-      // 使用正则表达式去除HTML标签后检查内容
-      const textContent = this.stripHtml(this.formData.sumUp);
-      if (textContent.trim() === '') {
-        this.formData.sumUp = null;
-      }
-    },
-    stripHtml(html) {
-      const div = document.createElement('div');
-      div.innerHTML = html;
-      return div.textContent || div.innerText || '';
-    },
- 
- 
+        //添加标签
+        addDomain() {
+            if (this.tags1.length < 4) {
+                this.tags1.push({ tab: '' });
+            } else {
+                this.$message.error("最多添加4个标签");
+            }
+
+        },
+        //删除动态
+        removeDomain(item) {
+            console.log(item);
+            this.tags1.splice(item, 1);
+        },
+    
         async activityType() {
 
             this.$nextTick(() => {
                 if (!map) {
                     this.initMap(this.formData.latitude, this.formData.longitude);
-                    console.log("map", map,this.formData.latitude, this.formData.longitude)
+                    console.log("map", map, this.formData.latitude, this.formData.longitude)
                 } else {
                     map.setCenter(this.formData.latitude, this.formData.longitude);
                     map.setMarker(this.formData.latitude, this.formData.longitude);
@@ -512,154 +435,92 @@
                 }
             })
         },
- 
-        handleOnlineRegistration(value) {
-            // 
-            if (value) {
-                this.online = true;
-                this.formData.online = 1;
+        onChangeFileList(e) {
+            this.fileList = e.length > 0 ? e.map(item => ({
+                fileType: '0',
+                type: 'image',
+                fileType: '0',
+                name: item.response.data.fileName,
+                fileUrl: item.response.data.url,
+                format: item.response.data.fileName.split('.').pop(),
+                url: item.response.data.url
+            })) : []; // 当e为空时清空fileList
+            if (e.length > 0) {
+                console.log(this.fileList, "this.fileList");
+                this.formData.attrs = this.fileList;
+                console.log(this.formData.attrs, "this.fileList");
+
             } else {
-                this.online = false;
-                this.formData.cutOffTime = ''
-                this.formData.online = 0;
+                this.formData.coverPic = '';
             }
         },
-        onChangeFileList(e) {
-              console.log(e, 'sssssb');
-              this.fileList = e.length > 0 ? e.map(item => ({
-                  fileType: '0',
-                  type:'image',
-                  fileType: '0',
-                  name:item.response.data.fileName,
-                  fileUrl: item.response.data.url,
-                  format: item.response.data.fileName.split('.').pop(),
-                  url: item.response.data.url
-              })) : []; // 当e为空时清空fileList
-              if (e.length > 0) {
-                  console.log(this.fileList,"this.fileList");
-                  this.formData.attrs=this.fileList;
-                 console.log(this.formData.attrs,"this.fileList");
-                
-              } else {
-                  this.formData.coverPic = '';
-              }
-          },
         removedImg() {
             this.formData.coverPic = ''
         },
 
 
-        onChangeImgs(e, rowIndex = 0) {
-            console.log('onChangeFileList', e)
-            if (e.length > 0) {
-                this.activityImgs = []
-                e.forEach(item => {
-                    let ob = {
-                        fileType: '0',
-                        fileUrl: item.response.data.url
-                    }
-                    this.activityImgs.push(ob)
-                })
+
+        async handleComfirm() {
+            if (this.tags1) {
+                let one = this.tags1.map(item => item.tag).join(', ')
+                this.formData.tags = one;
+                console.log(this.formData, "this.formData");
             }
-        },
- 
-
-   
-        handleTimeChange(time) {
-            if (time) {
-                const startTimeArray = util.dateFormatter(time[0], 'time').split('-')
-                console.log(startTimeArray);
-                const endTimeArray = util.dateFormatter(time[1], 'time').split('-')
-                console.log(endTimeArray);
-                this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] 
-                this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] 
-                // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
-                // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
-            } else {
-                this.formData.startTime = ''
-                this.formData.endTime = ''
+
+
+            //  console.log(this.formData.tags.map(item => item.tab).join(', '),"     this.formData");
+            if (!this.formData.type) {
+                this.$message.error('请选择类型');
+                return;
             }
- 
-        },
-     
-   
-        async handleComfirm() {
-            if (this.formData.tags1) {
-                let one=this.formData.tags1.map(item => item.tab).join(', ')
-                this.formData.tags=one;
-                console.log(this.formData,"this.formData");   
+            if (!this.formData.name) {
+                this.$message.error('请输入组织介绍');
+                return;
             }
 
-           
-        //  console.log(this.formData.tags.map(item => item.tab).join(', '),"     this.formData");
-           if (!this.formData.type) {
-              this.$message.error('请选择类型');
-              return;
-           }
-           if (!this.formData.name) {
-              this.$message.error('请输入组织介绍');
-              return;
-           }
- 
-           if (this.formData.attrs.length === 0) {
-              this.$message.error('请上传封面图片');
-              return;
-           }
-
-           if (!this.formData.linkPhone) {
-              this.$message.error('请输入联系电话');
-              return;
-           }
- 
-           if (!this.formData.linkman) {
-              this.$message.error('请输入联系人');
-              return;
-           }
- 
-          //  if (this.formData.tabs.length === 0) {
-          //     this.$message.error('请输入标签');
-          //     return;
-          //  }
- 
-          //  if (!this.formData.serviceTypeList) {
-          //     this.$message.error('请输入服务类型');
-          //     return;
-          //  }
-           console.log(this.formData,"this.formData");
-           this.addActivity()
+            if (this.formData.attrs.length === 0) {
+                this.$message.error('请上传封面图片');
+                return;
+            }
+
+            if (!this.formData.linkPhone) {
+                this.$message.error('请输入联系电话');
+                return;
+            }
+
+            if (!this.formData.linkman) {
+                this.$message.error('请输入联系人');
+                return;
+            }
+            console.log(this.formData, "this.formData");
+            this.addActivity()
         },
         //增加
         async addActivity() {
-      
-                let url = '/voluntary/sphereLife/saveOrUpdate'
-                const { data, code, msg } = await requestPost(url, this.formData)
-                if (code === 0) {
-                    this.$message({
-                        type: 'success',
-                        message: '操作成功'
-                    })
-                 //    this.resetData()
-                    this.$emit('showAddClose')
-                    this.btnDisable = false
-                } else {
-                    this.btnDisable = false
-                    this.$message.error(msg)
-                }
-            
-            
- 
- 
+
+            let url = '/voluntary/sphereLife/saveOrUpdate'
+            const { data, code, msg } = await requestPost(url, this.formData)
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                })
+                //    this.resetData()
+                this.$emit('showAddClose')
+                this.btnDisable = false
+            } else {
+                this.btnDisable = false
+                this.$message.error(msg)
+            }
         },
- 
+
         handleCancle() {
-             console.log("sdlkfjklsdf ");
             this.$emit('showAddClose')
- 
         },
- 
+
         // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
         initMap(latitude, longitude) {
-            console.log(latitude, longitude,"564564568");
+            console.log(latitude, longitude, "564564568");
             map = new daiMap(
                 document.getElementById("app_activity"),
                 { latitude, longitude },
@@ -668,8 +529,8 @@
                     pitch: 43.5, // 设置俯仰角
                     rotation: 45, // 设置地图旋转角度
                 }
-            );           
- 
+            );
+
             // 监听地图平移结束
             /*  map.on("dragend", (e) => {
                 this.handleMoveCenter(e);
@@ -677,13 +538,13 @@
             map.on("click", (e) => {
                 this.handleMoveCenter(e);
             });
- 
+
             map.setCenter(latitude, longitude);
             map.setMarker(latitude, longitude);
- 
+
         },
- 
- 
+
+
         async handleMoveCenter(e) {
             //修改地图中心点
             // const { lat, lng } = map.getCenter();
@@ -691,37 +552,37 @@
             this.formData.latitude = lat;
             this.formData.longitude = lng;
             map.setMarker(lat, lng);
- 
+
             let { msg, data } = await map.getAddress(lat, lng);
             if (msg == "success") {
                 this.formData.address = data.address;
-                this.searchValue=data.address
-                console.log(this.formData.address," this.formData.address ");
-                
+                this.searchValue = data.address
+                console.log(this.formData.address, " this.formData.address ");
+
                 this.searchValue = data.address
                 this.searchOptions = []
                 // console.log('data,this.searchValue ', this.searchValue)
- 
+
             }
         },
- 
+
         async remoteMethod(query) {
             console.log(query, "sfsvsdv");
             if (query !== '') {
                 const { msg, data } = await map.searchNearby(query);
-                console.log(data,"sdl;kjfklsjfkld");
-                
+                console.log(data, "sdl;kjfklsjfkld");
+
                 this.resultList = []
- 
+
                 if (msg == "success" && data.resultList && data.resultList.length > 0) {
                     if (data.resultList && data.resultList.length > 0) {
                         this.resultList = data.resultList
                         console.log(this.resultList, "this.resultList");
                         this.searchOptions = this.resultList.map(item => {
                             return { value: `${item.id}`, label: `${item.address + item.title}` };
- 
+
                         });
-                        
+
                         console.log(this.searchOptions, "this.searchOptions");
                     }
                 } else {
@@ -736,7 +597,7 @@
                 this.searchOptions = [];
             }
         },
- 
+
         handleClickKey(index) {
             let selPosition = this.resultList[index]
             let lonlat = selPosition.lonlat.split(" ")
@@ -747,11 +608,7 @@
             this.formData.address = selPosition.address + selPosition.name
             this.searchValue = selPosition.address + selPosition.name
             console.log(this.formData.latitude, this.formData.longitude, "this.formData.latitude, this.formData.longitude");
-            
         },
- 
-
-
     },
     computed: {
         dataRule() {
@@ -764,7 +621,6 @@
                 ],
                 searchValue: [
                     { required: true, message: '请选择地址', trigger: 'blur' },
-                   
                 ],
                 linkPhone: [
                     { required: true, message: '联系电话不能为空', trigger: 'blur' },
@@ -781,65 +637,63 @@
                 ]
             }
         },
- 
+
     },
     props: {
- 
- 
- 
     },
-    destroyed () {
-     map = null
-   }
- }
- </script>
- 
- 
- <style lang="scss" scoped>
- @import "@/assets/scss/modules/visual/communityManageForm.scss";
- </style>
- <style lang="scss" scoped>
- .item_width_1 {
+    destroyed() {
+        map = null
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style lang="scss" scoped>
+.item_width_1 {
     width: 634px;
- 
+
     /deep/.tox .tox-dialog {
         z-index: 20000;
     }
- }
- .u-item-width-normal{
+}
+
+.u-item-width-normal {
     width: 222px;
- }
- 
- .tinymce_view {
+}
+
+.tinymce_view {
     ::v-deep .tox .tox-dialog {
         z-index: 2000000000;
     }
- }
- 
- .div_map {
+}
+
+.div_map {
     position: relative;
- }
- 
- .div_searchmap {
+}
+
+.div_searchmap {
     z-index: 5000;
     position: absolute;
     top: 5px;
     left: 5px;
- }
- 
- .tinymce_view {
+}
+
+.tinymce_view {
     height: 400px;
     overflow: auto;
- }
- 
- .text_p {
+}
+
+.text_p {
     margin: 0;
     padding: 0 10px;
     border: 1px solid #d9d9d9;
     border-radius: 5px;
- 
+
     >p {
         margin: 0;
     }
- }
- </style>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/volunteer/LifeCircleManagement/index.vue b/src/views/modules/volunteer/LifeCircleManagement/index.vue
index 13ac8dd02..185b46eec 100644
--- a/src/views/modules/volunteer/LifeCircleManagement/index.vue
+++ b/src/views/modules/volunteer/LifeCircleManagement/index.vue
@@ -87,7 +87,7 @@
       </el-dialog>
       <el-dialog :visible.sync="showInfo" :close-on-click-modal="false" :close-on-press-escape="false" title="查看"
         width="850px" top="10vh" class="dialog-h" @closed="showInfoClose">
-        <info ref="ref_form" v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
+        <info ref="ref_form_info" v-if="showInfo" :VolunteerList="fmData" @showInfoClose="showInfoClose" />
       </el-dialog>
 
 
@@ -400,7 +400,7 @@ export default {
             this.showAdd=true
             this.formTitle="新增"
             this.$nextTick(() => {
-        this.$refs.ref_form.initForm("add", null);
+            this.$refs.ref_form.initForm("add", null);
       });
             // this.$refs.ref_form.initForm("add", null);
         },
@@ -421,7 +421,7 @@ export default {
             this.showInfo=true
             this.formTitle="查看"
             this.$nextTick(() => {
-        this.$refs.ref_form.initForm("info", row.id);
+        this.$refs.ref_form_info.initForm("info", row.id);
       });