wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 982abb3e22336e74f0cea4c97dc0f88454643d1c 1 parent 69576ba4

修复结算页YOHO币显示的bug 

Code Review By Rock Zhang
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -69,17 +69,17 @@ @@ -69,17 +69,17 @@
69 <span class="title">YOHO币</span> 69 <span class="title">YOHO币</span>
70 70
71 {{#if yohoCoin}} 71 {{#if yohoCoin}}
72 - <span class="desc used {{#unless useYohoCoin}}hide{{/if}}">已抵¥{{yohoCoin}}</span> 72 + <span class="desc used {{#unless useYohoCoin}}hide{{/if}}">已抵¥{{useYohoCoin}}</span>
73 <span class="desc can-use {{#if useYohoCoin}}hide{{/if}}">可抵¥{{yohoCoin}}</span> 73 <span class="desc can-use {{#if useYohoCoin}}hide{{/if}}">可抵¥{{yohoCoin}}</span>
74 74
75 {{#if useYohoCoin}} 75 {{#if useYohoCoin}}
76 <span class="coin-check"> 76 <span class="coin-check">
77 - <em>- ¥ {{yohoCoin}}</em> 77 + <em>- ¥ {{useYohoCoin}}</em>
78 <i class="iconfont checkbox icon-cb-checked"></i> 78 <i class="iconfont checkbox icon-cb-checked"></i>
79 </span> 79 </span>
80 {{else}} 80 {{else}}
81 <span class="coin-check"> 81 <span class="coin-check">
82 - <em style="display: none;">- ¥ {{yohoCoin}}</em> 82 + <em style="display: none;">- ¥ {{useYohoCoin}}</em>
83 <i class="iconfont checkbox icon-checkbox"></i> 83 <i class="iconfont checkbox icon-checkbox"></i>
84 </span> 84 </span>
85 {{/if}} 85 {{/if}}
@@ -442,7 +442,7 @@ class CartModel @@ -442,7 +442,7 @@ class CartModel
442 442
443 // 有货币 443 // 有货币
444 $result['yohoCoin'] = $payReturn['yoho_coin']; 444 $result['yohoCoin'] = $payReturn['yoho_coin'];
445 - $result['useYohoCoin'] = isset($orderCompute['use_yoho_coin']) ? $orderCompute['use_yoho_coin'] : $payReturn['yoho_coin']; 445 + $result['useYohoCoin'] = isset($orderCompute['use_yoho_coin']) ? $orderCompute['use_yoho_coin'] : $payReturn['use_yoho_coin'];
446 446
447 // 订单数据 447 // 订单数据
448 if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) { 448 if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) {