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
陈峰
2017-01-18 17:39:15 +0800
Commit
51734fcc05544e98bf329310a045a53be7a54fab
2 parents
64a4c4f2
0fb583c4
Merge branch 'feature/new-goods' into 'release/5.4'
新品到着产品验收问题整改 See merge request
!175
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
12 deletions
apps/product/controllers/new.js
public/scss/product/new-arrival.page.css
public/scss/product/new/_article.css
public/scss/product/new/_brand-info.css
public/scss/product/new/_good-tags.css
public/scss/product/new/_handlepick.css
public/scss/product/new/_recommend.css
apps/product/controllers/new.js
View file @
51734fc
...
...
@@ -77,7 +77,6 @@ const _newGoods = (req, res, next) => {
res
.
render
(
'new/index'
,
{
module
:
'product'
,
page
:
'new-arrival'
,
width750
:
true
,
localCss
:
true
,
pageHeader
:
headerModel
.
setNav
({
navTitle
:
'新品到着'
...
...
public/scss/product/new-arrival.page.css
View file @
51734fc
...
...
@@ -34,11 +34,11 @@ body {
z-index
:
5
;
li
{
margin-left
:
1.2rem
;
height
:
2.2rem
;
line-height
:
2.2rem
;
margin-left
:
36px
;
height
:
88px
;
line-height
:
88px
;
border-bottom
:
1px
solid
#e0e0e0
;
padding-right
:
0.95rem
;
padding-right
:
54px
;
}
li
:last-child
{
...
...
@@ -64,11 +64,17 @@ body {
margin-top
:
11rem
;
}
}
}
.good-info
{
width
:
325px
;
height
:
550px
;
.good-info
{
float
:
left
;
margin
:
0.25rem
0.375rem
1rem
;
width
:
6.9rem
;
height
:
12.65rem
;
}
.guang-article
.meta
.iconfont
{
font-size
:
1em
;
}
}
.new-recommend
,
...
...
public/scss/product/new/_article.css
View file @
51734fc
.guang-article
{
position
:
relative
;
margin-top
:
28px
;
.cate
{
position
:
absolute
;
top
:
0
;
...
...
public/scss/product/new/_brand-info.css
View file @
51734fc
...
...
@@ -3,6 +3,8 @@
padding-bottom
:
55px
;
background-color
:
#f5f5f5
;
text-align
:
center
;
margin-top
:
38px
!important
;
height
:
476px
!important
;
img
{
width
:
141px
;
...
...
public/scss/product/new/_good-tags.css
View file @
51734fc
...
...
@@ -5,10 +5,12 @@
&.season-tags
{
background-image
:
url('/product/new/season-hot.jpg')
;
background-position-y
:
28px
;
}
&
.search-tags
{
background-image
:
url('/product/new/hot-search.jpg')
;
background-position-y
:
28px
;
}
&
.brand-tags
{
...
...
@@ -21,7 +23,7 @@
flex-wrap
:
wrap
;
justify-content
:
space-around
;
align-content
:
space-between
;
height
:
3
9
5px
;
height
:
3
5
5px
;
padding
:
55px
0
;
background-color
:
#f0f0f0
;
...
...
public/scss/product/new/_handlepick.css
View file @
51734fc
...
...
@@ -18,6 +18,6 @@
.swiper-slide-active
{
height
:
220px
;
width
:
378px
;
/*width: 378px;*/
}
}
\ No newline at end of file
...
...
public/scss/product/new/_recommend.css
View file @
51734fc
...
...
@@ -35,7 +35,7 @@
padding-right
:
10px
;
height
:
30px
;
line-height
:
30px
;
font-size
:
1
8
px
;
font-size
:
1
6
px
;
border-radius
:
32px
;
background-color
:
#999
;
...
...
Please
register
or
login
to post a comment