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
yyq
7 years ago
Commit
0212fe8002fd632e97fa08858be11360da3c8abf
1 parent
e6050778
fix order detail
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
7 deletions
apps/home/models/orders-service.js
apps/home/views/action/home/orders/order-detail.hbs
apps/home/models/orders-service.js
View file @
0212fe8
...
...
@@ -709,6 +709,7 @@ module.exports = class extends global.yoho.BaseModel {
return
_
.
get
(
cartInfo
,
'package_list'
,
[]).
map
((
pack
)
=>
{
let
newPack
=
{
title
:
pack
.
title
,
supplierId
:
pack
.
supplier_id
,
fee
:
pack
.
shopping_cost
===
'0.00'
?
''
:
pack
.
shopping_cost
,
orign
:
pack
.
shopping_orig_cost
,
...
...
apps/home/views/action/home/orders/order-detail.hbs
View file @
0212fe8
...
...
@@ -181,13 +181,13 @@
{{#if
packages
}}
<div
id=
"differentOrder"
class=
"different-order"
>
<p
class=
"warn"
>
温馨提示:您购买的商品
<span
class=
"red"
>
分属不同仓库
</span>
,
{{
packageTitle
}}
,
<span
class=
"red"
>
预计3-5天内发货给您
</span>
温馨提示:您购买的商品
<span
class=
"red"
>
分属不同仓库
</span>
,
{{
packageTitle
}}
<span
class=
"why"
></span>
</p>
<div
id=
"differentBag"
class=
"different-bag"
>
{{#
each
packages
}}
<div
class=
"bag"
>
<h3>
包裹
{{
math
@index
'+'
1
}}
:
{{
#
isEqual
supplierId
'0'
}}
总仓发货
{{^}}
异地调拨
<em
class=
"red"
>
预计3-5天内发货给您
</em>
{{/
isEqual
}}
</h3>
<h3>
包裹
{{
math
@index
'+'
1
}}
:
{{
title
}}
</h3>
<p
class=
"pre"
>
</p>
<div
class=
"bag-detil"
>
...
...
@@ -207,11 +207,7 @@
</div>
<p
class=
"next"
>
</p>
{{#if
fee
}}
<p>
运费:¥
{{
fee
}}
元(原价
{{
orign
}}
元,优惠
{{
count
}}
元)
</p>
{{else}}
<p>
运费:¥0.00元
</p>
{{/if}}
<p></p>
</div>
{{/
each
}}
</div>
...
...
Please
register
or
login
to post a comment