Merge branch 'develop' into 'test'

src/containers/Dashboard/CustomerConsumption/CustomerConsumption.vue

@@ -8,14 +8,14 @@
         class="CustomerConsumptionChart-tip"
         style="color:#333;font-size:14px;text-align: center;"
       >
-        合计消费总金额：<span
+        消费总金额：<span
           class="CustomerConsumption-total"
           style="color:#f00;"
         >0.00元</span>
-        合计消费人数：<span
+        消费笔数：<span
           class="CustomerConsumption-count"
           style="color:#f00;"
-        >0人</span>
+        >0笔</span>
       </div>
     </div>
     <Chart

src/containers/Dashboard/CustomerConsumption/chart.vue

@@ -71,7 +71,7 @@ export default {
             ? this.consumeCount.payMen
             : '0';
         this.totalDom.innerHTML = money + '元';
-        this.countDom.innerHTML = menCount + '人';
+        this.countDom.innerHTML = menCount + '笔';
       }
     },
   },

src/containers/Dashboard/CustomerRecharge/CustomerRecharge.vue

@@ -13,8 +13,8 @@
         <span
           class="CustomerRecharge-tooltip"
           style="background-color:#26c9a8;"
-        ></span> 充值人数：
-        <span style="color:#f00;">{{ rechargeCount && rechargeCount.rechargeMen ? rechargeCount.rechargeMen : 0 }}人</span>
+        ></span> 充值笔数：
+        <span style="color:#f00;">{{ rechargeCount && rechargeCount.rechargeMen ? rechargeCount.rechargeMen : 0 }}笔</span>
       </div>
     </div>
     <Chart :data="rechargeList" />

src/containers/Dashboard/CustomerRecharge/chart.vue

@@ -156,7 +156,7 @@ export default {
           alias: '充值金额',
         },
         rechargeMen: {
-          alias: '充值人数',
+          alias: '充值笔数',
         },
       });
 
@@ -191,7 +191,7 @@ export default {
       this.chart.guide().text({
         top: true,
         position: ['100%', '0%'],
-        content: '(人)',
+        content: '(笔)',
         offsetX: 30,
         offsetY: -8,
       });