diff --git a/src/views/modules/communityParty/promotion/components/promotionDialog.vue b/src/views/modules/communityParty/promotion/components/promotionDialog.vue
new file mode 100644
index 000000000..59387a9e3
--- /dev/null
+++ b/src/views/modules/communityParty/promotion/components/promotionDialog.vue
@@ -0,0 +1,334 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="title" :close-on-click-modal="false" :close-on-press-escape="false"
+    width="950px" top="5vh" class="dialog-h" :before-close="handleCancel">
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
+        <el-form-item label="党建类型" label-width="150px" prop="tagId">
+          <el-select class="item_width_1" v-model="formData.tagId" placeholder="请选择" clearable>
+            <el-option v-for="item in typeList" :key="item.id" :label="item.tagName" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="标题名称" prop="title" label-width="150px">
+          <el-input v-model.trim="formData.title" size="small" clearable placeholder="请输入活动名称"
+            class="item_width_1"></el-input>
+        </el-form-item>
+
+        <el-form-item label="上传照片" label-width="150px" prop="coverPic">
+          <div class="item_width_1">
+            <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"
+              @file-removed="removedImg"></upload-image>
+          </div>
+        </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="请输入活动内容" />
+          </div>
+        </el-form-item>
+        <el-form-item label="是否置顶" prop="top" label-width="150px" style="display: block">
+          <el-switch v-model="formData.top" :active-value="1" :inactive-value="0"></el-switch>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small" @click="handleCancel" :loading="btnDisable">取 消</el-button>
+      <el-button size="small" type="primary" :loading="btnDisable" @click="handleConfirm">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import _ from 'lodash'
+import dayjs from 'dayjs'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import Tinymce from '@c/tinymce2/index.vue'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+
+const defaultFormData = {
+  id: undefined,
+  title: '',
+  tagId: '',
+  coverPic: '',
+  content: '',
+  top: 0,
+  status: 0,
+  releaseTime: '',
+}
+
+let loading // 加载动画
+export default {
+  components: { Tinymce, UploadImage },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      formData: _.cloneDeep(defaultFormData),
+      fileList: [],//封面图片
+      activityImgs: [],//活动照片
+      loading: false,
+      btnDisable: false,
+      typeList: [],
+      uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+    }
+
+  },
+
+  created() {
+    this.promotionType()
+  },
+
+  methods: {
+    async promotionType() {
+      const url = "/actual/base/advertisingTag/page"
+      let params = {
+        pageSize: 100,
+        pageNo: 1,
+        typeName: "",
+        enabled: 0
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.typeList = data.list
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    // 详情数据
+    async initForm(row) {
+      if (row && row.id) {
+        let url = `/actual/base/partyPublicity/${row.id}`
+        const { data, code, msg } = await requestPost(url)
+        this.formData = data ? data : _.cloneDeep(defaultFormData)
+        if (data && data.coverPic) {
+          this.fileList = [{
+            fileType: '0',
+            fileUrl: data.coverPic
+          }]
+        } else {
+          this.fileList = []
+        }
+
+        // this.startLoading()
+
+        // this.endLoading()
+      } else {
+
+      }
+
+    },
+    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.coverPic = 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;
+    },
+
+    removedImg() {
+      this.formData.coverPic = ''
+    },
+    onChangeFileList(e) {
+      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)
+        })
+      }
+    },
+
+
+    async handleConfirm() {
+      this.$refs['ref_form'].validate(async valid => {
+        if (valid) {
+          this.btnDisable = true
+          let url = this.formData.id ? '/actual/base/partyPublicity/update' : '/actual/base/partyPublicity/save'
+          this.formData.releaseTime = this.formData.releaseTime || dayjs().format("YYYY-MM-DD HH:mm:ss")
+          const { data, code, msg } = await requestPost(url, this.formData)
+          if (code === 0) {
+            this.$message.success(this.formData.id ? '更新成功' : '新增成功')
+            this.resetData()
+            this.$emit('update:visible', false)
+            this.$emit('success')
+          } else {
+            this.$message.error(msg)
+          }
+          this.btnDisable = false
+        }
+      })
+    },
+
+    // 取消
+    handleCancel() {
+      this.resetData()
+      this.$emit('update:visible', false)
+
+    },
+
+    resetData() {
+      this.formData = _.cloneDeep(defaultFormData)
+      this.fileList = []
+      this.$refs['ref_form'].resetFields()
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    dataRule() {
+      return {
+        tagId: [
+          { required: true, message: '请选择活动类型', trigger: 'change' }
+        ],
+        title: [
+          { required: true, message: '请输入标题名称', trigger: 'blur' }
+        ],
+        coverPic: [
+          { required: true, message: '请选择封面图', trigger: 'blur' }
+        ],
+        content: [
+          { required: true, message: '请输入详细内容', trigger: 'blur' }
+        ],
+
+      }
+    },
+
+  }
+
+}
+</script>
+
+
+<style lang="scss" scoped>
+.form {
+  margin-top: 16px;
+}
+
+.item_width_1 {
+  width: 560px;
+
+  /deep/.tox .tox-dialog {
+    z-index: 20000;
+  }
+}
+
+.tinymce_view {
+  ::v-deep .tox .tox-dialog {
+    z-index: 2000000000;
+  }
+}
+
+.tinymce_view {
+  height: 400px;
+  overflow: auto;
+}
+
+.div_btn {
+  width: 100%;
+  text-align: right;
+  padding-right: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/communityParty/promotion/index.vue b/src/views/modules/communityParty/promotion/index.vue
index c8e88be49..09653a31b 100644
--- a/src/views/modules/communityParty/promotion/index.vue
+++ b/src/views/modules/communityParty/promotion/index.vue
@@ -1,36 +1,32 @@
 <template>
   <div class="g-main">
     <div class="m-search">
-      <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
+      <el-form :inline="true" :model="queryParams" ref="ref_searchform" :label-width="'100px'">
         <div>
-
-          <el-form-item label="党建类型" prop="typeId">
-            <el-select class="item_width_1" v-model.trim="formData.typeId" size="small" placeholder="全部" clearable>
-              <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.id">
+          <el-form-item label="党建类型" prop="tagId">
+            <el-select class="item_width_1" v-model.trim="queryParams.tagId" size="small" placeholder="全部" clearable>
+              <el-option v-for="item in typeList" :key="item.id" :label="item.tagName" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="标题名称" prop="activityName">
-            <el-input v-model.trim="formData.activityName" size="small" class="item_width_1" clearable
-              placeholder="请输入关键字">
+          <el-form-item label="标题名称" prop="title">
+            <el-input v-model.trim="queryParams.title" size="small" class="item_width_1" clearable placeholder="请输入关键字">
             </el-input>
           </el-form-item>
 
-           <el-form-item label="上架状态" prop="unitId">
-            <el-select class="item_width_1" v-model.trim="formData.status" size="small" placeholder="全部" clearable>
-              <el-option v-for="item in statuslist" :key="item.value" :label="item.label" :value="item.value">
+          <el-form-item label="上架状态" prop="status">
+            <el-select class="item_width_1" v-model.trim="queryParams.status" size="small" placeholder="全部" clearable>
+              <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
 
           <el-form-item label="发布时间" prop="timeRange">
-            <el-date-picker v-model="value1" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+            <el-date-picker v-model="timeRange" type="datetimerange" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期"
               end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
-
-
         </div>
         <div>
           <div style="display: flex; justify-content: flex-end;">
@@ -44,68 +40,44 @@
     </div>
     <div class="m-table">
       <div class="div_btn">
-        <div>
-          <el-button style="" class="diy-button--add" size="small" @click="handleInitAdd">+ 发起活动</el-button>
-          <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 活动记录</el-button>
-        </div>
-
-        <!-- <el-button style="" class="diy-button--add" size="small">导出</el-button> -->
+        <el-button style="" class="diy-button--add" size="small" @click="handleAdd">新增</el-button>
       </div>
 
       <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
         style="width: 100%;margin-top:16px">
 
         <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
-        <el-table-column prop="typeName" header-align="center" align="center" label="活动类型" width="180">
-        </el-table-column>
-        <el-table-column prop="activityName" header-align="center" align="center" label="活动名称" width="180">
+        <el-table-column prop="tagId" header-align="center" align="center" label="党建类型"
+          :formatter="formatterTag"></el-table-column>
+        <el-table-column prop="title" header-align="center" align="center" label="标题名称">
         </el-table-column>
-        <el-table-column prop="startTime" header-align="center" align="center" label="活动开始时间" min-width="180">
-        </el-table-column>
-        <el-table-column prop="address" header-align="center" align="center" label="活动地点" min-width="230">
-        </el-table-column>
-
-        <el-table-column prop="assistingParty" header-align="center" align="center" label="协办方" width="230">
-        </el-table-column>
-
-        <el-table-column prop="participants" header-align="center" align="center" label="活动人数" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.participants === 0 ? '不限' : scope.row.participants }}
+        <el-table-column prop="coverPic" header-align="center" align="center" label="图片" width="80">
+          <template slot-scope="{row}">
+            <el-image :src="row.coverPic" fit="fill" :preview-src-list="[row.coverPic]"
+              style="width: 50px; height: 50px;">
+            </el-image>
           </template>
         </el-table-column>
 
-        <el-table-column prop="status" header-align="center" align="center" label="活动状态" width="100">
-          <template slot-scope="scope">
-            {{ getStatusText(scope.row.status) }}
-          </template>
+        <el-table-column prop="releaseTime" header-align="center" align="center" label="发布时间">
         </el-table-column>
-        <el-table-column prop="online" header-align="center" align="center" label="线上报名" width="100">
-          <template slot-scope="scope">
-            <span v-if="scope.row.online === 1">是</span>
-            <span v-else>否</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="操作" fixed="right" width="230" header-align="center" align="center" class="operate">
+        <el-table-column label="操作" fixed="right" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
 
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
 
-            <el-button type="text" v-if="scope.row.status == 0||scope.row.status == 1" style="color:#1C6AFD;"
-              size="small" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button v-if="scope.row.status !== 1" type="text" style="color:#1C6AFD;" size="small"
+              @click="handleEdit(scope.row)">编辑</el-button>
 
-            <!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;"
-              size="small" @click="handleSumm(scope.row)">活动总结</el-button> -->
+            <el-button v-if="scope.row.status === 2 || scope.row.status === 0" type="text" style="color:#1C6AFD;"
+              size="small" @click="handleChangeIsTop(scope.row, 1)">上架</el-button>
 
-            <el-button type="text" v-if="scope.row.status == 2 && !scope.row.activityImgs" style="color:#1C6AFD;"
-              size="small" @click="handleSumm(scope.row)">活动总结</el-button>
+            <el-button v-if="scope.row.status === 1" type="text" style="color:#1C6AFD;" size="small"
+              @click="handleChangeIsTop(scope.row, 2)">下架</el-button>
 
-            <el-button type="text" style="color:rgb(28, 106, 253);" size="small"
+            <el-button v-if="scope.row.status !== 1" type="text" style="color:#1C6AFD;" size="small"
               @click="handleDelete(scope.row)">删除</el-button>
 
-            <el-button v-if="scope.row.status == 0" type="text" style="color:#D51010;" size="small"
-              @click="handleCancel(scope.row)">取消</el-button>
-
           </template>
         </el-table-column>
       </el-table>
@@ -116,687 +88,270 @@
       </div>
     </div>
 
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow" v-if="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
-      :title="formTitle" width="950px" top="5vh" class="dialog-h" @closed="diaClose">
-      <activity-records ref="ref_form" :unitList="corganizerList" :gridList="gridList" @dialogCancle="addFormCancle"
-        @dialogOk="addFormOk"></activity-records>
-    </el-dialog>
+    <!-- 新增 || 修改 || 查看弹出框 -->
+    <promotion-dialog ref="promotionDialog" :visible.sync="dialogVisible" :title="dialogTitle"
+      @success="getDataList"></promotion-dialog>
 
-    <el-dialog :visible.sync="initShow" v-if="initShow" :close-on-click-modal="false" :close-on-press-escape="false"
-      :title="formTitle" width="950px" top="5vh" class="dialog-h" @closed="diaInitClose">
-      <initiate-activity ref="ref_form" :unitList="corganizerList" :gridList="gridList"
-        @dialogCancle="addFormCancleInit" @dialogOk="addFormOkInit"></initiate-activity>
-    </el-dialog>
-
-
-    <el-dialog :visible.sync="detailShow" v-if="detailShow" formShow :close-on-click-modal="false"
-      :close-on-press-escape="false" :title="'活动详情'" width="950px" top="5vh" class="dialog-h" @closed="detailClosed">
-      <event-details ref="ref_detail" :gridList="gridList" @diaDetailClose="detailClosed"></event-details>
-    </el-dialog>
-
-    <el-dialog :visible.sync="summShow" v-if="summShow" :close-on-click-modal="false" :close-on-press-escape="false"
-      :title="'活动详情'" width="950px" top="5vh" class="dialog-h" @closed="summDetailClose">
-      <summ-details ref="ref_detail" :gridList="gridList" @summDetailClose="summDetailClose"></summ-details>
-    </el-dialog>
 
   </div>
 </template>
-  <script>
-  
-  import eventDetails from './components/eventDetails'
-  import initiateActivity from './components/initiateActivity'
-  import summDetails from './components/summDetails'
-  import util from '@js/util.js';
-  import { requestPost,requestGet } from "@/js/dai/request";
-  import { mapGetters } from 'vuex'
-  import { Loading } from 'element-ui' // 引入Loading服务
-  
-  let loading // 加载动画
-  export default {
-    data () {
-      return {
-        loading: false,
-        total: 0,
-        pageSize: 10,
-        pageNo: 0,
-        tableLoading: false,
-        agencyId: '',
-        gridList: [],//所属网格
-        unitList: [],
-        statuslist: [
-          { value: 0, label: '未开始' },
-          { value: 1, label: '进行中' },
-          { value: 2, label: '已结束' },
-          { value: 3, label: '已取消' }
-        ],
-        typeList:[],//活动类型
-        corganizerList:[],//协办方list
-        pickerOptions: { //控制时间范围
-          disabledDate (time) {
-            return time.getTime() > (Date.now() - (24 * 60 * 60 * 1000))
-          }
-        },
-  
-        timeRange: [],
-        unitId: '',
-        formData: {
-          activityName: "",
-          status: "",
-          typeId: "",
-          startTime: "",
-          endTime: "",
-          address: "",
-          assistingParty: ""
-        },
-        tableData: [],
-        summShow:false,
-  
-        //form相关
-        formShow: false,
-        initShow:false,
-        formTitle: '新增活动',
-        detailShow: false,
-  
-        files: "",
-        fileName: "",
-        uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
-        // searchdemandOptions:[],
-        detail:{}
+<script>
+import { mapGetters } from 'vuex'
+import promotionDialog from '@/views/modules/communityParty/promotion/components/promotionDialog'
+import { requestPost } from "@/js/dai/request";
+import { Loading } from 'element-ui'
+
+let loading // 加载动画
+export default {
+  name: 'promotionIndex',
+  components: {
+    promotionDialog
+  },
+  data() {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 10,
+      pageNo: 1,
+      tableLoading: false,
+      agencyId: '',
+      statusList: [
+        { value: 1, label: '上架' },
+        { value: 2, label: '下架' },
+      ],
+      typeList: [],
+      timeRange: [],
+      queryParams: {
+        title: "",
+        status: "",
+        tagId: "",
+        startTime: "",
+        endTime: "",
+      },
+      tableData: [],
+      dialogVisible: false,
+      dialogTitle: '',
+    }
+  },
+  created() {
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取党建类型
+    this.promotionType()
+    // 获取列表数据
+    this.getDataList()
+
+  },
+
+  methods: {
+    async promotionType() {
+      const url = "/actual/base/advertisingTag/page"
+      let params = {
+        pageSize: 100,
+        pageNo: 1,
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.typeList = data.list
+      } else {
+        this.$message.error(msg)
       }
     },
-    components: {
-       eventDetails, initiateActivity,summDetails
-    },
-    async created () {
-  
+    async getDataList() {
+      const url = "/actual/base/partyPublicity/page";
+      this.queryParams.startTime = this.timeRange[0] || '';
+      this.queryParams.endTime = this.timeRange[1] || '';
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        agencyId: this.agencyId,
+        ...this.queryParams,
+      };
+      let { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+      } else {
+        this.$message.error(msg)
+      }
     },
-    async mounted () {
-      //获取服务事项
-      await this.getDemandOptions()
-  
-      const { user } = this.$store.state
-      this.agencyId = user.agencyId
-  
-      //获取活动类型
-      this.activityType()
-
-      this.loadGrid()
-      //获取网格下拉框数据
-      // this.loadTable()
-
-      this.listServerOrg()
-      this.communityActivityList()
-  
+    handleSearch() {
+      this.pageNo = 1
+      this.getDataList()
     },
-  
-    methods: {
-      getStatusText(status) {
-        switch (status) {
-          case 0:
-            return '未开始';
-          case 1:
-            return '进行中';
-          case 2:
-            return '已结束';
-          case 3:
-            return '已取消';
-          default:
-            return '';
-        }
-      },
-      async listServerOrg() {
-        const url = "/actual/base/serviceitem/listServerOrgNewTask";
-        // const url = "/actual/base/activityType/page";
-        let params = {  
-          serverOrgCategoryCode: "",
-          serverOrgType: "party_unit",
-          serverParentOrgCategoryCode: ""
-          // "pageSize": 20,
-          // "pageNo": 1,
-          // "typeName": "",
-          // "enabled": 0
-        };
-
-        let { data, code, msg } = await requestPost(url, params);
-        if (code == 0) {
-          this.corganizerList = data;
-        } else if (code >= 8000) {
-          this.$message.error(msg);
-        }
-      },
-      async communityActivityList() {
-        const url = "/actual/base/communityActivity/page";
-        let params = {
-         pageSize: this.pageSize,
-          pageNo: this.pageNo,
-          agencyId: this.agencyId,
-          ...this.formData,
-        };
-        let { data, code, msg } = await requestPost(url, params);
-        if (code === 0) {
-          this.total = data.total
-          this.tableData = data.list
-          this.tableData.forEach((item) => {
-            this.typeList.forEach((itemuse)=>{
-              if(item.typeId==itemuse.id)
-              {
-                item.typeName=itemuse.typeName
-              }
-            })
-            const currentTime = new Date();
-            const year = currentTime.getFullYear();
-            const month = String(currentTime.getMonth() + 1).padStart(2, '0');
-             const day = String(currentTime.getDate()).padStart(2, '0');
-             const hours = String(currentTime.getHours()).padStart(2, '0');
-             const minutes = String(currentTime.getMinutes()).padStart(2, '0');
-             const seconds = String(currentTime.getSeconds()).padStart(2, '0');
-            let currentTime1   = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-            if (item.startTime > currentTime1) {
-              if( item.status === 0 ){
-                console.log(item.startTime > currentTime1,item.startTime,currentTime1);
-                return
-              }
-            } else if (item.startTime < currentTime1 && item.endTime > currentTime1) {
-              
-              if( item.status === 1 ){
-                console.log(item.startTime > currentTime1,item.startTime,currentTime1);
-                return
-              }else{
-               return  item.status = 1
-                // this.formData = item;
-                // this.updatetow()
-              }
-            } else {
-              if (item.status = 2) {
-                return
-              } else {
-                // item.status = 2
-                // this.formData = item;
-                // this.updatetow()
-              }            
-            }
-          
-          });
-
-        } else {
-          this.$message.error(msg)
-        }
-      },
-      async getDemandOptions() {
-        this.$http
-          .post("/actual/base/serviceitem/listAllCategory",{})
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg);
-            } else {
-              this.searchdemandOptions = this.getTreeData(res.data);
-            }
-          })
-          .catch(() => {
-            return this.$message.error("网络错误");
-          });
-      },
-      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;
-      },
-      handleSearch () {
-        this.communityActivityList()
-      },
-      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 activityType () {
-        const url = "/actual/base/activityType/page"
-        let params = {
-          // agencyId: this.agencyId
-          pageSize: 10,
-          pageNo: 1,
-          typeName: "",
-          enabled: 0
-        }
-        const { data, code, msg } = await requestPost(url, params)
-        if (code === 0) {
-          this.typeList = data.list
-        } else {
-          this.$message.error(msg)
-        }
-      },
-  
-      diaClose () {
-  
-        this.$refs.ref_form.resetData()
-        this.formShow = false
-      },
-      diaInitClose() {
+    // 新增
+    handleAdd() {
+      this.dialogVisible = true
+      this.dialogTitle = '新增'
+      this.$nextTick(() => {
+        this.$refs.promotionDialog.initForm()
+      })
+    },
+    // 编辑
+    handleEdit(row) {
+      this.dialogVisible = true
+      this.dialogTitle = '编辑'
+      this.$nextTick(() => {
+        this.$refs.promotionDialog.initForm(row)
+      })
+    },
 
-        this.$refs.ref_form.resetData()
-        this.initShow = false
-      },
-  
-      detailClosed () {
-        
-        this.$refs.ref_detail.diaDestroy()
-        this.detailShow = false
-      },
-      summDetailClose () {
-        // this.$refs.ref_detail.diaDestroy()
-        this.summShow = false
-      },
-  
-  
-      handleDetail (row) {
-        this.detailShow = true
-        this.formTitle = '详情'
-        console.log('rowmememmeme',row)
-        if(this.typeList){
-          row.typeName = this.typeList.filter(item=>item.id === row.typeId)[0].typeName || '--'
-        }
-        this.$nextTick(() => {
-          this.$refs.ref_detail.initForm(row)
-          // this.$refs.ref_form.initForm('detail', row.id)
-        })
-      },
+    // 查看
+    handleDetail(row) {
+      this.dialogVisible = true
+      this.dialogTitle = '详情'
+      this.$nextTick(() => {
+        this.$refs.promotionDialog.initForm(row)
+      })
+    },
 
-      handleEdit (row) {
-        this.formTitle = '修改'
-        this.initShow = true
-        this.$nextTick(() => {
-          // this.$refs.ref_form.initForm('edit', row.id)
-          this.$refs.ref_form.initForm('edit', row)
+    // 删除
+    async handleDelete(row) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(async () => {
+          const url = "/actual/base/partyPublicity/delete"
+          let id = [row.id]
+          const { data, code, msg } = await requestPost(url, id)
+          if (code === 0) {
+            this.$message({
+              type: "success",
+              message: "删除成功"
+            });
+            this.getDataList()
+          } else {
+            this.$message.error(msg)
+          }
         })
-      },
+        .catch(err => {
 
-      handleSumm(row){
-        console.log(row.activityImgs);
-        this.initShow = true
-        this.formTitle = '总结'
-        this.$nextTick(() => {
-          this.$refs.ref_form.initForm('summary', row)
-        })
-        this.communityActivityList()
-      },
-  
-      handleAdd () {
-        this.formTitle = '活动记录'
-        this.initShow = true
-        // this.formShow = true
-        this.$nextTick(() => {
-          this.$refs.ref_form.initForm('records', null)
-        })
-      },
-      handleInitAdd (e) {
-        this.formTitle = '发起活动'
-        this.initShow = true
-        this.$nextTick(() => {
-          this.$refs.ref_form.initForm('add', null)
-          // this.$refs.ref_detail.initForm(row)
-        })
-      },
-  
-      addFormCancle () {
-        this.formShow = false
-      },
-      addFormCancleInit () {
-        this.initShow = false
-      },
-      addFormOk () {
-        this.formShow = false
-        // this.loadTable()
-        this.communityActivityList()
-  
-      },
-      addFormOkInit () {
-        this.initShow = false
-        // this.loadTable()
-        this.communityActivityList()
-  
-      },
-  
-      async handleDelete (row) {
-  
-        this.$confirm("确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            this.deleteActivity(row)
-          })
-          .catch(err => {
-            if (err == "cancel") {
-  
-            }
-  
-          });
-      },
-      async handleCancel(row) {
-        this.$confirm("确认取消?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+        });
+    },
+    // 上架或下架
+    async handleChangeIsTop(row, status) {
+      this.$confirm(`确认${status === 2 ? '下架' : '上架'}?`, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(async () => {
+          let url = '/actual/base/partyPublicity/updateStatus'
+          const { data, code, msg } = await requestPost(url, { id: row.id, status: status })
+          if (code === 0) {
+            this.$message.success(status === 2 ? '下架成功' : '上架成功')
+            this.getDataList()
+          } else {
+            this.$message.error(msg)
+          }
         })
-          .then(() => {
-            this.update(row)
-          })
-          .catch(err => {
-            // console.log("hehheheheh",row)
-            if (err == "cancel") {
-
-            }
+        .catch(err => {
+        });
+    },
 
-          });
-      },
 
-      async update(row) {
-        
-        let url = '/actual/base/communityActivity/update'
-        this.formData = row
-        this.formData.status = 3
-        console.log(this.formData,"this.formData");
-        const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
-        if (code === 0) {
-          this.$message({
-            type: 'success',
-            message: '操作成功'
-          })
-          
-        } else if(internalMsg !== ''){
-          this.$message.error(internalMsg)
-        }else{
-          this.$message.error(msg)
-        }
-        this.resetSearch()
-      },
-      async updatetow(){
-        let url = '/actual/base/communityActivity/update'
-        const { data, code, msg, internalMsg } = await requestPost(url, this.formData)
-        if (code === 0) {
-          this.$message({
-            type: 'success',
-            message: '操作成功111'
-          })
-        } else if (internalMsg !== '') {
-          this.$message.error(internalMsg)
-        } else {
-          this.$message.error(msg)
-        }
-        this.resetSearch()
-      },
-  
-      async deleteActivity (row) {
-
-        const url = "/actual/base/communityActivity/delete"
-        let id = [row.id]
-  
-        const { data, code, msg } = await requestPost(url, id)
-  
-        if (code === 0) {
-          this.$message({
-            type: "success",
-            message: "删除成功"
-          });
-  
-          // this.loadTable()
-          this.communityActivityList()
-        } else {
-          this.$message.error(msg)
-        }
-      },
-  
-      //重置搜索条件
-      resetSearch () {
-        this.timeRange = []
-        this.formData = {
-          activityName: "",
-          status: "",
-          typeId: "",
-          startTime: "",
-          endTime: "",
-          address: "",
-          assistingParty: ""
-        }
-        this.pageSize = 10
-        this.pageNo = 1
-        // this.loadTable()
-        this.communityActivityList()
-      },
-  
-      //导出表格
-      async handleExport () {
-        let title = '联建活动列表'
-  
-        const url = "/heart/icpartyactivity/export"
-        let params = {
-          agencyId: this.agencyId,
-  
-          ...this.formData
-  
-        }
-  
-        app.ajax.exportFilePost(
-          url,
-          params,
-          (data, rspMsg) => {
-  
-            this.download(data, title + '.xls')
-          },
-          (rspMsg, data) => {
-            this.$message.error(rspMsg);
-          }
-        );
-  
-      },
-  
-      // 下载文件
-      download (data, fileName) {
-        if (!data) {
-          return
-        }
-  
-        var csvData = new Blob([data])
-  
-        if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-          window.navigator.msSaveOrOpenBlob(csvData, fileName);
-        }
-        // for Non-IE (chrome, firefox etc.)
-        else {
-          var a = document.createElement('a');
-          document.body.appendChild(a);
-          a.style = 'display: none';
-          var url = window.URL.createObjectURL(csvData);
-          a.href = url;
-          a.download = fileName;
-          a.click();
-          a.remove();
-          window.URL.revokeObjectURL(url);
-        }
-  
-      },
-  
-      // 上传文件之前的钩子
-      beforeUpload (file) {
-        this.files = file;
-  
-        const isText = file.type === 'application/vnd.ms-excel'
-        const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-  
-        if (!isText && !isTextComputer) {
-          this.$message.error('请选择正确格式的文件')
-          return false
-        } else {
-          this.fileName = file.name;
-          return true
-        }
-  
-      },
-      // 上传文件个数超过定义的数量
-      handleExceed (files, fileList) {
-        this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-      },
-  
-      async uploadFile () {
-        this.loading = true
-  
-        if (this.fileName == "") {
-          this.$message.warning('请选择要上传的文件！')
-          return false
-        }
-  
-        //清空上传列表
-        this.$refs['upload'].clearFiles()
-  
-        var url = '/heart/icpartyactivity/import'
-        let fileFormData = new FormData();
-        fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-  
-        const { data, code, msg } = await requestPost(url, fileFormData)
-        if (code === 0) {
-          this.$message({
-            type: "success",
-            message: "导入成功"
-          });
-  
-          // this.loadTable()
-          this.communityActivityList()
-        } else {
-          this.$message.error(msg)
-        }
-  
-  
-      },
-  
-      handleTimeChange (time) {
-        if (time) {
-          const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
-          const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
-  
-          this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
-          this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
-        } else {
-          this.formData.startTime = ''
-          this.formData.endTime = ''
-        }
-      },
-  
-      handleSizeChange (val) {
-        this.pageSize = val
-        this.pageNo = 1
-        // this.loadTable()
-        this.communityActivityList()
-      },
-      handleCurrentChange (val) {
-        this.pageNo = val
-        // this.loadTable()
-        this.communityActivityList()
-      },
-  
-      // 开启加载动画
-      startLoading () {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: '正在加载……', // 加载中需要显示的文字
-          background: 'rgba(0,0,0,.7)' // 背景颜色
-        })
-      },
-      // 结束加载动画
-      endLoading () {
-        // clearTimeout(timer);
-        if (loading) {
-          loading.close()
-        }
+    //重置搜索条件
+    resetSearch() {
+      this.timeRange = []
+      this.queryParams = {
+        title: "",
+        status: "",
+        tagId: "",
+        startTime: "",
+        endTime: "",
       }
+      this.pageSize = 10
+      this.pageNo = 1
+      this.getDataList()
     },
-    computed: {
-      tableHeight () {
-  
-        return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
-  
-      },
-  
-      ...mapGetters(['clientHeight', 'iframeHeight'])
+
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.getDataList()
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val
+      this.getDataList()
     },
-    watch: {
-  
+    // 格式化党建类型标签
+    formatterTag(row, column, cellValue, index) {
+      if (cellValue) {
+        return this.typeList.filter(item => item.id == cellValue)[0].tagName || ''
+      }
     },
-    props: {
-  
+
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading() {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
     }
-  }
-  </script>
-  <style lang="scss" scoped >
-  .g-main {
-    width: 100%;
-  }
+  },
+  computed: {
+    tableHeight() {
 
-  .m-search {
-    background: #ffffff;
-    border-radius: 4px;
-    padding: 24px 10px 10px;
-    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-    margin: 20px 7px 7px;
-  }
+      return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 430
 
-  // .item_width_1 {
-  //   width: 260px;
-  // }
+    },
 
-  // .item_width_2 {
-  //   width: 495px;
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  }
+}
+</script>
+<style lang="scss" scoped>
+.g-main {
+  width: 100%;
+}
+
+.m-search {
+  background: #ffffff;
+  border-radius: 4px;
+  padding: 24px 10px 10px;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  margin: 20px 7px 7px;
+}
+
+// .item_width_1 {
+//   width: 260px;
+// }
+
+// .item_width_2 {
+//   width: 495px;
+// }
+
+.m-table {
+  background: #ffffff;
+  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  margin-top: 15px;
+  padding: 24px 16px 10px;
+  margin: 16px 7px 7px;
+
+  // .table {
+  //   margin-top: 20px;
   // }
+}
 
-  .m-table {
-    background: #ffffff;
-    box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-    border-radius: 4px;
-    margin-top: 15px;
-    padding: 24px 16px 10px;
-    margin: 16px 7px 7px;
-
-    // .table {
-    //   margin-top: 20px;
-    // }
-  }
 
-  .div_btn {
-    display: flex;
-    justify-content: space-between;
-  }
 
-  .el-row {
-    /* margin-bottom: 20px; */
-    display: flex;
-    flex-wrap: wrap;
-    margin-top: 10px;
-    margin-right: 50px;
-  }
-</style>
-  
\ No newline at end of file
+.el-row {
+  /* margin-bottom: 20px; */
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 10px;
+  margin-right: 50px;
+}
+</style>
\ No newline at end of file