fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 83962f63447313687e5e6725d337257c93b294d8 2 parents 541229da d648cddb

Merge branch 'develop' into test

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -314,8 +314,8 @@ class UserModel @@ -314,8 +314,8 @@ class UserModel
314 foreach ($data as &$val) { 314 foreach ($data as &$val) {
315 $val['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : ''; 315 $val['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
316 $val['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : ''; 316 $val['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
317 - $val['sales_price'] = (!empty($val['sales_price']) && !is_float($val['sales_price'])) ? $val['sales_price'] . '.00' : 0;  
318 - $val['market_price'] = (($val['market_price'] - $val['sales_price'] > 0) && !is_float($val['market_price'])) ? $val['market_price'] . '.00' : false; 317 + $val['sales_price'] = (!empty($val['sales_price']) && !is_float($val['sales_price'])) ? $val['sales_price'] . '.00' : $val['sales_price'];
  318 + $val['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? $val['market_price'] . '.00' : false;
319 } 319 }
320 !empty($data) && $result['browseRecord'] = $data; 320 !empty($data) && $result['browseRecord'] = $data;
321 } 321 }