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
郭成尧
7 years ago
Commit
6668ab8e2b6a1e0b080086013e1b15c27d65398a
2 parents
5910cb47
8dfc6db9
Merge branch 'feature/growthdetail' into release/6.5.3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
apps/activity/controllers/grade.js
public/js/activity/grade/detail.js
public/js/home/family.page.js
apps/activity/controllers/grade.js
View file @
6668ab8
...
...
@@ -121,7 +121,7 @@ class Grade {
if
(
vipNav
[
findex
])
{
vipNav
[
findex
].
active
=
true
;
}
else
{
}
else
if
(
vipNav
[
0
])
{
vipNav
[
0
].
active
=
true
;
}
...
...
@@ -131,7 +131,7 @@ class Grade {
vipNav
:
droitUtil
.
droitHtml
(
vipNav
),
width750
:
true
,
title
:
'会员权益说明'
,
bgcolor
:
'#444
444
'
,
bgcolor
:
'#444'
,
localCss
:
true
});
}).
catch
(
next
);
...
...
public/js/activity/grade/detail.js
View file @
6668ab8
...
...
@@ -68,12 +68,8 @@ class GradeDetailPage extends Page {
this
.
view
.
levelStr
.
text
(
result
.
levelStr
);
this
.
eGradeGraph
.
setOption
(
graphOptions
(
result
.
graphData
));
this
.
view
.
loadingMask
.
addClass
(
'hide'
);
}
else
if
(
result
.
code
===
202
)
{
this
.
view
.
loadingLogoText
.
addClass
(
'hide'
);
}
else
{
setTimeout
(()
=>
{
this
.
graphRender
();
},
2000
);
this
.
view
.
loadingLogoText
.
addClass
(
'hide'
);
}
});
}
...
...
public/js/home/family.page.js
View file @
6668ab8
...
...
@@ -323,6 +323,10 @@ class FamilyIndex extends Page {
let
isLogin
=
$this
.
data
(
'login'
);
let
isNoOpen
=
$this
.
data
(
'noopen'
);
if
(
appType
===
'yohobuy'
)
{
return
;
}
if
(
!
this
.
vipInfo
||
!
this
.
vipInfo
[
appType
])
{
this
.
viewVipInfo
();
return
false
;
...
...
Please
register
or
login
to post a comment