fe / YOHOBUYWAP · Commits

Go to a project

Authored by 郝肖肖
Commit 06c55f6293cb0130ea94c1c5131acdc2105f2392 1 parent 7c620ac6

有货币使用弹框

Inline Side-by-side
Showing 2 changed files with 6 additions and 5 deletions
@@ -180,9 +180,9 @@ @@ -180,9 +180,9 @@
180 <div class="yoho-coin-title">有货币使用条件：</div> 180 <div class="yoho-coin-title">有货币使用条件：</div>
181 <div class="yoho-coin-content"> 181 <div class="yoho-coin-content">
182 <p>1.订单金额大于20元（含）</p> 182 <p>1.订单金额大于20元（含）</p>
183 - <p>2.有货币数量大于100个（含）</p>  
184 - <p>3.有货币支付不得超过每笔订单应付金额的50%</p>  
185 - <p>备注：使用有货币数量为100的整数倍，100有货币抵1元。</p> 183 + <p>2.有货币数量大于{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}个（含）</p>
  184 + <p>3.有货币支付不得超过每笔订单应付金额的{{yohoCoinCompute.yoho_coin_pay_rule.max_pay_rate_desc}}</p>
  185 + <p>备注：使用有货币数量为{{yohoCoinCompute.yoho_coin_pay_rule.num_limit}}的整数倍，100有货币抵1元。</p>
186 </div> 186 </div>
187 <div class="yoho-coin-footer">知道了</div> 187 <div class="yoho-coin-footer">知道了</div>
188 </div> 188 </div>
@@ -640,11 +640,12 @@ class CartModel @@ -640,11 +640,12 @@ class CartModel
640 'yohoCoin' => isset($orderCompute['yoho_coin']) ? Helpers::transPrice($orderCompute['yoho_coin']) : 0, 640 'yohoCoin' => isset($orderCompute['yoho_coin']) ? Helpers::transPrice($orderCompute['yoho_coin']) : 0,
641 'useYohoCoin' => isset($orderCompute['use_yoho_coin']) ? Helpers::transPrice($orderCompute['use_yoho_coin']) : 0, 641 'useYohoCoin' => isset($orderCompute['use_yoho_coin']) ? Helpers::transPrice($orderCompute['use_yoho_coin']) : 0,
642 'yohoCoinClick' => 0, 642 'yohoCoinClick' => 0,
643 - 'yohoCoinMsg' => '' 643 + 'yohoCoinMsg' => '',
  644 + 'yoho_coin_pay_rule' => $orderCompute['yoho_coin_pay_rule']
644 ]; 645 ];
645 646
646 if ($yohoCoinData['totalYohoCoinNum'] < 100) { 647 if ($yohoCoinData['totalYohoCoinNum'] < 100) {
647 - $yohoCoinData['yohoCoinMsg'] = "共{$yohoCoinData['totalYohoCoinNum']}有货币，满100可用"; 648 + $yohoCoinData['yohoCoinMsg'] = "共{$yohoCoinData['totalYohoCoinNum']}有货币，满{$orderCompute['yoho_coin_pay_rule']['num_limit']}可用";
648 } else if ($yohoCoinData['useYohoCoin'] > 0 || $yohoCoinData['yohoCoin'] > 0) { 649 } else if ($yohoCoinData['useYohoCoin'] > 0 || $yohoCoinData['yohoCoin'] > 0) {
649 $yohoCoinData['yohoCoinMsg'] = '可抵¥' . ($yohoCoinData['useYohoCoin'] > 0 ? $yohoCoinData['useYohoCoin'] : $yohoCoinData['yohoCoin']); 650 $yohoCoinData['yohoCoinMsg'] = '可抵¥' . ($yohoCoinData['useYohoCoin'] > 0 ? $yohoCoinData['useYohoCoin'] : $yohoCoinData['yohoCoin']);
650 $yohoCoinData['yohoCoinClick'] = 1; 651 $yohoCoinData['yohoCoinClick'] = 1;