合并

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

         </el-form-item>
         <div>
          <div> <hr style="height:1px;border:none;border-top:1px solid #FF8888;margin-right:100%"  width="100%"/></div>     
-         <div style="transform:translateY(120%);"><span style="font-size: 8px; color: #606266;">关联本小区其他房屋</span></div> 
+         <div style="transform:translateY(120%);"><span style="font-size:0.7vw; color: #606266;">关联本小区其他房屋</span></div> 
          <el-form-item>
           <table >
             <tr style="transform:translateY(-10%);">

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

 <template>
   <div id="root">
-    <div>公告标题&nbsp;&nbsp;<span class="activityTile">{{ ruleForm.activityTitle }}</span></div>
+    <div>活动标题&nbsp;&nbsp;<span class="activityTile">{{ ruleForm.activityTitle }}</span></div>
     <div >
         <div class="activityTile" style="transform:translateY(250%);">活动轮播图</div>
         <div  style="width: 500px;padding-left:20%;">
     <div class="activityContext">
       <div class="activityTile"><span style="position:relative;top:-1px">活动详细描述&nbsp;&nbsp;</span>{{ ruleForm.activityContent }}</div>
     </div>
-    <div class="activityContextImg">
-        <div >
-        <div class="activityTile" style="transform:translateY(250%);">活动轮播图</div>
+    <div>
+        <div>
+        <div style="transform:translateY(20%);">活动配图</div>
         <div  style="width: 500px;padding-left:20%;">
       <img v-for="item in ruleForm.contentImg" :src="item" width="80" height="80" />
         </div>
     </div>
     <span>
     <div style="display: flex;">
-          <span class="activityTile" style="width: 200px;transform:translateY(25%);">是否需要报名人扫码签到</span>
-          <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(30%);">需要</el-radio>
-          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(30%);">不需要</el-radio> 
+          <span class="activityTile" style="width: 200px;transform:translateY(50%);">是否需要报名人扫码签到</span>
+          <el-radio v-model="ruleForm.signInCode" label="1" style="padding-left:4%;font-weight:bold;font-size:12px;transform:translateY(50%);">需要</el-radio>
+          <el-radio v-model="ruleForm.signInCode" label="2" style="padding-left:8%;font-weight:bold;font-size:12px;transform:translateY(50%);">不需要</el-radio> 
           <span style="padding-left:20%"><el-button type="primary" style="float:left;" @click="singn">查看签到名单</el-button></span> 
     </div>
     <div style="padding-left:30%;" v-if="ruleForm.signInCode=='1'">