Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

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

@@ -2,7 +2,7 @@
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-position="top" label-width="150px" class="ruleForm">
       <el-form-item  prop="activityTitle">
-        <div>活动标题&nbsp;&nbsp;<el-input v-model="ruleForm.activityTitle" placeholder="20字以内" style="width: 80%;padding-left:3.5%;"/></div>
+        <div>活动标题&nbsp;&nbsp;<el-input v-model="ruleForm.activityTitle" placeholder="20字以内" style="width: 80%;padding-left:5.5%;"/></div>
       </el-form-item>
       <el-form-item  prop="activityCarouselImg">
         <div >
@@ -195,6 +195,11 @@ export default {
         return
       }
        console.log('this.ruleForm.activityContent',this.ruleForm.activityContent)
+       if(this.ruleForm.activityContent == '<p><br></p>'){
+             this.$message.error('活动详情描述不能为空!')
+             loading.close()
+             return
+          }
       if (this.ruleForm.activityContent =='') {
         this.$message.error('活动详情描述不能为空')
         loading.close()

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

@@ -146,6 +146,11 @@ export default {
            loading.close()
            return
           }
+          if(this.ruleForm.activityContent == ''){
+             this.$message.error('活动详情描述不能为空!')
+             loading.close()
+             return
+          }
           this.ruleForm.status = 1 // 发布状态
           this.$store.dispatch('UpdateActivity', this.ruleForm).then((res) => {
             if (res.code === '0') {

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

@@ -52,7 +52,7 @@
         <div>权重值&nbsp;&nbsp;<el-input-number  v-model="ruleForm.sort" label="权重值" @change="sortHandleChange" style="margin-left:5%"/></div>
         
       </el-form-item>
-      <el-form-item style="margin-left:13%">
+      <el-form-item style="margin-left:11.5%">
         <el-button @click="resetForm('ruleForm','2')">存为草稿</el-button>
         <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
       </el-form-item>