Merge branch 'develop' into test

Rock Zhang
Commit 2ad4f2e771d0305f978a8845d39e183479296331 2 parents 19311075 896d31f0
Showing 2 changed files with 2 additions and 2 deletions
framework
yohobuy/m.yohobuy.com/application/models/Index/User.php
--- a/framework @ e9d066dd
+++ b/framework @ e9d066dd
- Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
+ Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec
--- a/yohobuy/m.yohobuy.com/application/models/Index/User.php
View file @2ad4f2e
+++ b/yohobuy/m.yohobuy.com/application/models/Index/User.php
View file @2ad4f2e
@@ -182,7 +182,7 @@ class UserModel
 				$product['title'] = $val['product_name'];
 				$product['price'] = !empty($val['market_price']) ? '￥'.$val['market_price'] . '.00' : 0;
 				$product['discountPrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '￥' . $val['sales_price'] . '.00' : false;
- 				$product['savePrice'] = !empty($val['price_down'] > 0) ? '￥'.$val['price_down'] . '.00' : false;
+ 				$product['savePrice'] = ($val['price_down'] > 0) ? '￥'.$val['price_down'] . '.00' : false;
 				$product['sellOut'] = ($val['storage'] <= 0);
 
 				$datas[] = $product;