Merge branch 'develop' into 'test'

src/containers/Dashboard/CustomerRegister/CustomerRegister.vue

@@ -109,11 +109,6 @@ export default {
         return pre + curItem.count;
       }, 0);
     },
-    activeTotal() {
-      return this.activeUser.reduce((pre, curItem) => {
-        return curItem.mark === 'allActive' ? pre + curItem.count : pre;
-      }, 0);
-    },
   },
   mounted() {
     if (!this.reportMounted) {