Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/components/PageContent/index.js

@@ -18,7 +18,7 @@ export default (props) => {
           <CloseOutlined
             onClick={handleClose}
             className={styles.close}
-            style={{ top: tabs ? 65 : '' }}
+            style={{ top: tabs ? 42.5 : '' }}
           />
         )}
 

src/components/PageTitle/index.less

@@ -10,6 +10,8 @@
   margin-right: 18px;
 }
 .title {
+  display: inline-block;
+  width: 100%;
   font-size: 36px;
   font-weight: 400;
   color: #000000;

src/components/TabsContent/index.less

@@ -1,7 +1,7 @@
 .tabsTitle {
   display: flex;
   align-items: center;
-  height: 116px;
+  height: 80px;
   margin-bottom: 10px;
   width: 100%;
   overflow-x: auto;
@@ -32,7 +32,7 @@
   padding: 20px 0;
   .tabsItem {
     font-size: 28px;
-    padding: 0 30px; 
+    padding: 0 30px;
     &:last-child {
       padding-right: 0;
     }