Merge remote-tracking branch 'origin/hotfix/yohocoinuse' into stable

@@ -200,9 +200,9 @@ class UserModel
                 $product['imgUrl'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
                 $product['imgUrl'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
                 ;
                 ;
                 $product['title'] = $val['product_name'];
                 $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'] = ($val['price_down'] > 0) ? '¥' . $val['price_down'] . '.00' : false;
+                $product['price'] = '¥' . Helpers::transPrice($val['market_price']);
+                $product['discountPrice'] = ($val['market_price'] - $val['sales_price'] > 0) ? '¥' . Helpers::transPrice($val['sales_price']) : false;
+                $product['savePrice'] = ($val['price_down'] > 0) ? '¥' . Helpers::transPrice($val['price_down']) : false;
                 $product['sellOut'] = ($val['storage'] <= 0);
                 $product['sellOut'] = ($val['storage'] <= 0);
 
 
                 $datas[] = $product;
                 $datas[] = $product;
@@ -254,8 +254,8 @@ class UserModel
                     $product = array();
                     $product = array();
                     $product['link'] = isset($one['goods'][0], $one['cnAlphabet']) ? Helpers::url('/product/pro_' . $one['product_id'] . '_' . $one['goods'][0]['id'] . '/' . $one['cnAlphabet'] . '.html') : '';
                     $product['link'] = isset($one['goods'][0], $one['cnAlphabet']) ? Helpers::url('/product/pro_' . $one['product_id'] . '_' . $one['goods'][0]['id'] . '/' . $one['cnAlphabet'] . '.html') : '';
                     $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
                     $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
-                    $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
-                    $product['discount'] = ($one['market_price'] > $one['sales_price']) ? '¥' . $one['sales_price'] : false;
+                    $product['price'] = '¥' . Helpers::transPrice($one['market_price']);
+                    $product['discount'] = ($one['market_price'] > $one['sales_price']) ? '¥' . Helpers::transPrice($one['sales_price']) : false;
 
 
                     $brand['productList'][] = $product;
                     $brand['productList'][] = $product;
                 }
                 }
@@ -319,7 +319,7 @@ class UserModel
                     $val['link'] = Helpers::url('/product/show_' . $val['product_skn'] . '.html');
                     $val['link'] = Helpers::url('/product/show_' . $val['product_skn'] . '.html');
                     $val['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
                     $val['image'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
                     $val['sales_price'] = Helpers::transPrice($val['sales_price']);
                     $val['sales_price'] = Helpers::transPrice($val['sales_price']);
-                    $val['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? $val['market_price'] . '.00' : false;
+                    $val['market_price'] = ($val['market_price'] - $val['sales_price'] > 0) ? Helpers::transPrice($val['market_price']) : false;
                 }
                 }
                 !empty($data) && $result['browseRecord'] = $data;
                 !empty($data) && $result['browseRecord'] = $data;
             }
             }