Authored by 梁志锋

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -201,8 +201,8 @@ class Helpers @@ -201,8 +201,8 @@ class Helpers
201 $result['product_id'] = $productData['product_id']; 201 $result['product_id'] = $productData['product_id'];
202 $result['thumb'] = Images::getImageUrl($productData['default_images'], $width, $height); 202 $result['thumb'] = Images::getImageUrl($productData['default_images'], $width, $height);
203 $result['name'] = $productData['product_name']; 203 $result['name'] = $productData['product_name'];
204 - $result['price'] = $productData['market_price'];  
205 - $result['salePrice'] = $productData['sales_price']; 204 + $result['price'] = $productData['market_price'] . '.00';
  205 + $result['salePrice'] = $productData['sales_price'] . '.00';
206 $result['is_soon_sold_out'] = ($productData['is_soon_sold_out'] === 'Y'); 206 $result['is_soon_sold_out'] = ($productData['is_soon_sold_out'] === 'Y');
207 $result['url'] = SITE_MAIN . '/product/pro_' . $productData['product_id'] . '_' 207 $result['url'] = SITE_MAIN . '/product/pro_' . $productData['product_id'] . '_'
208 . $productData['goods_list'][0]['goods_id'] 208 . $productData['goods_list'][0]['goods_id']
@@ -73,6 +73,7 @@ $sideNav.on('touchend', 'li', function () { @@ -73,6 +73,7 @@ $sideNav.on('touchend', 'li', function () {
73 $('.sub-nav').removeClass('show'); 73 $('.sub-nav').removeClass('show');
74 $(this).find('.sub-nav').addClass('show'); 74 $(this).find('.sub-nav').addClass('show');
75 } 75 }
  76 + return false;
76 }); 77 });
77 78
78 //返回一级导航,收起二级导航 79 //返回一级导航,收起二级导航