Merge branch 'develop' into 'test'

src/containers/Dashboard/CustomerConsumption/chart.vue

@@ -46,6 +46,9 @@ export default {
         .color('serviceName', ['#4e82fb', '#fb774e', '#ffc934', '#41bf52'])
         .label('payableMoney', {
           offset: 10,
+          formatter: val => {
+            return this.$formatPrice(Number(val));
+          },
         });
 
       this.chart.render();
@@ -64,7 +67,7 @@ export default {
       if (this.totalDom && this.countDom) {
         let money =
           this.consumeCount && this.consumeCount.payableMoney
-            ? this.consumeCount.payableMoney
+            ? this.$formatPrice(this.consumeCount.payableMoney)
             : '0.00';
         let menCount =
           this.consumeCount && this.consumeCount.payMen

src/containers/Dashboard/CustomerRecharge/CustomerRecharge.vue

@@ -9,7 +9,7 @@
           class="CustomerRecharge-tooltip"
           style="background-color:#4e82fb;"
         ></span> 总充值：
-        <span style="color:#f00;">{{ rechargeCount && rechargeCount.rechargeMoney ? (rechargeCount.rechargeMoney).toFixed(2) : '0.00' }}元</span>
+        <span style="color:#f00;">{{ rechargeCount && rechargeCount.rechargeMoney ? $formatPrice(rechargeCount.rechargeMoney) : '0.00' }}元</span>
         <span
           class="CustomerRecharge-tooltip"
           style="background-color:#26c9a8;"