Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
郭成尧
2018-05-09 17:30:40 +0800
Commit
0a42fc2fa7f8e768234e24e4e53e6b3ab79b95ba
2 parents
69ccc88a
19e8eab7
Merge branch 'feature/apichange' into 'release/6.6'
family-bug-fixed See merge request
!1365
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
apps/home/models/family.js
public/js/home/family.page.js
apps/home/models/family.js
View file @
0a42fc2
...
...
@@ -463,9 +463,7 @@ class familyModel extends global.yoho.BaseModel {
return
b
.
proportion
-
a
.
proportion
;
});
if
(
integralData
.
total
)
{
chartsData
.
total
=
parseInt
(
result
.
data
.
total
,
10
)
<
99999
?
result
.
data
.
total
:
'99999+'
;
}
chartsData
.
total
=
parseInt
(
result
.
data
.
total
,
10
)
<
99999
?
result
.
data
.
total
:
'99999+'
;
_
.
forEach
(
integralData
.
data
,
function
(
data
)
{
list
.
push
({
...
...
public/js/home/family.page.js
View file @
0a42fc2
...
...
@@ -160,9 +160,7 @@ class FamilyIndex extends Page {
radius
:
[
this
.
selector
.
chartWidth
*
3
/
10
,
this
.
selector
.
chartWidth
*
43
/
100
],
roseType
:
'radius'
,
center
:
[
'50%'
,
'50%'
],
label
:
{
normal
:
false
},
label
:
false
,
data
:
result
.
list
}
]
...
...
Please
register
or
login
to post a comment