Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
2
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
Rock Zhang
2016-01-13 14:30:25 +0800
Commit
bc8fc6e622c53fb111e3afdc594414b25029c863
1 parent
30ea5a90
修复结算页切换运送方式时YOHO币会显示错乱的bug;修复使用免邮券不显示的bug
Code Review By Rock Zhang
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
static/js/cart/order-info.js
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
static/js/cart/order-info.js
View file @
bc8fc6e
...
...
@@ -14,7 +14,7 @@ function init() {
deliveryId
:
1
,
deliveryTimeId
:
1
,
paymentTypeId
:
1
,
yohoCoin
:
$
(
'.coin'
).
data
(
'yoho-coin'
)
||
0
,
yohoCoin
:
0
,
addressId
:
null
,
couponCode
:
null
,
couponName
:
null
,
...
...
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
View file @
bc8fc6e
...
...
@@ -486,7 +486,7 @@ class CartModel
// 优惠券数据
$coupons
=
array
(
'couponName'
=>
''
);
if
(
!
empty
(
$orderCompute
[
'coupon_amount'
]
))
{
if
(
isset
(
$orderCompute
[
'coupon_amount'
])
&&
(
!
empty
(
$orderCompute
[
'coupon_amount'
])
||
(
$orderCompute
[
'coupon_amount'
]
===
0
&&
$orderCompute
[
'shipping_cost'
]
===
0
)
))
{
$coupons
[
'couponName'
]
=
$orderInfo
[
'couponName'
];
}
$result
[
'coupon'
]
=
$coupons
;
...
...
Please
register
or
login
to post a comment