fe / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 93978184b906dac2ae06e78f4084881b49145ffe 2 parents 837a6e10 703e4349

Merge branch 'feature/yohoCoin' into release/5.2

Inline Side-by-side
Showing 1 changed file with 0 additions and 1 deletions
@@ -1619,7 +1619,6 @@ class CartModel @@ -1619,7 +1619,6 @@ class CartModel
1619 } else if ($yohoCoinData['useYohoCoin'] > 0 || $yohoCoinData['yohoCoin'] > 0) { 1619 } else if ($yohoCoinData['useYohoCoin'] > 0 || $yohoCoinData['yohoCoin'] > 0) {
1620 $yohoCoinData['yohoCoinMsg'] = '可抵¥' . ($yohoCoinData['useYohoCoin'] > 0 ? $yohoCoinData['useYohoCoin'] : $yohoCoinData['yohoCoin']); 1620 $yohoCoinData['yohoCoinMsg'] = '可抵¥' . ($yohoCoinData['useYohoCoin'] > 0 ? $yohoCoinData['useYohoCoin'] : $yohoCoinData['yohoCoin']);
1621 $yohoCoinData['yohoCoinClick'] = 1; 1621 $yohoCoinData['yohoCoinClick'] = 1;
1622 - $yohoCoinData['yohoCoinNum'] = ($yohoCoinData['useYohoCoin'] > 0 ? $yohoCoinData['useYohoCoin'] : $yohoCoinData['yohoCoin']) * 100;  
1623 } else { 1622 } else {
1624 $yohoCoinData['yohoCoinMsg'] = "抱歉，您的订单实付款不满足有货币使用条件"; 1623 $yohoCoinData['yohoCoinMsg'] = "抱歉，您的订单实付款不满足有货币使用条件";
1625 } 1624 }