Merge branch 'develop' into 'test'

src/containers/Dashboard/CustomerRegister/CustomerRegister.vue

@@ -26,14 +26,16 @@
         >搜索</el-button>
       </search-item>
     </div>
+    <div class="more-info">
+      {{ reportYear }}年注册人数为：{{ registeYearTotal }}人；平台注册会员总数: {{ registeTotal }}人；平台活跃会员总数：{{ activeTotal }}人
+    </div>
     <div class="Dashboard-CampusData">
       <div
         class="Dashboard-CampusItem"
         v-loading="loading.regist"
       >
         <div class="Dashboard-title">
-          <span>{{ reportYear }}年每月注册数据</span>
-          <span class="more-info">{{ reportYear }}年注册人数为： {{ registeYearTotal }}人；截止到目前为止注册会员总数: {{ registeTotal }}人</span>
+          {{ reportYear }}年每月注册数据
         </div>
         <RegisterByMonth
           :data="registePerMonth"
@@ -58,8 +60,7 @@
         v-loading="loading.regist"
       >
         <div class="Dashboard-title">
-          <span>{{ reportYear }}年每月活跃数据</span>
-          <span class="more-info">截止{{ today }}，系统总活跃人数为：{{ activeTotal }}人</span>
+          {{ reportYear }}年每月活跃数据
         </div>
         <ActiveUserByMonth :data="activeUser" />
       </div>
@@ -101,6 +102,7 @@ export default {
       'reportMounted',
       'filters',
       'registeTotal',
+      'activeTotal',
     ]),
     registeYearTotal() {
       return this.registePerMonth.reduce((pre, curItem) => {
@@ -189,6 +191,11 @@ export default {
       margin-right: 0;
     }
   }
+  .more-info {
+    margin: 15px;
+    font-weight: normal;
+    color: #f70707;
+  }
   .Dashboard-SearchBar {
     display: flex;
     padding: 10px 0 20px;
@@ -205,12 +212,9 @@ export default {
   .Dashboard-CampusData {
     display: flex;
     padding: 0 15px;
+    margin-bottom: 16px;
     .Dashboard-title {
       position: relative;
-      .more-info {
-        margin-left: 20px;
-        font-weight: normal;
-      }
     }
     .Dashboard-title::before {
       content: '';

src/containers/Dashboard/Dashboard.js

@@ -62,6 +62,7 @@ const state = () => ({
     registePerMonth: [],
     activeUser: [],
     customerCount: 0,
+    activeCount: 0,
   },
   title: {
     activeCount: 0,
@@ -77,6 +78,7 @@ const getters = {
   registePerDay: state => state.report.registePerDay,
   registePerMonth: state => state.report.registePerMonth,
   registeTotal: state => state.report.customerCount,
+  activeTotal: state => state.report.activeCount,
   activeUser: state => state.report.activeUser,
   titleData: state => state.title,
   areaInfo: state => state.consume.areaInfo,
@@ -236,6 +238,7 @@ const mutations = {
   },
   [GET_REPORT_DATA]: (state, data) => {
     state.report.customerCount = data.customerCount ? data.customerCount : 0;
+    state.report.activeCount = data.activeCount ? data.activeCount : 0;
 
     state.report.year = data.year;
     state.report.month = data.month;