diff --git a/src/views/modules/communityParty/promotion/components/eventDetails.vue b/src/views/modules/communityParty/promotion/components/eventDetails.vue
new file mode 100644
index 000000000..0dc5f9bcc
--- /dev/null
+++ b/src/views/modules/communityParty/promotion/components/eventDetails.vue
@@ -0,0 +1,278 @@
+<template>
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <div v-if="initLoading" class="m-detail-main">
+                <div class="m-info">
+                    <div style="display: flex;">
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">活动类型: </span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.typeName || "--" }}</span>
+                        </div>
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">活动名称: </span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.activityName || "--" }}</span>
+                        </div>
+                    </div>
+                    <div style="display: flex;">
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">活动时间: </span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.startTime || "--" }}至<span>{{ formData.endTime || "--" }}</span></span>
+                        </div>
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">协办方: </span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.assistingParty || "--" }}</span>
+                        </div>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动内容: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <!-- <span>{{ formData.content || "--" }}</span> -->
+                        <p class="text_p" v-html="formData.content"></p>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2">活动地点: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <span>{{ formData.address || "--" }}</span>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2"></span>
+                        <div class="div_map">
+                            <div id="app_detail_unit"></div>
+                        </div>
+                    </div>
+                    <div class="m-info-prop">
+                        <span class="u-info-title-2">线上报名: </span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <el-switch :value="formData.online === 1 ? true : false" :disabled="true"></el-switch>
+                    </div>
+                    <div style="display: flex;">
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">报名截止时间：</span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.cutOffTime || "--" }}</span>
+                        </div>
+                        <div class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">活动积分：</span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.points || "--" }}</span>
+                        </div>
+                    </div>
+                    <div style="display: flex;" v-if="formData.online==0 && formData.status==2">
+                        <div  class="m-info-prop" style="flex: 0 0 50%;">
+                            <span class="u-info-title-2">活动人数: </span>
+                            <span style="margin-right: 10px;">&nbsp;</span>
+                            <span>{{ formData.participants || "--" }}</span>
+                        </div>
+                    </div>
+                    <!-- 总结 -->
+                    <div class="m-info-prop" v-if="formData.status!==0&&formData.status!==1&&formData.status!==3">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动总结：</span>
+                        <span style="margin-right: 10px;">&nbsp;</span>
+                        <!-- <span>{{ formData.sumUp || "--" }}</span> -->
+                        <p class="text_p" v-html="formData.sumUp"></p>
+                    </div>
+                        <!-- 活动图片 -->
+                    <div v-if="formData.status!==0&&formData.status!==1&&formData.status!==3" class="m-info-prop" style="display: flex; flex-wrap: wrap; align-items: flex-start;">
+                        <span class="u-info-title-2" style="display: inline-block;white-space: nowrap;">活动图片：</span>
+                        <div v-for="(image, index) in formData.activityImgs" :key="index">
+                            <img style="width: 200px; height: 160px; margin-right: 30px;margin-bottom: 10px;"
+                                :src="image" alt="Image" />
+                        </div>
+                    </div>
+                       <!-- 报名名单 -->
+                    <div v-if="formData.status!==0 && formData.online == 1" style="margin-top: 20px;">
+                        <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
+                            报名名单
+                        </div>
+                        <el-table class="table" border style="width: 100%" :data="NameList">
+                            <el-table-column label="序号" header-align="center" align="center" type="index"
+                                width="50"></el-table-column>
+                            <el-table-column prop="name" header-align="center" align="center" label="姓名"
+                                min-width="80">
+                            </el-table-column>
+                            <el-table-column prop="mobile" header-align="center" align="center" label="联系电话"
+                                min-width="100">
+                            </el-table-column>
+                            <el-table-column prop="createdTime" header-align="center" align="center" label="报名时间"
+                                min-width="80">
+                            </el-table-column>
+                            <el-table-column prop="remark" header-align="center" align="center"
+                                label="备注说明" show-overflow-tooltip min-width="120">
+                            </el-table-column>
+                            <el-table-column prop="signFlag" header-align="center" align="center" label="签到" width="80">
+                            </el-table-column>
+                            <el-table-column prop="address" header-align="center" align="center" label="签到地点"
+                                width="120">
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                    <div>
+                    <el-pagination v-if="formData.status!==0 && formData.online == 1"  @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNo"
+                     :page-sizes="[5, 10, 20]" :page-size="pageSize" layout="sizes, prev, pager, next, total" :total="total">
+                    </el-pagination>
+                    </div>
+                         <!-- 活动实况 -->
+                    <div style="margin-top: 20px;" v-if="formData.status!==0&&formData.online==1">
+                        <div style="font-size: 15px; color: black; margin-left: -30px; margin-bottom: 10px;">
+                            活动实况
+                        </div>
+                        <el-table class="table" border style="width: 100%" :data="actList">
+                            <el-table-column label="序号" header-align="center" align="center" type="index"
+                                width="50"></el-table-column>
+                            <el-table-column prop="nickname" header-align="center" align="center" label="姓名"
+                                min-width="100">
+                            </el-table-column>
+                            <el-table-column prop="createdTime" header-align="center" align="center" label="联系电话"
+                                min-width="80">
+                            </el-table-column>
+                            <el-table-column prop="desc" header-align="center" align="center" label="实况内容"
+                                min-width="280">
+                            </el-table-column>
+                            <el-table-column prop="images" header-align="center" align="center"
+                                label="活动照片" show-overflow-tooltip min-width="120">
+                                <template slot-scope="scope">
+                                    <div v-for="(item, index) in scope.row.images" :key="index"
+                                        style="display: flex;">
+                                        <img :src="item.url"
+                                            style="max-width: 20px; max-height: 20px; margin-right: 10px;" />
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="m-detail-btn">
+            <el-button size="small" @click="handleCancle">关 闭</el-button>
+        </div>
+    </div>
+</template>
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import nextTick from "dai-js/tools/nextTick";
+import daiMap from "@/utils/dai-map";
+import { requestPost,requestGet } from "@/js/dai/request";
+var map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+let loading; // 加载动画
+export default {
+    data() {
+        return {
+            formData: {},
+            initLoading: false,
+            NameList:[],
+            actList:[],
+            activityId:"",
+            pageSize: 5,
+            pageNo: 1,
+            total:0
+        };
+    },
+    components: {},
+    created() { 
+    },
+    mounted () {
+    },
+    methods: {
+        handleCurrentChange (val) {
+        this.pageNo = val
+        // this.loadTable()
+        this.communityActivityApplicationRecord()
+      },
+        handleSizeChange (val) {
+        this.pageSize = val
+        this.pageNo = 1
+        // this.loadTable()
+        this.communityActivityApplicationRecord()
+         },
+        async communityActivityApplicationRecord () {
+        const url = "/actual/base/communityActivityApplicationRecord/page"
+        let params = {
+          pageSize: this.pageSize,
+          pageNo: this.pageNo,
+          activityId:this.activityId
+        }
+        const { data, code, msg } = await requestGet(url, params)
+        if (code === 0) {
+          this.NameList=data.list
+        } else {
+          this.$message.error(msg)
+        }
+      },
+      async livereclist () {
+        const url = "/heart/resi/act/livereclist"
+        let params = {
+          pageSize: 20,
+          pageNo: 1,
+          actId:this.formData.id
+        }
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          this.actList=data.actLives
+        } else {
+          this.$message.error(msg)
+        }
+      },
+        handleCancle() {
+            this.diaDestroy();
+            this.$emit("diaDetailClose");
+        },
+        diaDestroy() {
+            if (map) {
+                // map.destroy()
+            }
+        },
+        async initForm(row) {
+            this.startLoading();
+            this.formData = JSON.parse(JSON.stringify(row));
+            this.activityId=this.formData.id
+            this.initLoading = true;
+            let { latitude, longitude } = this.$store.state.user;
+            console.log("lat" + latitude + ",lon" + longitude);
+            if (this.formData.latitude && this.formData.longitude) {
+                latitude = this.formData.latitude;
+                longitude = this.formData.longitude;
+            }
+            if (!latitude || latitude == "" || latitude == "0") {
+                latitude = 39.9088810666821;
+                longitude = 116.39743841556731;
+            }
+            this.endLoading();
+            this.communityActivityApplicationRecord()
+            this.livereclist()
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
+    },
+    computed: {},
+    props: {},
+};
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/detail-main.scss";
+// span {
+//     white-space: nowrap; /* 避免换行 */
+// }
+</style>
+<style scoped></style>
diff --git a/src/views/modules/communityParty/promotion/components/initiateActivity.vue b/src/views/modules/communityParty/promotion/components/initiateActivity.vue
new file mode 100644
index 000000000..f22211a28
--- /dev/null
+++ b/src/views/modules/communityParty/promotion/components/initiateActivity.vue
@@ -0,0 +1,881 @@
+<template>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" :disabled="formType === 'detail'"
+                class="form">
+                <div v-if="summary">
+                    <el-form-item label="活动类型" label-width="150px" prop="typeId">
+                        <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
+                            <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName"
+                                :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="活动名称" prop="activityName" label-width="150px">
+                        <el-input v-model.trim="formData.activityName" size="small" clearable placeholder="请输入活动名称"
+                            class="u-item-width-normal"></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="活动时间" prop="startTime" label-width="130px">
+                        <!-- <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
+                            value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至"
+                            start-placeholder="开始时间" end-placeholder="结束时间">
+                        </el-date-picker> -->
+                        <el-date-picker v-model.trim="timeRange" type="datetimerange" range-separator="至"
+                            start-placeholder="开始日期" end-placeholder="结束日期" @change="handleTimeChange">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <!-- <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                    <el-cascader v-model.trim="formData.assistingParty" :options="corganizerList"
+                        :props="{ label: 'label', value: 'name'}" clearable collapse-tags size="small"
+                        class="u-item-width-normal"></el-cascader>
+                </el-form-item> -->
+                    <el-form-item label="协办方" prop="assistingParty" label-width="150px">
+                        <el-select class="u-item-width-normal" v-model.trim="formData.assistingParty" placeholder="请选择"
+                            clearable>
+                            <el-option v-for="item in corganizerList" :key="item.id" :label="item.label"
+                                :value="item.name" class="u-item-width-normal">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="活动封面图" label-width="140px" prop="coverPic">
+                        <template>
+                            <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
+                                @file-removed="removedImg"></upload-image>
+                        </template>
+                    </el-form-item>
+
+                    <el-form-item label="活动内容" prop="content" label-width="150px" style="display: block">
+                        <div class="item_width_1">
+                            <Tinymce class="tinymce_view " v-model.trim="formData.content" :height="250"
+                                placeholder="请输入活动内容"  />
+                            <!-- <Tinymce class="tinymce_view " v-if="formType != 'detail'" v-model.trim="formData.content"
+                            :height="250" placeholder="请输入活动内容" /> -->
+                            <!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.content">
+                        </el-input> -->
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item label="活动地点" prop="address" label-width="150px" style="display: block">
+                        <div style="width: 500px">
+                            <el-select v-model.trim="searchValue" filterable style="width: 500px" remote
+                                :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                                :loading="loading">
+                                <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                    :key="item.value || index" :label="item.label" :value="item.value">
+                                </el-option>
+                            </el-select>
+                            <div id="app_activity" class="div_map"></div>
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item v-if="formType!=='records'" label="线上报名" style="display: block" prop="peopleCount" label-width="150px">
+                        <el-switch v-model="online" @change="handleOnlineRegistration"></el-switch>
+                    </el-form-item>
+                </div>
+
+                <div v-if="records">
+                    <div v-if="!online">
+                        <el-form-item label="活动人数" label-width="140px">
+                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" 
+                            label="描述文字"></el-input-number>
+                        </el-form-item>
+                        <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
+                            <div class="item_width_1">
+                                <!-- <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
+                                </el-input> -->
+                                <Tinymce class="tinymce_view " v-model.trim="formData.sumUp" :height="250"
+                                    placeholder="请输入活动总结"  @input="validateContent"/>
+                            </div>
+                        </el-form-item>
+
+                        <!-- <el-form-item label="活动照片" label-width="140px">
+                            <template>
+                                <upload-image :defaultFileList="activityImgs" :limit="6"
+                                    @change="onChangeImgs"></upload-image>
+                            </template>
+                        </el-form-item> -->
+
+                        <el-form-item label="活动照片" label-width="140px" prop="activityImgs">
+                            <div>
+                                <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                                    :data="{ customerId: customerId }" :show-file-list="true"
+                                    :file-list="formData.activityImgs" :on-preview="handleImgPreview"
+                                    :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                                    :on-exceed="handleImgExceed" :before-upload="beforeImgUpload"
+                                    list-type="picture-card" :limit="3">
+                                    <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
+                            </div>
+                            <!-- <div>
+                                <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
+                                    <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img" alt="照片"
+                                        style="width: 150px; margin-right: 10px;">
+                                </div>
+                                <div v-else>
+                                    暂无照片
+                                </div>
+                            </div> -->
+                        </el-form-item>
+                    </div>
+                </div>
+
+                <div v-if="online">
+                    <el-form-item label="报名截止时间" label-width="140px" prop="cutOffTime">
+                        <el-date-picker v-model.trim="formData.cutOffTime"  type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                        format="yyyy-MM-dd HH:mm:ss" placeholder="选择报名截止时间" style="width:280px">
+                        </el-date-picker>
+                    </el-form-item>
+
+                    <el-form-item label="活动积分" label-width="140px" prop="points">
+                        <el-input-number v-model="formData.points" @change="handleChange" :min="1" :max="10"
+                            label="描述文字"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="活动人数" label-width="140px">
+                        <el-input-number v-model="formData.participants" @change="handleChange" :min="1" 
+                            label="描述文字"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="消息推送" label-width="140px">
+                        <el-checkbox-group v-model="formData.sendMessage">
+                            <el-checkbox label="是否通过公众号推送给社区居民"></el-checkbox>
+                        </el-checkbox-group>
+                    </el-form-item>
+                </div>
+            </el-form>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" v-if="formType != 'detail'" type="primary" :disabled="btnDisable"
+                @click="handleComfirm">确 定</el-button>
+               
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } 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 // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+    data() {
+        let initFormData = () => {
+            let _form = {
+                id: "",
+                typeId: "",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 0,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude,//纬度
+            }
+
+            return _form
+        }
+        return {
+            fileList: [],//封面图片
+            activityImgs: [],//活动照片
+            formType: 'add', //表单操作类型 add新增，edit编辑,records记录
+            records: false,
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            num: 0,
+            loading: false,
+            timeRange: [],
+            online: false,
+            summary: true,
+
+            btnDisable: false,
+
+            keyWords: '',
+            activityId: '',
+            formData: initFormData(),
+            serviceList: [],
+            // gridList: [],
+            agencyId: '',
+
+            demandOptions: [],
+            typeList: [],
+            corganizerList: [],
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
+
+        }
+        
+    },
+
+    components: { Tinymce, UploadImage },
+    mounted() {
+        this.activityType()
+        this.listServerOrg()
+    },
+
+    methods: {
+        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 || '';
+    },
+
+        // 上传成功
+        handleImgSuccess(res, file, fileList) {
+            if (res.code === 0 && res.msg === 'success') {
+                let format = file.name.split('.').pop();
+                let srcType = file.raw.type;
+                let type = 'file';
+                if (srcType.indexOf('image') != -1) {
+                    type = 'image';
+                } else if (srcType.indexOf('video') != -1) {
+                    type = 'video';
+                }
+                // this.formData.activityImgs.push({
+                //     format,
+                //     name: file.name,
+                //     size: file.size,
+                //     type,
+                //     url: res.data.url
+                // });
+                // console.log('this.formData.activityImgs',res.data.url)
+                this.formData.activityImgs.push(res.data.url);
+
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        // 删除图片
+        handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
+                this.formData.activityImgs.splice(index, 1);
+            } else if (file.url) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
+                this.formData.activityImgs.splice(index, 1);
+            }
+        },
+        // 图片预览
+        handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
+        // 文件数量超过限制
+        handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过三个'
+            });
+        },
+        // 上传前的验证
+        beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+            const format = file.name.split('.').pop();
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+                return false;
+            }
+            if (srcType.indexOf('image') == -1) {
+                this.$message.error('仅限图片格式');
+                return false;
+            }
+            return true;
+        },
+        async listServerOrg() {
+            const url = "/actual/base/serviceitem/listServerOrgNewTask";
+            let params = {
+                serverOrgCategoryCode: "",
+                serverOrgType: "party_unit",
+                serverParentOrgCategoryCode: ""
+            };
+
+            let { data, code, msg } = await requestPost(url, params);
+            if (code == 0) {
+                this.corganizerList = data;
+                // console.log("datadata",this.corganizerList)
+            } else if (code >= 8000) {
+                this.$message.error(msg);
+            }
+        },
+        async activityType() {
+            const url = "/actual/base/activityType/page"
+            let params = {
+                // agencyId: this.agencyId
+                pageSize: 20,
+                pageNo: 1,
+                typeName: "",
+                enabled: ""
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.typeList = data.list
+            } else {
+                this.$message.error(msg)
+            }
+            this.$nextTick(() => {
+                if (!map) {
+                    this.initMap(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);
+                    console.log("mapmapmap", map)
+                }
+            })
+        },
+
+        handleOnlineRegistration(value) {
+            // 
+            if (value) {
+                this.online = true;
+                this.formData.online = 1;
+            } else {
+                this.online = false;
+                this.formData.cutOffTime = ''
+                this.formData.online = 0;
+            }
+        },
+
+        // onChangeFileList(e) {
+        //     if (e.length > 0) {
+        //         let item = e[0];
+        //         let ob = {
+        //             fileType: '0',
+        //             fileUrl: item.response.data.url
+        //         };
+        //         this.fileList = [ob];
+        //         this.formData.coverPic = ob.fileUrl;
+        //     }
+        // },
+        removedImg() {
+            this.formData.coverPic = ''
+        },
+        onChangeFileList(e) {
+            console.log(e, 'sssssb');
+            this.fileList = e.length > 0 ? e.map(item => ({
+                fileType: '0',
+                fileUrl: item.response.data.url
+            })) : []; // 当e为空时清空fileList
+            if (e.length > 0) {
+                this.formData.coverPic = e[0].response.data.url;
+            } else {
+                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)
+                })
+            }
+        },
+
+        // onChangeImgs(e) {
+        //     this.activityImgs = [];
+        //     if (e.length > 0) {
+        //         e.forEach(item => {
+        //             let ob = {
+        //                 fileType: '0',
+        //                 fileUrl: item.response.data.url
+        //             };
+        //             this.activityImgs.push(ob);
+        //         });
+        //         console.log('this.activityImgs',this.activityImgs)
+        //     }
+        // },
+
+        handleChange(value) {},
+        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 = ''
+            }
+
+        },
+        async initForm(type, activityId) {
+            this.startLoading()
+            this.formType = type
+            if (type === 'edit') {
+                if (activityId.activityImgs || activityId.sumUp) {
+                    this.records = true
+                } else {
+                    this.records = false
+                }
+                this.formData = activityId
+                this.timeRange = [this.formData.startTime, this.formData.endTime]
+                console.log(activityId,"activityId");
+                
+                if (activityId.coverPic) {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: activityId.coverPic
+                    };
+                    this.fileList = [ob];
+                    this.formData.coverPic = ob.fileUrl;
+                    if (this.formData.online == 1) {
+                        this.online = true
+                    }
+                }
+            } else if (type === 'records') {
+                this.records = true
+            } else if (type === 'summary') {
+                this.formData = activityId
+                this.formData.activityImgs = []
+                console.log("this.formData", this.formData)
+                this.records = true
+                this.summary = false
+            } else {
+                this.records = false
+            }
+            this.endLoading()
+
+        },
+
+        async getDemandOptions() {
+            this.$http
+                .post("/actual/base/serviceitem/listAllCategory",{})
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg);
+                    } else {
+                        console.log(res.data);
+                        this.demandOptions = this.getFlagData(
+                            this.getTreeData(res.data),
+                            "usableFlag"
+                        );
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error("网络错误");
+                });
+        },
+        getFlagData(data, flag) {
+            if (!Array.isArray(data)) return [];
+            let arr1 = data.filter((item) => item[flag]);
+            let arr2 = arr1.map((item) => {
+                if (item.childCateList)
+                    return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
+                else return item;
+            });
+            return arr2;
+        },
+        getTreeData(data) {
+            if (!Array.isArray(data)) return [];
+            let arr = data.map((item) => {
+                let _item = {};
+                if (item.childCateList) {
+                    if (item.childCateList.length === 0)
+                        _item = { ...item, childCateList: undefined };
+                    else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
+                } else {
+                    _item = { ...item };
+                }
+                return _item;
+            });
+            return arr;
+        },
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption"
+
+            let params = {
+                agencyId: this.agencyId
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.gridList = data
+
+            } else {
+                this.$message.error(msg)
+            }
+
+        },
+
+
+        //加载组织
+        async loadFormData() {
+            const url = '/actual/base/icpartyactivity/detail'
+            // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/detail'
+            let params = {
+                id: this.activityId
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.formData = data
+                let style_img = "style='width:50px;height:40px;' "
+
+                if (this.formData.content) {
+                    // this.formData.content = this.formData.content.replace(/<img/g, "<img style='width:200px;height:120px;'")
+                    // let array=this.formData.content.split('<img')
+                }
+
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        async handleComfirm() {
+            this.btnDisable = true
+            setTimeout(() => {
+                this.btnDisable = false
+            }, 10000)
+            // console.log("data/actual/base/communityActivity/save",this.formData)
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                this.formData.sendMessage = this.formData.sendMessage ? 1 : 0;
+                console.log(this.formData, "2234323424")
+                const dateObj = this.formData.startTime;
+                console.log(dateObj);
+                const formattedDate = dateObj; // 获取日期部分，即 '2424-10-22'
+                if (this.formData.cutOffTime != '' && formattedDate <= this.formData.cutOffTime) {
+                    this.$message.error('报名截止时间要小于活动开始时间')
+                } else if (!valid) {
+                    app.util.validateRule(messageObj)
+                    this.btnDisable = false
+                } else {
+                    this.addActivity()
+                }
+            })
+        },
+        async addActivity() {
+            if (this.formType === 'edit' || this.formType === 'summary') {
+                let url = '/actual/base/communityActivity/update'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            } else {
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            }
+
+
+        },
+
+        handleCancle() {
+
+            this.resetData()
+            this.$emit('dialogCancle')
+
+        },
+
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(latitude, longitude) {
+            console.log(latitude, longitude,"564564568");
+            map = new daiMap(
+                document.getElementById("app_activity"),
+                { latitude, longitude },
+                {
+                    zoom: 16.2, // 设置地图缩放级别
+                    pitch: 43.5, // 设置俯仰角
+                    rotation: 45, // 设置地图旋转角度
+                }
+            );           
+
+            // 监听地图平移结束
+            /*  map.on("dragend", (e) => {
+                this.handleMoveCenter(e);
+              });*/
+            map.on("click", (e) => {
+                this.handleMoveCenter(e);
+            });
+
+            map.setCenter(latitude, longitude);
+            map.setMarker(latitude, longitude);
+
+        },
+
+
+        async handleMoveCenter(e) {
+            //修改地图中心点
+            // const { lat, lng } = map.getCenter();
+            const { lat, lng } = e.latLng;
+            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
+                this.searchOptions = []
+                console.log('data,this.searchValue ', this.searchValue)
+
+            }
+        },
+
+        async remoteMethod(query) {
+            console.log(query, "sfsvsdv");
+            if (query !== '') {
+                this.loading = true;
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                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 {
+                    this.searchOptions = [
+                        {
+                            value: '0',
+                            label: '未检索到结果'
+                        }
+                    ]
+                }
+            } else {
+                this.searchOptions = [];
+            }
+        },
+
+        handleClickKey(index) {
+            let selPosition = this.resultList[index]
+            let lonlat = selPosition.lonlat.split(" ")
+            map.setCenter(lonlat[1], lonlat[0]);
+            map.setMarker(lonlat[1], lonlat[0]);
+            this.formData.latitude = lonlat[1];
+            this.formData.longitude = lonlat[0];
+            this.formData.address = selPosition.address + selPosition.name
+        },
+
+        resetData() {
+            this.timeRange = []
+            this.fileList = []
+            this.searchValue = ''
+            this.searchOptions = []
+            this.resultList = []
+            this.activityId = ''
+            this.keyWords = ''
+            this.online = false
+            this.formType = ''
+            this.summary = true
+            this.formData = {
+                id: "",
+                typeId: "",
+                activityName: "",//活动名称
+                status: 0,//状态
+                assistingParty: "",//协办方
+                startTime: "",//开始时间
+                endTime: "",//结束时间
+                coverPic: "",//封面图片地址
+                content: "",//活动内容
+                address: "",//地址
+                online: 0,//开关
+                cutOffTime: "",//截止时间
+                points: 0,//积分
+                participants: 0,//活动人数
+                sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                longitude: this.$store.state.user.longitude, //经度
+                latitude: this.$store.state.user.latitude//纬度
+                // longitude: null, //经度
+                // latitude: null//纬度
+            }
+            map=""
+            
+
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                activityName: [
+                    { required: true, message: '活动名称不能为空', trigger: 'blur' }
+                ],
+                typeId: [
+                    { required: true, message: '请选择活动类型', trigger: 'blur' }
+                ],
+                startTime: [
+                    { required: true, message: '请选择活动时间', trigger: 'blur' }
+                ],
+                coverPic: [
+                    { required: true, message: '请选择活动封面图', trigger: 'blur' }
+                ],
+                content: [
+                    { required: true, message: '活动内容不能为空', trigger: 'blur' }
+                ],
+                address: [
+                    { required: true, message: '请选择活动地点', trigger: 'blur' }
+                ],
+                longitude: [
+                    { required: true, message: '坐标不能为空', trigger: 'blur' }
+                ],
+                cutOffTime: [
+                    { required: true, message: '请选择报名截止时间', trigger: 'blur' }
+                ],
+                points: [
+                    { required: true, message: '请选择活动积分', trigger: 'blur' }
+                ],
+                sumUp: [
+                    { required: true, message: '请输入活动总结', trigger: 'blur' }
+                ],
+                activityImgs: [
+                    { required: true, message: '请选择活动照片', trigger: 'blur' }
+                ]
+            }
+        },
+
+    },
+    props: {
+
+        // unitList: {
+        //     type: Array,
+        //     default: []
+        // },
+        gridList: {
+            type: Array,
+            default: []
+        },
+
+
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style lang="scss" scoped>
+.item_width_1 {
+    width: 560px;
+
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+}
+
+.tinymce_view {
+    ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+    }
+}
+
+.div_map {
+    position: relative;
+}
+
+.div_searchmap {
+    z-index: 5000;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+}
+
+.tinymce_view {
+    height: 400px;
+    overflow: auto;
+}
+
+.text_p {
+    margin: 0;
+    padding: 0 10px;
+    border: 1px solid #d9d9d9;
+    border-radius: 5px;
+
+    >p {
+        margin: 0;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/communityParty/promotion/components/summDetails.vue b/src/views/modules/communityParty/promotion/components/summDetails.vue
new file mode 100644
index 000000000..09b25d709
--- /dev/null
+++ b/src/views/modules/communityParty/promotion/components/summDetails.vue
@@ -0,0 +1,313 @@
+<template>
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
+                <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
+                    <div class="item_width_1">
+                        <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
+                        </el-input>
+                    </div>
+                </el-form-item>
+                <el-form-item label="活动照片" label-width="140px" prop="activityImgs">
+                    <div>
+                        <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                            :data="{ customerId: customerId }" :show-file-list="true" :file-list="formData.activityImgs"
+                            :on-preview="handleImgPreview" :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                            :on-exceed="handleImgExceed" :before-upload="beforeImgUpload" list-type="picture-card"
+                            :limit="3">
+                            <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
+                    </div>
+                    <div>
+                        <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
+                            <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img" alt="照片"
+                                style="width: 150px; margin-right: 10px;">
+                        </div>
+                        <div v-else>
+                            暂无照片
+                        </div>
+                    </div>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确
+                定</el-button>
+        </div>
+    </div>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } 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 // 新建一个正逆地址解析类
+let loading // 加载动画
+export default {
+    data() {
+        let initFormData = () => {
+            let _form = {
+                id: "",
+                // typeId: "",
+                // activityName: "",//活动名称
+                // status: 0,//状态
+                // assistingParty: "",//协办方
+                // startTime: "",//开始时间
+                // endTime: "",//结束时间
+                // coverPic: "",//封面图片地址
+                // content: "",//活动内容
+                // address: "",//地址
+                // online: 0,//开关
+                // cutOffTime: "",//截止时间
+                // points: 0,//积分
+                // participants: 1,//活动人数
+                // sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                // longitude: this.$store.state.user.longitude, //经度
+                // latitude: this.$store.state.user.latitude,//纬度
+            }
+            return _form
+        }
+        return {
+            activityImgs:[],//活动照片
+            records:false,
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            num: 0,
+            loading: false,
+            timeRange: [],
+            online: false,
+            btnDisable: false,
+            keyWords: '',
+            activityId: '',
+            formData: initFormData(),
+            serviceList: [],
+            // gridList: [],
+            agencyId: '',
+            demandOptions: [],
+            // typeList: [],
+            // corganizerList: [],
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
+        }
+    },
+    components: { Tinymce, UploadImage },
+    mounted() {
+    },
+    methods: {
+        // 上传成功
+        handleImgSuccess(res, file, fileList) {
+            if (res.code === 0 && res.msg === 'success') {
+                let format = file.name.split('.').pop();
+                let srcType = file.raw.type;
+                let type = 'file';
+                if (srcType.indexOf('image') != -1) {
+                    type = 'image';
+                } else if (srcType.indexOf('video') != -1) {
+                    type = 'video';
+                }
+                this.formData.activityImgs.push(res.data.url);
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        // 删除图片
+        handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
+                this.formData.activityImgs.splice(index, 1);
+            } else if (file.url) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
+                this.formData.activityImgs.splice(index, 1);
+            }
+        },
+        // 图片预览
+        handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
+        // 文件数量超过限制
+        handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过三个'
+            });
+        },
+        // 上传前的验证
+        beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+            const format = file.name.split('.').pop();
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+                return false;
+            }
+            if (srcType.indexOf('image') == -1) {
+                this.$message.error('仅限图片格式');
+                return false;
+            }
+            return true;
+        },
+        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)
+                })
+            }
+        },
+        handleChange(value) {
+        },
+        async initForm(type, activityId) {
+            this.startLoading()
+            this.formData.id = type           
+            this.endLoading()
+        },
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption"
+            let params = {
+                agencyId: this.agencyId
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.gridList = data
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        async handleComfirm() {
+            this.btnDisable = true
+            setTimeout(() => {
+                this.btnDisable = false
+            }, 10000)
+            // console.log("data/actual/base/communityActivity/save",this.formData)
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj)
+                    this.btnDisable = false
+                } else{
+                    this.addActivity()
+                }
+            })
+        },
+        async addActivity() {
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+        },
+        handleCancle() {
+            this.resetData()
+            this.$emit('summDetailClose')
+            this.$emit("diaDetailClose");
+        },
+        resetData() {
+            this.formData = {
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+            }
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                sumUp: [
+                    { required: true, message: '请输入活动总结', trigger: 'blur' }
+                ],
+                activityImgs: [
+                    { required: true, message: '请选择活动照片', trigger: 'blur' }
+                ]
+            }
+        },
+    },
+    props: {
+        // unitList: {
+        //     type: Array,
+        //     default: []
+        // },
+        gridList: {
+            type: Array,
+            default: []
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style lang="scss" scoped>
+.item_width_1 {
+    width: 560px;
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+}
+.tinymce_view {
+    ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+    }
+}
+.div_map {
+    position: relative;
+}
+.div_searchmap {
+    z-index: 5000;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+}
+.tinymce_view {
+    height: 400px;
+    overflow: auto;
+}
+.text_p {
+    margin: 0;
+    padding: 0 10px;
+    border: 1px solid #d9d9d9;
+    border-radius: 5px;
+    >p {
+        margin: 0;
+    }
+}
+</style>
\ No newline at end of file