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
陈轩
2016-10-20 10:14:24 +0800
Commit
fb7ad934756806df9b34337b0f5809145ab6a42a
2 parents
cf1c64a8
f0955014
Merge remote-tracking branch 'origin/release/5.1' into release/5.1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
0 deletions
apps/product/models/seckill-detail.js
apps/product/models/seckill-detail.js
View file @
fb7ad93
...
...
@@ -624,6 +624,7 @@ let getProductData = (data) => {
finalResult
.
isStudent
=
data
.
isStudent
;
Object
.
assign
(
finalResult
.
feedbacks
,
info
[
2
]);
Object
.
assign
(
finalResult
,
{
isSecKill
:
result
.
isSecKill
});
finalResult
.
goodsPrice
.
previousPrice
=
'¥'
+
result
.
marketPrice
;
/* 预售商品不能购买 */
if
(
_
.
get
(
result
,
'isDepositAdvance'
,
''
)
===
'Y'
)
{
...
...
Please
register
or
login
to post a comment