Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -1057,10 +1057,10 @@
         border: 0;
     }
 }
-.operBtn.ant-btn {
-    margin-top: 9px;
-    margin-bottom: 6px;
-}
+// .operBtn.ant-btn {
+//     margin-top: 9px;
+//     margin-bottom: 6px;
+// }
 .ant-table-expanded-row {
     .btn-list {
         padding-right: 10px;
@@ -2051,6 +2051,7 @@ input:-internal-autofill-selected {
         .ant-table {
             .ant-table-body {
                 min-height: calc(100vh - 378px);
+                max-height: calc(100vh - 378px);
                 background: @m-black2;
             }
         }
@@ -2059,6 +2060,7 @@ input:-internal-autofill-selected {
         .ant-table {
             .ant-table-body {
                 min-height: calc(100vh - 138px);
+                max-height: calc(100vh - 138px);
             }
         }
     }
@@ -2080,6 +2082,7 @@ input:-internal-autofill-selected {
         .ant-table {
             .ant-table-body {
                 min-height: calc(100vh - 407px);
+                max-height: calc(100vh - 407px);
                 background: @m-black2;
             }
         }
@@ -2088,6 +2091,7 @@ input:-internal-autofill-selected {
         .ant-table {
             .ant-table-body {
                 min-height: calc(100vh - 167px);
+                max-height: calc(100vh - 167px);
                 background: @m-black2;
             }
         }
@@ -2099,6 +2103,7 @@ input:-internal-autofill-selected {
         .ant-table {
             .ant-table-body {
                 min-height: calc(100vh - 443px);
+                max-height: calc(100vh - 443px);
                 background: @m-black2;
             }
         }
@@ -2107,6 +2112,7 @@ input:-internal-autofill-selected {
         .ant-table {
             .ant-table-body {
                 min-height: calc(100vh - 196px);
+                max-height: calc(100vh - 196px);
                 background: @m-black2;
             }
         }
@@ -2219,10 +2225,12 @@ input:-internal-autofill-selected {
 .buyHallTable,.sellHallTable {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
         min-height: calc(100vh - 378px);
+        max-height: calc(100vh - 378px);
     }
     .ant-table {
         .ant-table-tbody {
             min-height: calc(100vh - 378px);
+            max-height: calc(100vh - 378px);
         }
     }
 }
@@ -2239,10 +2247,12 @@ input:-internal-autofill-selected {
 .buyHallTableHigh,.sellHallTableHigh {
     .ant-table-fixed-header > .ant-table-content > .ant-table-scroll > .ant-table-body {
         min-height: calc(100vh - 135px);
+        max-height: calc(100vh - 135px);
     }
     .ant-table {
         .ant-table-tbody {
             min-height: calc(100vh - 135px);
+            max-height: calc(100vh - 135px);
         }
     }
 }