Merge branch 'develop' into lmm

src/app/views/hushijiandan/hushijiandan.component.less

@@ -1319,6 +1319,7 @@
 
         .cont{
           flex: 1;
+          overflow: hidden;
         }
 
         .orders{
@@ -1355,6 +1356,7 @@
                   align-items: center;
                   gap: 24px;
                   padding: 0 16px;
+                  overflow: auto hidden;
                   .navItem{
                     display: flex;
                     align-items: center;
@@ -1363,6 +1365,7 @@
                       display: flex;
                       flex-direction: column;
                       height: 40px;
+                      flex: 1;
                     }
                     .navIcon{
                       color: #fff;
@@ -1395,6 +1398,7 @@
                     h2{
                       font-size: 12px;
                       font-weight: bold;
+                      white-space: nowrap;
                     }
                     .navSpecimen{
                       font-size: 12px;