Merge branch 'develop' into 'test'

src/components/Dialog/UserDialog.vue

@@ -20,7 +20,8 @@
       >
         <user-with-content
           :customerId="customerId"
-          :visible='visible'
+          :visible="visible"
+          :showMoney="showMoney"
           ref="userContent"
         >
           <button
@@ -59,6 +60,10 @@ export default {
   extends: Dialog,
   props: {
     customerId: Number,
+    showMoney: {
+      type: Boolean,
+      default: false,
+    },
   },
   // mounted() {
   //   let dialogWidth = 0;

src/containers/Dashboard/CustomerRecharge/chart.vue

@@ -259,7 +259,7 @@ export default {
             },
           },
           start: this.data.length - 4,
-          end: this.data.length - -1,
+          end: this.data.length - 1,
           minSpan: 4,
           maxSpan: 4,
           data: this.dataList,