暂存

VUECODE/smart-property-manage/src/api/announcement.js

@@ -13,4 +13,17 @@ export function listAnnouncement(data) {
     }
   })
 }
-
+// 添加公告
+export function addAnnouncement(data) {
+  return request({
+    url: '/addAnnouncement',
+    method: 'post',
+    data: {
+      announcementTitle: data.announcementTitle,
+      announcementCarouselImg: data.announcementCarouselImg,
+      announcementContent: data.announcementContent,
+      announcementContentImg: data.announcementContentImg,
+      sort: data.sort
+    }
+  })
+}

VUECODE/smart-property-manage/src/store/modules/announcement.js

@@ -1,4 +1,4 @@
-import { listAnnouncement } from '@/api/announcement'
+import { listAnnouncement, addAnnouncement } from '@/api/announcement'
 
 const announcement = {
   actions: {
@@ -13,6 +13,15 @@ const announcement = {
           reject(error)
         })
       })
+    },
+    AddAnnouncement({ commit }, data) {
+      return new Promise((resolve, reject) => {
+        addAnnouncement(data).then(response => {
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
     }
   }
 }

VUECODE/smart-property-manage/src/views/social/activity/add/index.vue

@@ -117,7 +117,7 @@ export default {
             return false
           }
           this.ruleForm.status = 1 // 发布状态
-          this.$store.dispatch('AddActivity', this.ruleForm).then((res) => {
+          this.$store.dispatch('AddAnnouncement', this.ruleForm).then((res) => {
             if (res.code === '0') {
               this.$message({
                 message: res.message,

VUECODE/smart-property-manage/src/views/social/announcement/add.vue

@@ -17,7 +17,7 @@
         </el-upload>
       </el-form-item>
       <el-form-item label="活动详细描述">
-        <el-input v-model="ruleForm.activityContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等"/>
+        <el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="活动内容, 活动规则, 活动举办开始时间, 活动举办结束时间, 报名人数上限等"/>
       </el-form-item>
       <el-form-item label="活动配图">
         <el-upload
@@ -30,18 +30,9 @@
           <i class="el-icon-plus"/>
         </el-upload>
         <el-dialog :visible.sync="dialogVisible">
-          <img :src="dialogImageUrl" width="100%" alt="">
+          <img :src="announcementContentImg" width="100%" alt="">
         </el-dialog>
       </el-form-item>
-      <el-form-item label="报名人数上限" prop="signUpMax">
-        <el-input v-model="ruleForm.signUpMax" placeholder="填写0则不限制报名人数"/>
-      </el-form-item>
-      <el-form-item label="报名截止时间" prop="registrationEndTime">
-        <el-date-picker
-          v-model="ruleForm.registrationEndTime"
-          type="date"
-          placeholder="选择日期"/>
-      </el-form-item>
       <el-form-item label="权重值" prop="sort">
         <el-input-number v-model="ruleForm.sort" :min="1" :max="10" label="权重值" @change="sortHandleChange"/>
       </el-form-item>
@@ -59,12 +50,10 @@ export default {
   data() {
     return {
       ruleForm: {
-        activityTitle: '',
-        activityCarouselImg: '', // 轮播图
-        activityContent: '', // 活动内容详细
-        contentImg: [], // 活动内容配图
-        signUpMax: '', //  活动人数上限
-        registrationEndTime: '', // 报名活动结束时间
+        announcementTitle: '',
+        announcementCarouselImg: '', // 轮播图
+        announcementContent: '', // 公告内容详细
+        announcementContentImg: [], // 公告内容配图
         sort: 1, // 权重
         status: '' // 状态 0 是已作废 1 是已发布   2 是草稿 3 是已修改
       },
@@ -74,15 +63,9 @@ export default {
           { required: true, message: '请输入活动名称', trigger: 'blur' },
           { min: 1, max: 15, message: '长度在 15 个字符以内', trigger: 'blur' }
         ],
-        activityContent: [
+        announcementContent: [
           { required: true, message: '活动详细描述', trigger: 'blur' }
         ],
-        signUpMax: [
-          { required: true, message: '请输入报名人数上限', trigger: 'blur' }
-        ],
-        registrationEndTime: [
-          { type: 'date', required: true, message: '报名截止时间', trigger: 'change' }
-        ],
         sort: [
           { required: true, message: '请输入权重值', trigger: 'change' }
         ]
@@ -100,7 +83,7 @@ export default {
       })
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.ruleForm.activityContent.length <= 0 && this.ruleForm.contentImg.length <= 0) {
+          if (this.ruleForm.announcementContent.length <= 0 && this.ruleForm.announcementContentImg.length <= 0) {
             this.$message.error('活动内容描述 和 活动配图至少要存在一个!')
             return false
           }
@@ -146,20 +129,20 @@ export default {
       // }
       // return isJPG && isLt2M
     },
-    handleRemove(file, fileList) { // 活动配图移除时
-      this.ruleForm.contentImg = []
+    handleRemove(file, fileList) { // 配图移除时
+      this.ruleForm.announcementContentImg = []
       for (let i = 0; i < fileList.length; i++) {
-        this.ruleForm.contentImg.push(fileList[i].response.data[0])
+        this.ruleForm.announcementContentImg.push(fileList[i].response.data[0])
       }
       console.log(file, fileList)
     },
-    handlePictureCardPreview(file) { // 点击活动配图文件列表中已上传的文件时的钩子
-      this.dialogImageUrl = file.url
+    handlePictureCardPreview(file) { // 配图文件列表中已上传的文件时的钩子
+      this.announcementContentImg = file.url
       this.dialogVisible = true
     },
     handleSuccessContentImg(response, file, fileList) { // 活动配图上传成功时回调
       const resImg = response.data[0]
-      this.ruleForm.contentImg.push(resImg)
+      this.ruleForm.announcementContentImg.push(resImg)
       console.log('上传活动配图成功时回调!')
     },
     sortHandleChange(value) { // 权重值