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
9 years ago
Commit
982abb3e22336e74f0cea4c97dc0f88454643d1c
1 parent
69576ba4
修复结算页YOHO币显示的bug
Code Review By Rock Zhang
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
template/m.yohobuy.com/actions/cart/index/order-ensure.phtml
View file @
982abb3
...
...
@@ -69,17 +69,17 @@
<span
class=
"title"
>YOHO币</span>
{
{#if
yohoCoin
}
}
<span
class=
"desc used {{#unless useYohoCoin}}hide{{/if}}"
>已抵¥
{
{
y
ohoCoin
}
}</span>
<span
class=
"desc used {{#unless useYohoCoin}}hide{{/if}}"
>已抵¥
{
{
useY
ohoCoin
}
}</span>
<span
class=
"desc can-use {{#if useYohoCoin}}hide{{/if}}"
>可抵¥
{
{yohoCoin
}
}</span>
{
{#if
useYohoCoin
}
}
<span
class=
"coin-check"
>
<em>-
¥
{
{
y
ohoCoin
}
}</em>
<em>-
¥
{
{
useY
ohoCoin
}
}</em>
<i
class=
"iconfont checkbox icon-cb-checked"
></i>
</span>
{
{else
}
}
<span
class=
"coin-check"
>
<em
style=
"display: none;"
>-
¥
{
{
y
ohoCoin
}
}</em>
<em
style=
"display: none;"
>-
¥
{
{
useY
ohoCoin
}
}</em>
<i
class=
"iconfont checkbox icon-checkbox"
></i>
</span>
{
{/if
}
}
...
...
yohobuy/m.yohobuy.com/application/models/Index/Cart.php
View file @
982abb3
...
...
@@ -442,7 +442,7 @@ class CartModel
// 有货币
$result
[
'yohoCoin'
]
=
$payReturn
[
'yoho_coin'
];
$result
[
'useYohoCoin'
]
=
isset
(
$orderCompute
[
'use_yoho_coin'
])
?
$orderCompute
[
'use_yoho_coin'
]
:
$payReturn
[
'yoho_coin'
];
$result
[
'useYohoCoin'
]
=
isset
(
$orderCompute
[
'use_yoho_coin'
])
?
$orderCompute
[
'use_yoho_coin'
]
:
$payReturn
[
'
use_
yoho_coin'
];
// 订单数据
if
(
isset
(
$payReturn
[
'shopping_cart_data'
])
&&
!
empty
(
$payReturn
[
'shopping_cart_data'
]))
{
...
...
Please
register
or
login
to post a comment