4483

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -157,7 +157,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         }
 
         if ("".equals(tpActivity.getActivityContent())){
-            responseBean.addError("活动内容描述不能为空");
+            responseBean.addError("活动详情描述不能为空");
             return responseBean;
         }
 

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

@@ -194,11 +194,12 @@ export default {
         loading.close()
         return
       }
-      // if (this.ruleForm.activityContent =='<p><br></p>') {
-      //   this.$message.error('活动内容描述不能为空')
-      //   loading.close()
-      //   return
-      // }
+       console.log('this.ruleForm.activityContent',this.ruleForm.activityContent)
+      if (this.ruleForm.activityContent =='') {
+        this.$message.error('活动详情描述不能为空')
+        loading.close()
+        return
+      }
       this.ruleForm.status = status // 发布状态  1 是已发布   2 是草稿
       console.log(' this.ruleForm', this.ruleForm.activityContent)
       this.$store.dispatch('AddActivity', this.ruleForm).then((res) => {

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

@@ -142,7 +142,7 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
            if (this.ruleForm.activityContent =='<p><br></p>') {
-           this.$message.error('活动内容描述不能为空')
+           this.$message.error('活动详情描述不能为空')
            loading.close()
            return
           }

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

@@ -114,7 +114,14 @@ export default {
           //   return
           // }
           this.ruleForm.status = status // 发布状态
-         if(this.ruleForm.announcementContent === '<p><br></p>'){
+          console.log('this.ruleForm.announcementContent',this.ruleForm.announcementContent)
+
+          if(this.ruleForm.announcementContent == '<p><br></p>'){
+             this.$message.error('公告内容描述不能为空!')
+             loading.close()
+             return
+          }
+         if(this.ruleForm.announcementContent == ''){
              this.$message.error('公告内容描述不能为空!')
              loading.close()
              return
@@ -191,7 +198,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style>
 #root {
   display: flex;
 }

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

@@ -109,11 +109,16 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.ruleForm.status = status // 发布状态
-          if(this.ruleForm.announcementContent === '<p><br></p>'){
+          if(this.ruleForm.announcementContent == '<p><br></p>'){
              this.$message.error('公告内容不能为空!')
              loading.close()
              return
           }
+          if(this.ruleForm.announcementContent == ''){
+             this.$message.error('公告内容描述不能为空!')
+             loading.close()
+             return
+          }
           this.$store.dispatch('Updateannouncement', this.ruleForm).then((res) => {
             if (res.code === '0') {
               this.$message({