Toggle navigation
Toggle navigation
This project
Loading...
Sign in
张泽世
/
yohobuywap-node
·
Commits
Go to a project
GitLab
Go to dashboard
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
biao
2016-06-21 18:39:50 +0800
Commit
a98870b391f4579feeabb8f41e741c12ac5d60b3
2 parents
92766077
d2de9927
Merge branch 'release/4.6' of
http://git.yoho.cn/fe/yohobuywap-node
into release/4.6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
3 additions
and
9 deletions
apps/guang/views/partial/star/index-html.hbs
doraemon/middleware/error-handler.js
public/js/guang/star.page.js
public/scss/guang/star/_collocation.css
public/scss/guang/star/_special.css
public/scss/guang/star/_star.css
apps/guang/views/partial/star/index-html.hbs
View file @
a98870b
...
...
@@ -12,7 +12,7 @@
<ul
class=
"clearfix swiper-wrapper"
>
{{#
starAvatar
}}
<li
class=
"swiper-slide"
>
<a
class=
"rank-avatar"
href=
'
{{
url
}}
'
data-avatar=
"
{{
image
cover
180
180
}}
"
></a>
<a
href=
'
{{
url
}}
'
><img
src=
"
{{
image
cover
180
180
}}
"
/
></a>
</li>
{{/
starAvatar
}}
</ul>
...
...
doraemon/middleware/error-handler.js
View file @
a98870b
...
...
@@ -32,6 +32,7 @@ exports.notFound = () => {
*/
exports
.
serverError
=
()
=>
{
return
(
err
,
req
,
res
,
next
)
=>
{
logger
.
error
(
err
);
if
(
!
res
.
headersSent
)
{
if
(
req
.
xhr
)
{
return
res
.
status
(
500
).
json
({
...
...
@@ -40,7 +41,6 @@ exports.serverError = () => {
});
}
logger
.
error
(
err
);
return
res
.
render
(
'error/500'
,
{
err
:
err
,
module
:
'common'
,
...
...
public/js/guang/star.page.js
View file @
a98870b
...
...
@@ -255,10 +255,6 @@ getIndexHtml = function() {
$avatarClone
.
remove
();
}
$
(
'.avatar li'
).
each
(
function
()
{
setAvatar
(
$
(
this
).
find
(
'span'
));
});
$starMain
.
before
(
$
(
'.avatar-swiper'
).
clone
().
addClass
(
'avatar-clone'
).
hide
());
$avatarClone
=
$
(
'.avatar-clone'
);
...
...
public/scss/guang/star/_collocation.css
View file @
a98870b
...
...
@@ -11,7 +11,6 @@
li
{
float
:
left
;
width
:
100%
;
margin-top
:
30px
;
background
:
#000
;
.cont-area
{
...
...
public/scss/guang/star/_special.css
View file @
a98870b
...
...
@@ -9,7 +9,6 @@
width
:
100%
;
float
:
left
;
background
:
#000
;
margin-top
:
30px
;
img
{
width
:
100%
;
...
...
public/scss/guang/star/_star.css
View file @
a98870b
...
...
@@ -139,7 +139,7 @@
width
:
110px
;
height
:
110px
;
margin-top
:
34px
;
background
:
#
282828
;
background
:
#
000
;
span
{
display
:
block
;
...
...
Please
register
or
login
to post a comment