fe / YOHOBUYWAP · Commits

Go to a project

Authored by 毕凯
Commit 062253b8824951635dcc95e7ac399f432c755d5e 2 parents 59b1064b 399fe691

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

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
@@ -104,7 +104,7 @@ class SideModel @@ -104,7 +104,7 @@ class SideModel
104 'textCn' => '查看全部', 104 'textCn' => '查看全部',
105 'textEn' => '', 105 'textEn' => '',
106 'back' => false, 106 'back' => false,
107 - 'isSelect' => ($guangChoosed === 'all') ? true : false, 107 + 'isSelect' => ($guangChoosed === 'lifestyle' || $guangChoosed === 'kids') ? true : false,
108 'url' => Helpers::url('', array('gender' => '1,2,3'), 'guang') 108 'url' => Helpers::url('', array('gender' => '1,2,3'), 'guang')
109 ), 109 ),
110 2 => array( 110 2 => array(
@@ -239,8 +239,8 @@ class UserModel @@ -239,8 +239,8 @@ class UserModel
239 $product = array(); 239 $product = array();
240 $product['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : ''; 240 $product['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_skn'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
241 $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : ''; 241 $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
242 - $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] . '.00' : 0;  
243 - $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] . '.00' : 0; 242 + $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
  243 + $product['discount'] = !empty($one['sales_price']) ? '¥' . $one['sales_price'] : 0;
244 244
245 $brand['productList'][] = $product; 245 $brand['productList'][] = $product;
246 } 246 }