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
49767e9c2a0cee4a43b936d4d3468a76ce007632
2 parents
18941b7d
a83fda8d
Merge branch 'feature/individuation' into 'gray'
'个性化调整' See merge request
!1395
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
apps/activity/controllers/tide.js
public/scss/tide/category.page.css
apps/activity/controllers/tide.js
View file @
49767e9
...
...
@@ -13,7 +13,8 @@ exports.category = (req, res, next) => {
channel
:
req
.
query
.
channel
,
season
:
req
.
query
.
season
,
isApp
:
req
.
yoho
.
isApp
,
scene
:
req
.
query
.
scene
||
1
scene
:
req
.
query
.
scene
||
1
,
imageType
:
req
.
query
.
imageType
||
2
};
let
renders
=
{};
...
...
@@ -49,7 +50,8 @@ exports.shop = (req, res, next) => {
channel
:
req
.
query
.
channel
,
season
:
req
.
query
.
season
,
isApp
:
req
.
yoho
.
isApp
,
scene
:
req
.
query
.
scene
||
1
scene
:
req
.
query
.
scene
||
1
,
imageType
:
req
.
query
.
imageType
||
2
};
let
renders
=
{};
...
...
public/scss/tide/category.page.css
View file @
49767e9
...
...
@@ -143,6 +143,7 @@
font-size
:
13px
;
color
:
#ccc
;
font-weight
:
normal
;
text-decoration
:
line-through
;
}
.cart-icon
{
...
...
@@ -286,6 +287,6 @@
.tide-border-top
{
margin
:
35px
30px
10px
40px
;
border-top
:
2
px
solid
#b0b0b0
;
border-top
:
10
px
solid
#b0b0b0
;
}
}
...
...
Please
register
or
login
to post a comment