wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 397e5622cd9194e721c76adc52967196e7037ef9 1 parent a9110184

修复确认订单页面，去勾选有货币后，进入优惠券选择使用优惠券成功后，返回之后yoho币被重新选中中

Inline Side-by-side
Showing 2 changed files with 9 additions and 1 deletions
@@ -70,10 +70,17 @@ @@ -70,10 +70,17 @@
70 70
71 {{#if yohoCoin}} 71 {{#if yohoCoin}}
72 <span class="desc">可抵¥{{yohoCoin}}</span> 72 <span class="desc">可抵¥{{yohoCoin}}</span>
  73 + {{#if useYohoCoin}}
73 <span class="coin-check"> 74 <span class="coin-check">
74 <em>- ¥ {{yohoCoin}}</em> 75 <em>- ¥ {{yohoCoin}}</em>
75 <i class="iconfont checkbox icon-cb-checked"></i> 76 <i class="iconfont checkbox icon-cb-checked"></i>
76 </span> 77 </span>
  78 + {{else}}
  79 + <span class="coin-check">
  80 + <em style="display: none;">- ¥ {{yohoCoin}}</em>
  81 + <i class="iconfont checkbox icon-checkbox"></i>
  82 + </span>
  83 + {{/if}}
77 {{^}} 84 {{^}}
78 <span class="not-used coin-check"> 85 <span class="not-used coin-check">
79 无YOHO币可用 86 无YOHO币可用
@@ -441,7 +441,8 @@ class CartModel @@ -441,7 +441,8 @@ class CartModel
441 } 441 }
442 442
443 // 有货币 443 // 有货币
444 - $result['yohoCoin'] = (isset($orderCompute['use_yoho_coin']) && !empty($orderCompute['use_yoho_coin'])) ? $orderCompute['use_yoho_coin'] : $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 446
446 // 订单数据 447 // 订单数据
447 if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) { 448 if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) {