Merge branch 'develop' into 'test'

src/containers/Dashboard/CustomerRegister/CustomerRegister.vue

@@ -163,6 +163,14 @@ export default {
 .Dashboard {
   .Dashboard-Row.Dashboard-Register {
     height: auto;
+    .Dashboard-SearchBar {
+      .filter-item-label {
+        min-width: auto;
+        width: auto;
+      }
+    }
+  }
+
   .Dashboard-DataCard {
     background-color: #fff;
     border-radius: 8px;
@@ -174,10 +182,7 @@ export default {
   .Dashboard-SearchBar {
     display: flex;
     padding: 10px 0 20px;
-      .filter-item-label {
-        min-width: auto;
-        width: auto;
-      }
+
     .filter-item-input {
       width: 200px;
       .el-input {
@@ -211,6 +216,5 @@ export default {
       }
     }
   }
-  }
 }
 </style>

src/containers/HomePage/Home.vue

@@ -43,5 +43,6 @@ export default {
 <style lang="scss">
 .Home-Dashboard.Dashboard {
   padding: 22px 34px;
+  overflow-y: scroll;
 }
 </style>