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
biao
2016-06-17 11:04:41 +0800
Commit
bef044935fa67bfbe55ab234369cb1efb9afecc9
2 parents
623fecd2
bebf2f7a
Merge branch 'release/4.6' of
http://git.yoho.cn/fe/yohobuywap-node
into release/4.6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
apps/product/controllers/sale.js
apps/product/models/sale.js
apps/product/controllers/sale.js
View file @
bef0449
...
...
@@ -11,14 +11,14 @@ const mRoot = '../models';
const
headerModel
=
require
(
'../../../doraemon/models/header'
);
const
saleModel
=
require
(
`
$
{
mRoot
}
/sale`
)
;
const
queryParam
=
{
brand
:
'0'
,
gender
:
'1,2,3'
,
sort
:
'0'
,
size
:
'0'
,
price
:
'0'
,
pD
:
'0.1,0.9'
};
// const queryParam = {
// brand: '0',
// gender: '1,2,3',
// sort: '0',
// size: '0',
// price: '0',
// pD: '0.1,0.9'
// };
/**
* 公共数据处理
...
...
@@ -57,7 +57,7 @@ exports.index = (req, res, next) => {
let
params
=
processPublicData
(
req
,
'SALE'
,
'sale'
);
saleModel
.
getSaleData
(
params
.
channel
).
then
((
result
)
=>
{
res
.
render
(
'sale/index'
,
Object
.
assign
(
params
.
renderData
,
queryParam
,
{
res
.
render
(
'sale/index'
,
Object
.
assign
(
params
.
renderData
,
{
content
:
result
,
floorHeader
:
{
title
:
{
...
...
apps/product/models/sale.js
View file @
bef0449
...
...
@@ -27,9 +27,10 @@ const typeCont = {
price
:
[
's_p_desc'
,
's_p_asc'
],
discount
:
[
'p_d_desc'
,
'p_d_asc'
],
sale
:
[
's_n_desc'
,
's_n_asc'
],
newest
:
[
's_t_desc,s_s_desc'
,
's_t_asc,s_s_asc'
],
// newest: ['s_t_desc', 's_t_asc'],
// newest: ['s_t_desc,s_s_desc', 's_t_asc,s_s_asc'],
newest
:
[
's_t_desc'
,
's_t_asc'
],
stock
:
[
's_s_desc'
,
's_s_asc'
],
all
:
[
'd_s_desc'
,
'd_s_asc'
]
};
...
...
Please
register
or
login
to post a comment