Merge branch 'develop' into 'test'

src/containers/Dashboard/CustomerRegister/CustomerRegister.vue

@@ -109,7 +109,7 @@ export default {
     },
     activeTotal() {
       return this.activeUser.reduce((pre, curItem) => {
-        return pre + curItem.count;
+        return curItem.mark === 'allActive' ? pre + curItem.count : pre;
       }, 0);
     },
   },
@@ -160,6 +160,7 @@ export default {
 </script>
 
 <style lang="scss">
+@import '@/assets/styles/variables.scss';
 .Dashboard {
   .Dashboard-Row.Dashboard-Register {
     height: auto;
@@ -170,7 +171,16 @@ export default {
       }
     }
   }
-
+  .Dashboard-title {
+    font-size: 20px;
+    color: #333;
+    font-weight: 700;
+  }
+  @media screen and (max-width: $bigScreenWidth) {
+    .Dashboard-title {
+      font-size: 14px;
+    }
+  }
   .Dashboard-DataCard {
     background-color: #fff;
     border-radius: 8px;
@@ -182,7 +192,9 @@ export default {
   .Dashboard-SearchBar {
     display: flex;
     padding: 10px 0 20px;
-
+    .filter-item {
+      margin: 0 0 0 34px;
+    }
     .filter-item-input {
       width: 200px;
       .el-input {

src/containers/HomePage/Home.vue

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