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
刘传洋
8 years ago
Commit
0cf8d00315ae37916ed555f96b1808470f0fb994
1 parent
7123047b
m
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
4 deletions
apps/cart/models/cart-service.js
apps/cart/views/partial/cart-pre-sell-tpl.hbs
apps/cart/models/cart-service.js
View file @
0cf8d00
...
...
@@ -433,7 +433,10 @@ const getCartData = (uid, shoppingKey, cartDelList) => {
offShelves
:
chelper
.
formatOffShelves
(
_
.
get
(
advCartData
,
'off_shelves_goods_list'
),
true
,
analysisData
),
soldOuts
:
chelper
.
formatSoldOuts
(
_
.
get
(
advCartData
,
'sold_out_goods_list'
),
true
,
analysisData
),
promotionInfos
:
chelper
.
formatPromotionInfos
(
_
.
get
(
advCartData
,
'promotion_info'
)),
stat
:
chelper
.
formatShoppingCartData
(
_
.
get
(
advCartData
,
'shopping_cart_data'
))
stat
:
chelper
.
formatShoppingCartData
(
_
.
get
(
advCartData
,
'shopping_cart_data'
)),
ensureUrl
:
helpers
.
urlFormat
(
'/cart/ensure'
,
{
type
:
2
})
};
let
giftsList
=
chelper
.
formatPriceGifts
(
_
.
get
(
ordCartData
,
'gift_list'
));
...
...
@@ -454,7 +457,8 @@ const getCartData = (uid, shoppingKey, cartDelList) => {
soldOuts
:
chelper
.
formatSoldOuts
(
_
.
get
(
ordCartData
,
'sold_out_goods_list'
),
false
,
analysisData
),
promotionInfos
:
chelper
.
formatPromotionInfos
(
_
.
get
(
ordCartData
,
'promotion_info'
),
goodsList
),
stat
:
chelper
.
formatShoppingCartData
(
_
.
get
(
ordCartData
,
'shopping_cart_data'
))
stat
:
chelper
.
formatShoppingCartData
(
_
.
get
(
ordCartData
,
'shopping_cart_data'
)),
ensureUrl
:
helpers
.
urlFormat
(
'/cart/ensure'
)
};
let
advStat
=
result
.
advanceCart
.
stat
;
...
...
apps/cart/views/partial/cart-pre-sell-tpl.hbs
View file @
0cf8d00
...
...
@@ -33,7 +33,7 @@
</div>
</div>
</div>
<a
class=
"btn-account"
>
去结算
</a>
<a
class=
"btn-account"
href=
"
{{
ensureUrl
}}
"
>
去结算
</a>
{{/
advanceCart
}}
{{#
ordinaryCart
}}
<div
class=
"slide-img"
>
...
...
@@ -62,7 +62,7 @@
</div>
</div>
</div>
<a
class=
"btn-account btn-account-black"
>
去结算
</a>
<a
class=
"btn-account btn-account-black"
href=
"
{{
ensureUrl
}}
"
>
去结算
</a>
{{/
ordinaryCart
}}
<p
class=
"pre-sell-tip"
>
温馨提示:您需要分开结算【预售商品】和【普通商品】
</p>
</div>
...
...
Please
register
or
login
to post a comment