Merge branch 'develop' into 'test'

src/containers/Dashboard/CustomerRegister/CustomerRegister.vue

@@ -163,52 +163,56 @@ export default {
 .Dashboard {
   .Dashboard-Row.Dashboard-Register {
     height: auto;
-    .Dashboard-DataCard {
-      background-color: #fff;
-      border-radius: 8px;
-      margin-right: 8px;
-      &:last-child {
-        margin-right: 0;
-      }
-    }
     .Dashboard-SearchBar {
-      display: flex;
-      padding: 10px 0 20px;
       .filter-item-label {
         min-width: auto;
         width: auto;
       }
-      .filter-item-input {
-        width: 200px;
-        .el-input {
-          width: 100%;
-        }
-      }
     }
-    .Dashboard-CampusData {
-      display: flex;
-      padding: 0 15px;
-      .Dashboard-title {
-        position: relative;
-        .more-info {
-          margin-left: 20px;
-          font-weight: normal;
-        }
+  }
+
+  .Dashboard-DataCard {
+    background-color: #fff;
+    border-radius: 8px;
+    margin-right: 8px;
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+  .Dashboard-SearchBar {
+    display: flex;
+    padding: 10px 0 20px;
+
+    .filter-item-input {
+      width: 200px;
+      .el-input {
+        width: 100%;
       }
-      .Dashboard-title::before {
-        content: '';
-        position: absolute;
-        bottom: -12px;
-        left: 0;
-        width: 32px;
-        height: 4px;
-        background-color: #4e82fb;
+    }
+  }
+  .Dashboard-CampusData {
+    display: flex;
+    padding: 0 15px;
+    .Dashboard-title {
+      position: relative;
+      .more-info {
+        margin-left: 20px;
+        font-weight: normal;
       }
-      .Dashboard-CampusItem {
-        flex: 1;
-        &:nth-child(2) {
-          flex: 1.4;
-        }
+    }
+    .Dashboard-title::before {
+      content: '';
+      position: absolute;
+      bottom: -12px;
+      left: 0;
+      width: 32px;
+      height: 4px;
+      background-color: #4e82fb;
+    }
+    .Dashboard-CampusItem {
+      flex: 1;
+      &:nth-child(2) {
+        flex: 1.4;
       }
     }
   }

src/containers/HomePage/Home.vue

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