Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5
Showing
8 changed files
with
2 additions
and
1 deletions
@@ -233,7 +233,8 @@ class Helpers | @@ -233,7 +233,8 @@ class Helpers | ||
233 | if (!isset($productData['product_skn']) || !isset($productData['goods_list'][0])) { | 233 | if (!isset($productData['product_skn']) || !isset($productData['goods_list'][0])) { |
234 | return false; | 234 | return false; |
235 | } | 235 | } |
236 | - | 236 | + $productData['sales_price'] = empty($productData['sales_price']) ? '' : $productData['sales_price']; |
237 | + $productData['market_price'] = empty($productData['market_price']) ? '' : $productData['market_price']; | ||
237 | // 市场价和售价一样,则不显示市场价 | 238 | // 市场价和售价一样,则不显示市场价 |
238 | if (intval($productData['market_price']) === intval($productData['sales_price'])) { | 239 | if (intval($productData['market_price']) === intval($productData['sales_price'])) { |
239 | $productData['market_price'] = false; | 240 | $productData['market_price'] = false; |
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
-
Please register or login to post a comment