Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuy-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
1
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
郭成尧
9 years ago
Commit
10acc5cb5d49358795dc3ff2db991d092c4d2ae4
1 parent
9422a8ce
列表数据基本处理
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
77 additions
and
56 deletions
apps/product/controllers/sale.js
apps/product/models/sale.js
apps/product/views/action/sale/other.hbs
apps/product/controllers/sale.js
View file @
10acc5c
...
...
@@ -26,24 +26,24 @@ const simulation = require(`${mRoot}/simulation`);
exports
.
index
=
(
req
,
res
)
=>
{
headerModel
.
requestHeaderData
()
.
then
(
response
=>
{
response
=
headerModel
.
setHeaderData
(
response
.
data
,
'sale'
);
.
then
(
responseData
=>
{
responseData
=
headerModel
.
setHeaderData
(
responseData
.
data
,
'sale'
);
response
.
module
=
'product'
;
response
.
page
=
'sale'
;
response
.
footerTop
=
true
;
response
.
devEnv
=
true
;
responseData
.
module
=
'product'
;
responseData
.
page
=
'sale'
;
responseData
.
footerTop
=
true
;
responseData
.
devEnv
=
true
;
// 假数据输出
res
.
render
(
'sale/index'
,
Object
.
assign
(
response
,
simulation
.
saleIndex
()));
res
.
render
(
'sale/index'
,
Object
.
assign
(
response
Data
,
simulation
.
saleIndex
()));
// 真实数据输出
/* return sale.getSaleDate().then(result => {
response.result = result;
response.resultShow = JSON.stringify(result, null, 4);
responseData.result = result;
responseData.resultShow = JSON.stringify(result, null, 4);
res.render('sale/index', response);
res.render('sale/index', response
Data
);
});*/
})
.
catch
(()
=>
{
...
...
@@ -59,25 +59,25 @@ exports.index = (req, res) => {
*/
exports
.
discount
=
(
req
,
res
)
=>
{
headerModel
.
requestHeaderData
()
.
then
(
response
=>
{
response
=
headerModel
.
setHeaderData
(
response
.
data
,
'sale-discount'
);
response
.
module
=
'product'
;
response
.
page
=
'sale'
;
response
.
footerTop
=
true
;
response
.
devEnv
=
true
;
.
then
(
responseData
=>
{
responseData
=
headerModel
.
setHeaderData
(
responseData
.
data
,
'sale-discount'
);
responseData
.
module
=
'product'
;
responseData
.
page
=
'sale'
;
responseData
.
footerTop
=
true
;
responseData
.
devEnv
=
true
;
// 假数据输出
// res.render('sale/discount', Object.assign(response, simulation.discount()));
// res.render('sale/discount', Object.assign(response
Data
, simulation.discount()));
return
sale
.
getSaleGoodsListData
({
saleType
:
req
.
params
.
saleType
})
.
then
(
result
=>
{
response
.
result
=
result
;
response
.
resultShow
=
JSON
.
stringify
(
result
,
null
,
4
);
responseData
.
result
=
result
;
responseData
.
resultShow
=
JSON
.
stringify
(
result
,
null
,
4
);
// log.info(result);
res
.
render
(
'sale/discount'
,
response
);
res
.
render
(
'sale/discount'
,
response
Data
);
});
})
...
...
@@ -94,23 +94,23 @@ exports.discount = (req, res) => {
*/
exports
.
vip
=
(
req
,
res
)
=>
{
headerModel
.
requestHeaderData
()
.
then
(
response
=>
{
response
=
headerModel
.
setHeaderData
(
response
.
data
,
'vip'
);
response
.
module
=
'product'
;
response
.
page
=
'sale'
;
response
.
footerTop
=
true
;
response
.
devEnv
=
true
;
.
then
(
responseData
=>
{
responseData
=
headerModel
.
setHeaderData
(
responseData
.
data
,
'vip'
);
responseData
.
module
=
'product'
;
responseData
.
page
=
'sale'
;
responseData
.
footerTop
=
true
;
responseData
.
devEnv
=
true
;
// 假数据输出
res
.
render
(
'sale/other'
,
Object
.
assign
(
response
,
simulation
.
other
()));
// res.render('sale/other', Object.assign(responseData
, simulation.other()));
/* return sale.getSaleGoodsListData()
.then(result => {
response.result = result;
response.resultShow = JSON.stringify(result, null, 4);
sale
.
getSaleGoodsListData
()
.
then
((
result
)
=>
{
responseData
.
result
=
result
;
responseData
.
resultShow
=
JSON
.
stringify
(
result
,
null
,
4
);
res.render('sale/other', response);
});*/
res
.
render
(
'sale/other'
,
responseData
);
});
})
.
catch
(()
=>
{
...
...
@@ -126,22 +126,22 @@ exports.vip = (req, res) => {
*/
exports
.
breakingYards
=
(
req
,
res
)
=>
{
headerModel
.
requestHeaderData
()
.
then
(
response
=>
{
response
=
headerModel
.
setHeaderData
(
response
.
data
,
'breakingYards'
);
response
.
module
=
'product'
;
response
.
page
=
'sale'
;
response
.
footerTop
=
true
;
response
.
devEnv
=
true
;
.
then
(
responseData
=>
{
responseData
=
headerModel
.
setHeaderData
(
responseData
.
data
,
'breakingYards'
);
responseData
.
module
=
'product'
;
responseData
.
page
=
'sale'
;
responseData
.
footerTop
=
true
;
responseData
.
devEnv
=
true
;
// 假数据输出
res
.
render
(
'sale/other'
,
Object
.
assign
(
response
,
simulation
.
other
()));
res
.
render
(
'sale/other'
,
Object
.
assign
(
response
Data
,
simulation
.
other
()));
/* return sale.getSaleGoodsListData()
.then(result => {
response.result = result;
response.resultShow = JSON.stringify(result, null, 4);
responseData.result = result;
responseData.resultShow = JSON.stringify(result, null, 4);
res.render('sale/other', response);
res.render('sale/other', response
Data
);
});*/
})
...
...
@@ -158,22 +158,22 @@ exports.breakingYards = (req, res) => {
*/
exports
.
newSale
=
(
req
,
res
)
=>
{
headerModel
.
requestHeaderData
()
.
then
(
response
=>
{
response
=
headerModel
.
setHeaderData
(
response
.
data
,
'newSale'
);
response
.
module
=
'product'
;
response
.
page
=
'sale'
;
response
.
footerTop
=
true
;
response
.
devEnv
=
true
;
.
then
(
responseData
=>
{
responseData
=
headerModel
.
setHeaderData
(
responseData
.
data
,
'newSale'
);
responseData
.
module
=
'product'
;
responseData
.
page
=
'sale'
;
responseData
.
footerTop
=
true
;
responseData
.
devEnv
=
true
;
// 假数据输出
res
.
render
(
'sale/other'
,
Object
.
assign
(
response
,
simulation
.
other
()));
res
.
render
(
'sale/other'
,
Object
.
assign
(
response
Data
,
simulation
.
other
()));
/* return sale.getSaleNewSaleData()
.then(result => {
response.result = result;
response.resultShow = JSON.stringify(result, null, 4);
responseData.result = result;
responseData.resultShow = JSON.stringify(result, null, 4);
res.render('sale/other', response);
res.render('sale/other', response
Data
);
});*/
})
...
...
apps/product/models/sale.js
View file @
10acc5c
...
...
@@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2016-05-19 10:20:08
* @Last Modified by: Targaryen
* @Last Modified time: 2016-05-
19 18:03:33
* @Last Modified time: 2016-05-
20 15:05:05
*/
'use strict'
;
...
...
@@ -32,8 +32,27 @@ const handleSaleData = (origin) => {
const
handleSaleGoodsListData
=
(
origin
)
=>
{
var
dest
=
{};
dest
.
saleList
=
{};
dest
.
saleList
.
leftContent
=
{};
dest
.
saleList
.
goods
=
[];
if
(
!
_
.
isEmpty
(
origin
.
product_list
))
{
dest
.
saleList
=
origin
.
product_list
;
_
.
forEach
(
origin
.
product_list
,
function
(
value
)
{
let
goods
=
{};
goods
.
tags
=
value
.
tags
;
goods
.
url
=
''
;
// 待处理
goods
.
thumb
=
value
.
goods_list
;
goods
.
name
=
value
.
product_name
;
goods
.
brand
=
{};
goods
.
brand
.
url
=
''
;
// 待处理
goods
.
brand
.
name
=
value
.
brand_name
;
goods
.
marketPrice
=
value
.
market_price
;
dest
.
saleList
.
goods
.
push
(
goods
);
});
}
return
dest
;
...
...
@@ -73,4 +92,3 @@ exports.getSaleGoodsListData = () => {
}
});
};
...
...
apps/product/views/action/sale/other.hbs
View file @
10acc5c
<pre>
{{
resultShow
}}
</pre>
{{#
result
}}
<div
class=
"new-sale-page product-page yoho-page"
>
{{#
saleList
}}
...
...
@@ -24,3 +26,4 @@
</div>
{{/
saleList
}}
</div>
{{/
result
}}
\ No newline at end of file
...
...
Please
register
or
login
to post a comment