合并

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

@@ -2,12 +2,12 @@
   <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="15字以内" style="width: 80%;padding-left:3.5%;"/></div>
+        <div>活动标题&nbsp;&nbsp;<el-input v-model="ruleForm.activityTitle" placeholder="15字以内" style="width: 80%;padding-left:5.8%;"/></div>
       </el-form-item>
       <el-form-item  prop="activityCarouselImg">
         <div >
           <div style="transform:translateY(250%);">活动轮播图</div>
-        <div  style="width: 500px;padding-left:20%;">
+        <div  style="width: 500px;padding-left:15%;">
         <el-upload
           :show-file-list="false"
           :on-success="handleAvatarSuccess"
@@ -23,7 +23,7 @@
       </el-form-item>
       <el-form-item>
        <span style="transform:translateY(700%)">活动详情描述</span>
-       <div style="padding-left:12%;transform:translateY(-15%)"><wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
+       <div style="padding-left:15%;transform:translateY(-15%)"><wangeditor :content="ruleForm.activityContent" @wangeditorEvent="wangeditorValue"/></div>
       </el-form-item>
       <!-- <el-form-item >
         <div >

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

@@ -1,14 +1,14 @@
 <template>
   <div id="root">
-    <div>活动标题&nbsp;&nbsp;<span style="padding-left:3%">{{ ruleForm.activityTitle }}</span></div>
+    <div>活动标题&nbsp;&nbsp;<span style="padding-left:4%">{{ ruleForm.activityTitle }}</span></div>
     <div >
         <div class="activityTile" style="transform:translateY(250%);">活动轮播图</div>
-        <div  style="width: 500px;padding-left:20%;">
-    <img :src="ruleForm.activityCarouselImg" width="100" height="100">
+        <div  style="width: 500px;padding-left:14.3%;">
+    <img :src="ruleForm.activityCarouselImg" width="150" height="150">
     </div>
     </div>
     <span style="transform:translateY(200%)">活动详情描述&nbsp;&nbsp;</span>
-    <div style="padding-left:12%" v-html="ruleForm.activityContent"></div>
+    <div style="padding-left:14.3%" v-html="ruleForm.activityContent"></div>
     <!-- <div>
         <div>
         <div style="transform:translateY(20%);">活动配图</div>