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

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

       <el-form-item  prop="announcementCarouselImg" >
         <div >
           <div style="transform:translateY(250%);">公告轮播图</div>
-        <div  style="width: 500px;padding-left:20%;">
+        <div  style="width: 500px;padding-left:12%;">
         <el-upload 
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
       </el-form-item>
       <el-form-item label="" prop="announcementContent">     
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
-          <div>公告内容<span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>                          
+          <span style="transform:translateY(700%)">公告内容</span>
+          <div style="padding-left:12%;transform:translateY(-15%)"><span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>                          
       </el-form-item>
       <!-- <el-form-item label="">
         <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>

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

 <template>
   <div id="root">
     <el-form ref="form" label-width="100px" label-position="left">
-      <el-form-item label="公告标题">
-        <span class="activityTile">{{ ruleForm.announcementTitle }}</span>
+      <el-form-item>
+        <div>公告标题&nbsp;&nbsp;<span style="width: 80%;padding-left:3.5%;">{{ ruleForm.announcementTitle }} </span></div>
+        <!-- <span class="activityTile">{{ ruleForm.announcementTitle }}</span> -->
       </el-form-item>
-      <el-form-item label="公告轮播图">
-        <span style="color: #99a9bf;">轮播图为横幅位展示图片，不会显示在公告详情页</span>
+      <el-form-item>
+        <div style="transform:translateY(90%);">公告轮播图&nbsp;&nbsp;&nbsp;&nbsp;<span style="color: #99a9bf;">轮播图为横幅位展示图片，不会显示在公告详情页</span></div>
+        
         <br>
-        <img :src="ruleForm.announcementCarouselImg" width="100" height="100">
+        <img :src="ruleForm.announcementCarouselImg"  width="320" height="150" style="padding-left:18%;transform:translateY(20%)">
       </el-form-item>
-      <el-form-item label="公告详细内容">
-        <div class="activityContext">
-         <span id="father"><wangeditor :content="ruleForm.announcementContent" style="height:380px;"/></span>
-        </div>
-      </el-form-item>
-      <el-form-item label="权重值" prop="sort">
-        <div><el-input-number v-model="ruleForm.sort" label="权重值"/></div>
+      <el-form-item>
+         <div>
+        <div style="transform:translateY(135%)">公告内容&nbsp;&nbsp;</div>
+        <div style="padding-left:18.3%" v-html=" ruleForm.announcementContent"></div>
+         </div>
+       
       </el-form-item>
+        <div style="padding-left:17%;transform:translateY(-20%)">权重值&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<el-input-number v-model="ruleForm.sort"/></div>
     </el-form>
     <div class="bom-button">
       <el-button v-if="isEdi" type="primary" style="width: 150px;" @click="edi">修改</el-button>
 }
 .activityTile{
   text-align: center;
-  font-size: 30px;
+  font-size: 20px;
   margin-bottom: 10px;
 }
 .activityContext{
   /*margin-top: 20px;*/
-  margin-bottom: 20px;
+  /* margin-bottom: 20px;
   font-size: 20px;
-  justify-items: center;
+  justify-items: center; */
 }
 /* .progress {
   display: flex;
   justify-content: center;
   margin-top: -20px;
   margin-bottom: 100px;
+  margin-left:-10%;
+  transform:translateY(100%)
 }
 </style>

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

       <el-form-item  prop="announcementCarouselImg">
         <div >
           <div style="transform:translateY(250%);">公告轮播图</div>
-          <div  style="width: 500px;padding-left:20%;">
+          <div  style="width: 500px;padding-left:12%;">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
       </el-form-item>
       <el-form-item label="" prop="announcementContent">     
           <!-- <el-input v-model="addForm.bannerContent" placeholder="内容详情"/> -->
-          <div>公告内容<span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>                          
+          <span style="transform:translateY(700%)">公告内容</span>
+          <div style="padding-left:12%;transform:translateY(-15%)"><span id="father"><wangeditor :content="ruleForm.announcementContent" @wangeditorEvent="wangeditorValue"/></span></div>                          
       </el-form-item>
       <!-- <el-form-item >
         <div><span style="position:relative;top:-100px">公告详细描述&nbsp;&nbsp;</span><el-input v-model="ruleForm.announcementContent" :rows="10" type="textarea" placeholder="公告内容" style="width: 80%;"/></div>
       <el-form-item  prop="sort">
         <div>权重值&nbsp;&nbsp;<el-input-number v-model="ruleForm.sort" label="权重值" @change="sortHandleChange" style="margin-left:5%"/></div>
       </el-form-item>
-      <el-form-item>
+      <el-form-item style="margin-left:12%">
         <el-button type="primary" @click="submitForm('ruleForm','1')">发布</el-button>
       </el-form-item>
     </el-form>
         if (valid) {
           this.ruleForm.status = status // 发布状态
           if(this.ruleForm.announcementContent === '<p><br></p>'){
-             this.$message.error('公告内容描述不能为空!')
+             this.$message.error('公告内容不能为空!')
              loading.close()
              return
           }