Merge branch 'develop' into 'test'

src/containers/Dashboard/CustomerRegister/CustomerRegister.vue

@@ -108,3 +108,42 @@ export default {
   },
 };
 </script>
+
+<style lang="scss">
+.Dashboard {
+  .Dashboard-DataCard {
+    background-color: #fff;
+    border-radius: 8px;
+    margin-right: 8px;
+    &:last-child {
+      margin-right: 0;
+    }
+  }
+  .Dashboard-SearchBar {
+    display: flex;
+    padding: 10px 0 20px;
+  }
+  .Dashboard-CampusData {
+    display: flex;
+    padding: 0 15px;
+    .Dashboard-title {
+      position: relative;
+    }
+    .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;
+      }
+    }
+  }
+}
+</style>

src/containers/Dashboard/Dashboard.vue

@@ -133,28 +133,6 @@ export default {
     }
   }
 
-  .Dashboard-CampusData {
-    display: flex;
-    padding: 0 15px;
-    .Dashboard-title {
-      position: relative;
-    }
-    .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;
-      }
-    }
-  }
   .Dashboard-OperatorData {
     // flex: 1;
     display: flex;