diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue
index f842f340c..db3ce79d1 100644
--- a/src/views/modules/communityParty/comPromotion/add.vue
+++ b/src/views/modules/communityParty/comPromotion/add.vue
@@ -1,80 +1,375 @@
 <template>
-  <el-form :model="formData" @submit.native.prevent="handleSubmit">
-    <el-form-item label="文章标题：" :label-width="formLabelWidth">
-      <el-input v-model="formData.title" maxlength="50" required></el-input>
-    </el-form-item>
-    <el-form-item label="封面图片：" :label-width="formLabelWidth">
-      <el-upload
-        action="#"
-        list-type="picture"
-        :on-change="handleFileUpload"
-        :file-list="fileList"
-      >
-        <el-button size="small" type="primary">点击上传</el-button>
-      </el-upload>
-    </el-form-item>
-    <el-form-item label="发布时间：" :label-width="formLabelWidth">
-      <el-date-picker v-model="formData.publishDate" type="date" placeholder="选择日期"></el-date-picker>
-    </el-form-item>
-    <el-form-item label="文章标签：" :label-width="formLabelWidth">
-      <el-select v-model="formData.tags" placeholder="请选择">
-        <el-option
-          v-for="tag in availableTags"
-          :key="tag"
-          :label="tag"
-          :value="tag"
-        ></el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="内容：" :label-width="formLabelWidth">
-      <el-input type="textarea" v-model="formData.content" rows="10" required></el-input>
-    </el-form-item>
-    <el-form-item>
-      <el-checkbox v-model="formData.homepageTop">首页置顶</el-checkbox>
-    </el-form-item>
-    <el-form-item>
-      <el-checkbox v-model="formData.notification">消息推送</el-checkbox>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" @click="handleSubmit">发布</el-button>
-    </el-form-item>
-  </el-form>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" :disabled="formType === 'detail'"
+                class="form">
+                <el-form-item label="文章标题" prop="title" label-width="150px">
+                    <el-input v-model.trim="formData.title" size="small" clearable placeholder="请输入活动名称"
+                        class="u-item-width-normal"></el-input>
+                </el-form-item>
+
+                <el-form-item label="发布时间" label-width="140px" prop="releaseTime">
+                    <el-date-picker v-model.trim="formData.releaseTime" type="date" value-format="yyyy-MM-dd"
+                        format="yyyy-MM-dd" placeholder="选择发布时间" style="width:280px">
+                    </el-date-picker>
+                </el-form-item>
+
+                <el-form-item label="文章标签" prop="tagId" label-width="150px">
+                    <el-select class="u-item-width-normal" v-model.trim="formData.tagId" placeholder="请选择" clearable>
+                        <el-option v-for="item in adverTagList" :key="item.id" :label="item.tagName" :value="item.id"
+                            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"></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-if="formType != 'detail'" v-model.trim="formData.content"
+                            :height="250" placeholder="在这里输入文字" />
+                    </div>
+                </el-form-item>
+
+                <el-form-item label="首页置顶" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="top" @change="handleOnlineRegistration"></el-switch>
+                </el-form-item>
+
+                <el-form-item label="消息推送" label-width="140px">
+                    <el-checkbox-group v-model="formData.sendMsg">
+                        <el-checkbox true-label="1" false-label="0" label="是否通过公众号推送给社区居民"></el-checkbox>
+                    </el-checkbox-group>
+                </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() {
-    return {
-      formData: {
-        title: '',
-        coverImage: null,
-        publishDate: '',
-        tags: '',
-        content: '',
-        homepageTop: false,
-        notification: false
-      },
-      availableTags: ['标签1', '标签2', '标签3'],
-      fileList: [],
-      formLabelWidth: '100px'
-    };
+      let initFormData = () => {
+          let _form = {
+            title: "",//标题
+            content: "",//内容
+            tagId: "",//标签id
+            coverPic: "",//封面图
+            releaseTime: "",//发布时间
+            sendMsg: 0,//是否推送
+            top: 0,//是否置顶
+            status: 0 //状态
+          }
+
+          return _form
+      }
+      return {
+        adverTagList:[],
+
+
+
+        //////
+          top:false,
+          fileList: [],//封面图片
+          activityImgs:[],//活动照片
+          formType: 'add', //表单操作类型 add新增，edit编辑,records记录
+        //   records:false,
+          searchOptions: [],
+          searchValue: '',
+          resultList: [],
+          num: 0,
+          loading: false,
+          timeRange: [],
+          online: false,
+
+          btnDisable: false,
+
+          keyWords: '',
+          activityId: '',
+          formData: initFormData(),
+          serviceList: [],
+        //   gridList: [],
+          agencyId: '',
+
+          demandOptions: [],
+          uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+          customerId: localStorage.getItem('customerId'),
+
+      }
   },
+  components: { Tinymce, UploadImage },
+  mounted() {
+      this.advertisingTag()
+      
+  },
+
   methods: {
-    handleFileUpload(file, fileList) {
-      this.fileList = fileList;
-      this.formData.coverImage = file.raw;
-    },
-    handleSubmit() {
-      console.log(this.formData);
-      this.$message.success('表单已提交');
-    }
+    async advertisingTag () {
+          const url = "/actual/base/advertisingTag/page"
+          let params = {
+            pageSize: this.pageSize,
+            pageNo: this.pageNo,
+            tagName: "",
+            status: ""
+          }
+          const { data, code, msg,internalMsg } = await requestPost(url, params)
+          if (code === 0) {
+            this.adverTagList = data.list
+          } else if(internalMsg !== ''){
+            this.$message.error(internalMsg)
+          }else {
+            this.$message.error(msg)
+          }
+        },
+
+
+
+
+
+    /////
+
+      handleOnlineRegistration(value) {
+          // console.log(value)
+          if (value) {
+              this.formData.top = 1;
+          } else {
+              this.formData.top = 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;
+          }
+      },
+
+      async initForm(type, activityId) {
+          this.startLoading()
+          this.formType = type
+        //   console.log("阿斯顿撒打算",type, activityId)
+          if (type === 'edit') {
+              this.formData = activityId
+              if (activityId.coverPic) {
+                  let ob = {
+                      fileType: '0',
+                      fileUrl: activityId.coverPic
+                  };
+                  this.fileList = [ob];
+                  this.formData.coverPic = ob.fileUrl;
+                  if(this.formData.top == 1){
+                      this.top = true
+                  }
+              }
+            //   console.log("this.fileList",this.fileList)
+          }else if (type === 'records') {
+              this.records = true
+          }
+          
+          this.endLoading()
+
+      },
+
+      async handleComfirm() {
+          this.btnDisable = true
+          setTimeout(() => {
+              this.btnDisable = false
+          }, 10000)
+
+          this.$refs['ref_form'].validate((valid, messageObj) => {
+            console.log("this.formData看看里面村的什么",this.formData)
+            if (!valid) {
+              app.util.validateRule(messageObj)
+              this.btnDisable = false
+            } else {
+              this.addActivity()
+            }
+          })
+      },
+      async addActivity() {
+          if (this.formType === 'edit') {
+        
+              let url = '/actual/base/communityPublicity/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{
+            console.log("this.formData",this.formData)
+              let url = '/actual/base/communityPublicity/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')
+
+      },
+
+      resetData() {
+          this.fileList = []
+          this.top = false
+          this.formType = ''
+          this.formData = {
+
+          }
+
+      },
+      // 开启加载动画
+      startLoading() {
+          loading = Loading.service({
+              lock: true, // 是否锁定
+              text: '正在加载……', // 加载中需要显示的文字
+              background: 'rgba(0,0,0,.7)' // 背景颜色
+          })
+      },
+      // 结束加载动画
+      endLoading() {
+          // clearTimeout(timer);
+          if (loading) {
+              loading.close()
+          }
+      }
+  },
+  computed: {
+      dataRule() {
+          return {
+            title: [
+                  { required: true, message: '文章标题不能为空', trigger: 'blur' }
+              ],
+              coverPic:[
+                  { required: true, message: '请选择封面图', trigger: 'blur' }
+              ],
+              content: [
+                  { required: true, message: '内容不能为空', trigger: 'blur' }
+              ],
+              releaseTime: [
+                  { required: true, message: '请选择发布时间', trigger: 'blur' }
+              ],
+              tagId: [
+                  { required: true, message: '请选择文章标签', trigger: 'blur' }
+              ]
+          }
+      },
+
+  },
+  props: {
+      // unitList: {
+      //     type: Array,
+      //     default: []
+      // },
+      //   gridList: {
+      //       type: Array,
+      //       default: []
+      //   },
   }
-};
+}
 </script>
 
-<style scoped>
-.el-form {
-  max-width: 600px;
-  margin: auto;
+
+<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/comPromotion/event.vue b/src/views/modules/communityParty/comPromotion/event.vue
new file mode 100644
index 000000000..7cc5d2512
--- /dev/null
+++ b/src/views/modules/communityParty/comPromotion/event.vue
@@ -0,0 +1,166 @@
+<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.title || "--" }}</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.tagId || "--" }}</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.releaseTime || "--" }}至<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.status === 1 ? '已下线' : '已发布' || "--" }}</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>
+                        <el-switch :value="formData.top === 1 ? true : false" :disabled="true"></el-switch>
+                      
+                    </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>
+                        <span>{{ formData.address || "--" }}</span>
+                    </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>
+
+                </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";
+
+var map;
+var search;
+var markers;
+var infoWindowList;
+var geocoder; // 新建一个正逆地址解析类
+
+let loading; // 加载动画
+export default {
+    data() {
+        return {
+            formData: {},
+            initLoading: false,
+        };
+    },
+    components: {},
+    created() { },
+
+    mounted () {
+    },
+
+    methods: {
+        async activityType () {
+        const url = "/actual/base/activityType/page"
+        let params = {
+          // agencyId: this.agencyId
+          pageSize: 20,
+          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)
+        }
+      },
+        handleCancle() {
+            // this.diaDestroy();
+            this.$emit("dialogCancle");
+        },
+
+        diaDestroy() {
+            if (map) {
+                // map.destroy()
+            }
+        },
+
+        async initForm(row) {
+            this.startLoading();
+            this.formData = JSON.parse(JSON.stringify(row));
+            this.initLoading = true;
+
+            this.endLoading();
+        },
+
+        // 开启加载动画
+        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 {
+//     display: inline-block;
+//     white-space: nowrap; /* 避免换行 */
+// }
+
+</style>
+<style scoped></style>
diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue
index 44e70b4e0..9e52ce2e3 100644
--- a/src/views/modules/communityParty/comPromotion/index.vue
+++ b/src/views/modules/communityParty/comPromotion/index.vue
@@ -4,18 +4,18 @@
       <el-form :inline="true" ref="ref_searchform" :label-width="'100px'">
         <div>
           <el-form-item label="文章标题">
-            <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable placeholder="请输入">
+            <el-input v-model.trim="formData.title" size="small" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
           <el-form-item label="标签">
-            <el-select class="item_width_1" v-model.trim="enabled" size="small" placeholder="请选择" clearable>
-              <el-option v-for="item in unitList" :key="item.value" :label="item.name" :value="item.value">
+            <el-select class="item_width_1" v-model.trim="formData.tagId" size="small" placeholder="请选择" clearable>
+              <el-option v-for="item in adverTagList" :key="item.id" :label="item.tagName" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="状态">
             <el-select class="item_width_1" v-model.trim="enabled" size="small" placeholder="请选择" clearable>
-              <el-option v-for="item in unitList" :key="item.value" :label="item.name" :value="item.value">
+              <el-option v-for="item in statuslist" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
           </el-form-item>
@@ -40,7 +40,7 @@
   style="width: 100%">
 
   <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
-  <el-table-column prop="title" header-align="center" align="center" label="文章标题" width="380">
+  <el-table-column prop="title" header-align="center" align="center" label="文章标题" width="200">
   </el-table-column>
   <el-table-column prop="tagId" header-align="center" align="center" label="标签" width="150">
     <!-- <template slot-scope="scope">
@@ -48,19 +48,21 @@
     </template> -->
   </el-table-column>
 
-  <el-table-column prop="status" header-align="center" align="center" label="状态" width="100">
+  <el-table-column prop="status" header-align="center" align="center" label="状态" width="80">
         <template slot-scope="scope">
       <span>{{ scope.row.status === 1 ? '已下线' : '已发布' }}</span>
     </template>
   </el-table-column>
   <el-table-column prop="createdTime" header-align="center" align="center" label="发布单位" width="200">
   </el-table-column>
+  <el-table-column prop="releaseTime" header-align="center" align="center" label="发布时间" width="200">
+  </el-table-column>
   <el-table-column prop="top" header-align="center" align="center" label="置顶" width="100">
     <template slot-scope="scope">
       <span>{{ scope.row.top === 1 ? '是' : '否' }}</span>
     </template>
   </el-table-column>
-  <el-table-column prop="top" header-align="center" align="center" label="点赞数" width="100">
+  <el-table-column prop="topp" header-align="center" align="center" label="点赞数" width="100">
   </el-table-column>
   <el-table-column prop="createdTime" header-align="center" align="center" label="转发数" width="100">
   </el-table-column>
@@ -90,8 +92,8 @@
     </el-dialog>
 
     <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
-      width="950px" top="5vh" class="dialog-h" @closed="diaClose">
-      <viewPromotionalTags ref="ref_detail"  @dialogCancle="addFormQ"></viewPromotionalTags>
+      width="950px" top="5vh" class="dialog-h" @closed="eventForm">
+      <event ref="ref_detail"  @dialogCancle="eventForm"></event>
     </el-dialog>
   </div>
 </template>
@@ -100,10 +102,12 @@
     import { Loading } from 'element-ui' // 引入Loading服务
     import { requestPost, requestGet } from '@/js/dai/request';
     import add from "./add.vue";
+    import event from "./event.vue";
     export default {
       data () {
         return {
           tableData:[],
+          unitList:[],
           loading: false,
           total: 0,
           pageSize: 10,
@@ -116,10 +120,23 @@
           formShow: false,
           formTitle: '新增活动',
           detailShow: false,
+          formData: {
+            title: "",
+            tagId: "",
+            startTime: "",
+            endTime: "",
+          },
+          pageSize: 20,
+          pageNo: 1,
+          adverTagList:[],
+          statuslist: [
+          { value: 0, label: '已发布' },
+          { value: 1, label: '已下线' },
+        ],
         }
       },
       components: {
-        add
+        add,event
       },
     //   components: {
     //     typeActivityadd, typeDetails
@@ -135,8 +152,7 @@
         this.agencyId = user.agencyId
     
         //获取建联单位
-        // this.loadUnit()
-        // this.loadGrid()
+        this.advertisingTag()
         //获取网格下拉框数据
         this.loadTable()    
       },
@@ -145,22 +161,35 @@
         handleSearch () {
           this.loadTable()
         },
+        async advertisingTag () {
+          const url = "/actual/base/advertisingTag/page"
+          let params = {
+            pageSize: this.pageSize,
+            pageNo: this.pageNo,
+            tagName: "",
+            status: ""
+          }
+          const { data, code, msg } = await requestPost(url, params)
+          if (code === 0) {
+            this.adverTagList = data.list
+          } else {
+            this.$message.error(msg)
+          }
+        },
         async loadTable () {
           this.tableLoading = false
           const url = "/actual/base/communityPublicity/page"
           let params = {
-            pageSize: 20,
-            pageNo: 1,
-            title: "",
-            tagId: "",
-            startTime: "",
-            endTime: ""
+            pageSize: this.pageSize,
+            pageNo: this.pageNo,
+            // agencyId: this.agencyId,
+            ...this.formData,
           }
           const { data, code, msg } = await requestPost(url, params)
           if (code === 0) {
             this.total = data.total
             this.tableData = data.list
-            console.log( this.tableData )
+            // console.log( "啊大苏打撒旦",this.tableData )
           } else {
             this.$message.error(msg)
           }
@@ -181,7 +210,7 @@
         },
     
         detailClosed () {
-          console.log(this.$refs.ref_detail)
+          // console.log(this.$refs.ref_detail)
           // this.$refs.ref_detail.diaDestroy()
           this.detailShow = false
         },
@@ -208,14 +237,15 @@
           this.formTitle = '修改'
           this.formShow = true
           this.$nextTick(() => {
-            this.$refs.ref_form.initForm(row)
+            this.$refs.ref_form.initForm("edit",row)
           })
         },
      
         addFormCancle () {
           this.formShow = false
         },
-        addFormQ(){
+
+        eventForm(){
           this.detailShow = false
         },
         addFormOk () {
@@ -256,7 +286,7 @@
             });
           },
           async OnhandleOnline(row){
-            console.log(row)
+            // console.log(row)
           const url = "/actual/base/communityPublicity/updateStatus"
     			let params={
             status:0,
@@ -291,7 +321,7 @@
             });
           },
           async OnhandleOffline(row){
-            console.log(row)
+            // console.log(row)
           const url = "/actual/base/communityPublicity/updateStatus"
     			let params={
             status:1,
@@ -331,7 +361,12 @@
     
         //重置搜索条件
         resetSearch () {
-          this.typeName = ''
+          this.formData = {
+            title: "",
+            tagId: "",
+            startTime: "",
+            endTime: "",
+          },
           this.loadTable()
         },
 
diff --git a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
index 4d9921c88..9ec56bdba 100644
--- a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
+++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
@@ -5,12 +5,16 @@
         <el-form ref="ref_form" :inline="true"  :rules="dataRule"
           class="form">
 
-          <el-form-item label="活动类型" label-width="150px" style="display: block">
+          <el-form-item label="标签名称" label-width="150px" style="display: block">
             <div style="width: 500px">
-              <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable placeholder="请输入">
+              <el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入">
                 </el-input>
             </div>
           </el-form-item>
+
+          <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="online" @change="handleOnlineRegistration"></el-switch>
+                </el-form-item>
         </el-form>
       </div>
   
@@ -43,9 +47,11 @@
     export default {
       data () {
         return {
-          typeName: '',
+          tagName: '',
           marde:'',
-          id:''
+          id:'',
+          status:null,
+          online:false
 
     
         }
@@ -57,12 +63,29 @@
       },
     
       methods: { 
+        handleOnlineRegistration(value) {
+            // console.log(value)
+            if (value) {
+                this.online = true;
+                this.status = 0;
+            } else {
+                this.online = false;
+                this.status = 1;
+            }
+        },
         async initForm(activityId){
           console.log('activityIddetailShow',activityId)
           if(activityId !== ''){
             this.marde = 'edi'
             this.id = activityId.id
-            this.typeName = activityId.typeName
+            this.tagName = activityId.tagName
+            if(activityId.status === 0){
+              this.online = true 
+            }else {
+              this.online = false 
+            }
+
+
           }  
         },
         async handleComfirm () {
@@ -70,8 +93,8 @@
           setTimeout(() => {
             // this.btnDisable = false
           }, 100)
-            if (this.typeName === '') {
-              this.$message.error('活动类型不能为空')
+            if (this.tagName === '') {
+              this.$message.error('标签名称不能为空')
             }else {
               this.addActivity()
             }
@@ -79,12 +102,12 @@
         },
         async addActivity () {
           if (this.marde === 'edi') {
-            let url = '/actual/base/activityType/save'
+            let url = '/actual/base/advertisingTag/update'
             let parmer = {
-                tagName:this.typeName,
-                status: 0,
+                tagName:this.tagName,
+                status: this.status,
                 }
-            const { data, code, msg } = await requestPost(url, parmer)
+            const { data, code, msg, internalMsg } = await requestPost(url, parmer)
 
             if (code === 0) {
               this.$message({
@@ -94,19 +117,20 @@
               this.resetData()
               this.$emit('dialogOk')
               // this.btnDisable = false
-            } else {
+            } else if(internalMsg !== ''){
               // this.btnDisable = false
+              this.$message.error(internalMsg)
+            }else{
               this.$message.error(msg)
             }
           }else{
-            let url = '/actual/base/activityType/save'
-            // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
+            let url = '/actual/base/advertisingTag/save'
             let parmer = {
-              typeName: this.typeName,
-              enabled: 0
+              tagName: this.tagName,
+              status: this.status
             }
 
-            const { data, code, msg } = await requestPost(url, parmer)
+            const { data, code, msg, internalMsg } = await requestPost(url, parmer)
 
             if (code === 0) {
               this.$message({
@@ -116,8 +140,10 @@
               this.resetData()
               this.$emit('dialogOk')
               // this.btnDisable = false
-            } else {
+            } else if(internalMsg !== ''){
               // this.btnDisable = false
+              this.$message.error(internalMsg)
+            }else{
               this.$message.error(msg)
             }
           }
@@ -133,8 +159,10 @@
         },
     
         resetData () {
-          this.typeName = '',
+          this.tagName =''
+          this.status = null
           this.marde = ''
+          this.online = false
     
         },
         // 开启加载动画
diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue
index 5213b133b..c3a557a0f 100644
--- a/src/views/modules/workSys/promotionTab/index.vue
+++ b/src/views/modules/workSys/promotionTab/index.vue
@@ -6,13 +6,13 @@
 
 
           <el-form-item label="标签名称">
-            <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable placeholder="请输入">
+            <el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
 
           <el-form-item label="首页显示">
-            <el-select class="item_width_1" v-model.trim="enabled" size="small" placeholder="请选择" clearable>
-              <el-option v-for="item in unitList" :key="item.value" :label="item.name" :value="item.value">
+            <el-select class="item_width_1" v-model.trim="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>
@@ -34,15 +34,15 @@
         <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"
+      <el-table class="table" :data="tableData" border v-loading="tableLoading"
         style="width: 100%">
 
         <el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
-        <el-table-column prop="typeName" header-align="center" align="center" label="标签名称" width="380">
+        <el-table-column prop="tagName" header-align="center" align="center" label="标签名称" width="380">
         </el-table-column>
         <el-table-column prop="enabled" header-align="center" align="center" label="首页显示" width="380">
           <template slot-scope="scope">
-            <span>{{ scope.row.enabled === 1 ? '关闭' : '显示' }}</span>
+            <span>{{ scope.row.status === 1 ? '关闭' : '显示' }}</span>
           </template>
         </el-table-column>
 
@@ -75,7 +75,7 @@
     <!-- 修改弹出框 -->
     <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
       width="950px" top="5vh" class="dialog-h" @closed="diaClose">
-      <AddpromotionTab ref="ref_form" :unitList="corganizerList" :gridList="gridList" @dialogCancle="addFormCancle"
+      <AddpromotionTab ref="ref_form"  :gridList="gridList" @dialogCancle="addFormCancle"
         @dialogOk="addFormOk"></AddpromotionTab>
     </el-dialog>
 
@@ -103,10 +103,17 @@
           gridList: [],//所属网格
           typeName:'',
           enabled:'',
+          tableData:[],
           //form相关
           formShow: false,
           formTitle: '新增活动',
           detailShow: false,
+          tagName:'',
+          status:null,
+          statuslist: [
+          { value: 0, label: '显示' },
+          { value: 1, label: '不显示' }
+        ],
         }
       },
       components: {
@@ -139,12 +146,12 @@
         //展示表格
         async loadTable () {
           this.tableLoading = false
-          const url = "/actual/base/activityType/page"
+          const url = "/actual/base/advertisingTag/page"
           let params = {
             pageSize: 20,
             pageNo: 1,
-            tagName: "",
-            status: 0
+            tagName: this.tagName,
+            status: this.status
           }
           const { data, code, msg } = await requestPost(url, params)
           if (code === 0) {
@@ -227,7 +234,7 @@
     
         async deleteActivity (row) {
           console.log(row)
-          const url = "/actual/base/activityType/delete"
+          const url = "/actual/base/advertisingTag/delete"
           // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
     			let idArr=[row.id]
           const { data, code, msg } = await requestPost(url, idArr)
@@ -246,7 +253,8 @@
     
         //重置搜索条件
         resetSearch () {
-          this.typeName = ''
+          this.tagName = ''
+          this.status = null
           this.loadTable()
         },
 
diff --git a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue
index 71eb552fb..5506f40b9 100644
--- a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue
+++ b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue
@@ -3,12 +3,14 @@
 
         <div class="dialog-h-content scroll-h">
             <el-form ref="ref_form" :inline="true" :rules="dataRule" class="form">
-
                 <el-form-item label="活动类型" label-width="150px" style="display: block">
                     <div style="width: 500px">
-                        <span>{{ typeName }}</span>
+                        <span>{{ tagName }}</span>
                     </div>
                 </el-form-item>
+                <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
+                    <el-switch v-model="online" disabled></el-switch>
+                </el-form-item>
             </el-form>
         </div>
 
@@ -37,7 +39,8 @@
     export default {
       data () {
         return {
-          typeName: ''
+          tagName: '',
+          online:false
     
         }
       },
@@ -56,24 +59,22 @@
           },
 
           resetData() {
-              this.typeName = '',
+              this.tagName = '',
                   this.marde = ''
+                  this.online = false
 
           },
           async handleComfirm() {
-              // this.btnDisable = true
-            //   setTimeout(() => {
-            //       // this.btnDisable = false
-            //   }, 100)
-            //   if (this.typeName === '') {
-            //       this.$message.error('活动类型不能为空')
-            //   } else {
-            //       this.addActivity()
-            //   }
 
           },
           async initForm(activityId) {
-              this.typeName = activityId.typeName
+              this.tagName = activityId.tagName
+              console.log("asdasd ",activityId)
+              if(activityId.status === 0){
+                this.online = true
+              }else{
+                this.online = false
+              }
           },
           handleComfirm() {
             //   this.resetData()
@@ -81,7 +82,7 @@
 
           },
           resetData() {
-              this.typeName = ''
+              this.tagName = ''
 
           },
         // 开启加载动画