Toggle navigation
Toggle navigation
This project
Loading...
Sign in
wangshusheng
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to dashboard
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
Email Patches
Plain Diff
Browse Files
Authored by
Rock Zhang
2015-12-21 17:58:53 +0800
Commit
1c7373e6aaf10e02ebf10e2a733c5e76285fe46c
1 parent
8bbd58a1
修复购物车赠品有关bug(价格显示,赠品数量显示)
Code Review By Rock Zhang
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
template/m.yohobuy.com/actions/cart/index/gift-advance.phtml
template/m.yohobuy.com/partials/cart/cart-content.phtml
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
template/m.yohobuy.com/actions/cart/index/gift-advance.phtml
View file @
1c7373e
...
...
@@ -12,7 +12,7 @@
{
{else
}
}
{
{#
freebie
}
}
<div
class=
"advance-block gift-block"
data-promotion-id=
"{{promotionId}}"
>
<p
class=
"title"
>
{
{
t
itle
}
}</p>
<p
class=
"title"
>
{
{
promotionT
itle
}
}</p>
{
{#goods
}
}
{
{>
cart/gift-advance-good
}
}
{
{/goods
}
}
...
...
template/m.yohobuy.com/partials/cart/cart-content.phtml
View file @
1c7373e
...
...
@@ -17,7 +17,7 @@
<span class="iconfont"></span>
赠品
<span class="iconfont icon-right-arrow"></span>
<span class="count">{{
c
ount}}</span>
<span class="count">{{
giftC
ount}}</span>
</a>
</li>
{{/ freebie}}
...
...
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
View file @
1c7373e
...
...
@@ -73,8 +73,7 @@ class CartModel
$cart
=
$cartData
[
'data'
];
$cartTypes
=
array
(
'ordinary'
,
'advance'
,
'all'
);
if
(
!
in_array
(
$cartType
,
$cartTypes
))
{
// 加价购或者赠品数据
if
(
$onlyGift
||
$onlyAdvanceBuy
)
{
// 加价购或者赠品数据
$result
=
self
::
procCartData
(
$cart
[
'ordinary_cart_data'
],
$onlyGift
,
$onlyAdvanceBuy
);
break
;
}
...
...
Please
register
or
login
to post a comment