fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit 0a42fc2fa7f8e768234e24e4e53e6b3ab79b95ba 2 parents 69ccc88a 19e8eab7

Merge branch 'feature/apichange' into 'release/6.6' 

family-bug-fixed



See merge request !1365
Inline Side-by-side
Showing 2 changed files with 1 additions and 5 deletions
@@ -463,9 +463,7 @@ class familyModel extends global.yoho.BaseModel { @@ -463,9 +463,7 @@ class familyModel extends global.yoho.BaseModel {
463 return b.proportion - a.proportion; 463 return b.proportion - a.proportion;
464 }); 464 });
465 465
466 - if (integralData.total) {  
467 chartsData.total = parseInt(result.data.total, 10) < 99999 ? result.data.total : '99999+'; 466 chartsData.total = parseInt(result.data.total, 10) < 99999 ? result.data.total : '99999+';
468 - }  
469 467
470 _.forEach(integralData.data, function(data) { 468 _.forEach(integralData.data, function(data) {
471 list.push({ 469 list.push({
@@ -160,9 +160,7 @@ class FamilyIndex extends Page { @@ -160,9 +160,7 @@ class FamilyIndex extends Page {
160 radius: [this.selector.chartWidth * 3 / 10, this.selector.chartWidth * 43 / 100], 160 radius: [this.selector.chartWidth * 3 / 10, this.selector.chartWidth * 43 / 100],
161 roseType: 'radius', 161 roseType: 'radius',
162 center: ['50%', '50%'], 162 center: ['50%', '50%'],
163 - label: {  
164 - normal: false  
165 - }, 163 + label: false,
166 data: result.list 164 data: result.list
167 } 165 }
168 ] 166 ]