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

# Conflicts:
#	src/sysConfig/index.js

src/pages/regulatoryRepository/standardForComments/pags/categoryDetails.vue

@@ -5,6 +5,7 @@
       <div class="back" title="返回" @click="back">
         <i class="el-icon-back"></i>
       </div>
+      <div class="title">{{opinionList.standardName }}<i class="el-icon-s-order" @click="heightShow = !heightShow"></i></div>
       <div class="title">管理征求意见<i class="el-icon-s-order" @click="heightShow = !heightShow"></i></div>
     </div>
     <transition name="el-zoom-in-top">
@@ -64,7 +65,6 @@
             label="提出人"
             width="170">
           </el-table-column>
-
         </el-table>
       </div>
     </div>
@@ -226,7 +226,7 @@ export default {
       line-height: 35px;
       .transition-box-label{
         display: inline-block;
-        width: 80px;
+        width: 100px;
         vertical-align: top;
       }
       .transition-box-span{
@@ -268,6 +268,10 @@ export default {
       }
     }
   }
+  .effect {
+    margin-left: 10px;
+    margin-bottom: 10px;
+  }
   .container {
     //height: calc(~'100% - 52px - 55px - 50px');
     flex: auto;

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -297,6 +297,7 @@ export default {
   }
   .effect {
     margin-left: 10px;
+    margin-bottom: 10px;
   }
   .container {
     height: calc(~'100% - 52px - 55px - 50px');