Merge remote-tracking branch 'origin/develop' into develop

src/pages/details/otherStandardDetails/index.vue

@@ -63,7 +63,7 @@
                 <p class="half">
                   <label style=" margin-right: 132px;"
                          title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
-                  >文本状态<i class="el-icon-warning-outline"></i></label>
+                  >文本状态</label>
                   <span style="color: #409EFF;">{{ textStatusMap[sarStandardsInfoEO.textStatus] || '-' }}</span>
                 </p>
                 <p class="half"><label style=" margin-right: 150px;">发布日期</label><span>{{
@@ -3073,8 +3073,6 @@ export default {
     /*padding: 0 67px;*/
 
     .details-content-modular {
-      margin-bottom: 20px;
-
       .modular-header {
         display: flex;
         align-items: center;

src/pages/details/process/ruku/index.vue

@@ -5,7 +5,7 @@
       <span>{{ title }}</span>
     </div>
     <div class="details-content">
-      <div class="details-content-modular basic-information">
+      <div class="details-content-modular basic-information" style="margin-bottom: 0;">
         <div class="modular-header">
           <div class="modular-header-title"><i class="icon-modular-title" /><span>标准信息</span>
           </div>
@@ -2737,7 +2737,7 @@ export default {
   /deep/.details-content{
     /*padding: 0 67px;*/
     .details-content-modular{
-      margin-bottom: 20px;
+      /*margin-bottom: 20px;*/
       .modular-header{
         display: flex;
         align-items: center;