Merge branch 'develop' into 'test'

src/containers/Dashboard/CampusRank/CampusRankChart.vue

@@ -51,7 +51,7 @@ export default {
         position: 'right-center',
         marker: 'square',
         clickable: false,
-        offsetX: -10,
+        offsetX: -4,
         useHtml: true,
         containerTpl: `
          <div class="g2-legend">
@@ -71,8 +71,8 @@ export default {
                 class="g2-legend-marker"
                 style="display:inline-block;margin-right:10px;background-color:${color};"
               ></i>
-              <span class="g2-legend-text">${value}： </span>
-              <span>${obj.count}</span>
+              <span class="g2-legend-text" title="${value}">${value}： </span>
+              <span>${obj.count.toFixed(2)}</span>
             </li>
             `;
         },
@@ -85,6 +85,13 @@ export default {
         'g2-legend-list-item': {
           color: '#333',
         },
+        'g2-legend-text': {
+          display: 'inline-block',
+          width: '100px',
+          overflow: 'hidden',
+          'text-overflow': 'ellipsis',
+          'white-space': 'nowrap',
+        },
         'g2-legend-marker': {
           width: '10px',
           height: '5px',
@@ -194,5 +201,13 @@ export default {
     max-height: 270px;
     overflow-y: auto;
   }
+  .g2-legend-text {
+    display: inline-block;
+    width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    vertical-align: middle;
+  }
 }
 </style>

src/containers/Dashboard/CustomerData/CustomerData.vue

@@ -34,6 +34,7 @@
         >本年</el-radio>
       </el-radio-group>
       <el-button
+        :loading="consumptionLoading||rechargeLoading"
         type="primary"
         @click="fetchAllData"
       >搜索</el-button>
@@ -60,6 +61,12 @@ export default {
   },
   computed: {
     ...mapGetters('Dashboard/customerData', ['filters']),
+    ...mapGetters('Dashboard/customerData/customerConsumption', {
+      consumptionLoading: 'loading',
+    }),
+    ...mapGetters('Dashboard/customerData/customerRecharge', {
+      rechargeLoading: 'loading',
+    }),
   },
   methods: {
     ...mapActions('Dashboard/customerData', ['updateFilters']),

src/containers/Dashboard/SeviceRatio/SeviceRatioChart.vue

@@ -46,6 +46,7 @@ export default {
         position: 'right-center',
         marker: 'square',
         clickable: false,
+        offsetX: -10,
         useHtml: true,
         containerTpl: `
          <div class="g2-legend">
@@ -71,7 +72,7 @@ export default {
             `;
         },
         'g2-legend': {
-          width: '125px',
+          width: '140px',
           // left: '-20px',
         },
         'g2-legend-list-item': {

src/mixins/user/userBaseInfo.js

@@ -63,7 +63,7 @@ export default {
   methods: {
     ...mapActions(['fetchUserBaseInfo', 'fetchUserBaseInfoByPhone']),
     getAllData() {
-      console.log('in getAllData', this.showMoney);
+      // console.log('in getAllData', this.customerId, this.customerPhone);
 
       if (this.showMoney) {
         const entity = this.customerId