Merge branch 'develop' into 'test'

src/containers/Dashboard/CampusRank/CampusRankChart.vue

@@ -78,8 +78,9 @@ export default {
         },
         'g2-legend': {
           width: '230px',
+          'max-width': '230px',
           'max-height': this.height + 'px',
-          // left: '-20px',
+          right: 0,
         },
         'g2-legend-list-item': {
           color: '#333',

src/mixins/user/userBaseInfo.js

@@ -66,9 +66,14 @@ export default {
       console.log('in getAllData', this.showMoney);
 
       if (this.showMoney) {
-        fetchUserAccount({
+        const entity = this.customerId
+          ? {
               customerId: this.customerId,
-        })
+            }
+          : {
+              customerPhone: this.customerPhone,
+            };
+        fetchUserAccount(entity)
           .then(res => {
             this.serviceList = res.data;
           })