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
c778cc5c8544456328847f976c9d8d02fd793029
1 parent
bdcc33c9
活动页
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
apps/activity/controllers/special.js
apps/activity/models/special.js
apps/activity/controllers/special.js
View file @
c778cc5
...
...
@@ -34,9 +34,11 @@ exports.special = (req, res) => {
// });
Promise
.
all
([
headerModel
.
requestHeaderData
(),
specialModel
.
getSpecialData
(
id
)]).
then
((
result
)
=>
{
let
saleDate
=
_
.
assign
(
result
);
res
.
send
(
saleDate
);
let
saleDate
=
_
.
assign
(
result
[
0
],
result
[
1
]);
res
.
send
(
saleDate
);
}).
catch
((
err
)
=>
{
saleLogger
(
err
,
res
);
});
...
...
apps/activity/models/special.js
View file @
c778cc5
...
...
@@ -7,7 +7,6 @@
const
ServiceAPI
=
require
(
`
$
{
global
.
library
}
/api`
)
.ServiceAPI
;
const
sign
=
require
(
`
$
{
global
.
library
}
/sign`
)
;
const
_
=
require
(
'lodash'
);
var
api
=
new
ServiceAPI
();
...
...
@@ -16,9 +15,9 @@ exports.getSpecialData = (id) => {
id
:
id
})).
then
(
result
=>
{
if
(
result
&&
result
.
code
===
200
)
{
return
result
.
data
return
result
.
data
;
}
else
{
return
Promise
.
reject
(
'error'
);
}
});
}
\ No newline at end of file
};
...
...
Please
register
or
login
to post a comment