wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit 1f1f3230892e2a6a27760e3884ded256eaea152a 2 parents e7b794bc d4cb1d77

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

Inline Side-by-side
Showing 3 changed files with 13 additions and 5 deletions
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 &.no-login { 114 &.no-login {
115 padding: 0; 115 padding: 0;
116 height: pxToRem(88px); 116 height: pxToRem(88px);
117 - .link-item { 117 + .link-item p {
118 font-size: pxToRem(32px); 118 font-size: pxToRem(32px);
119 line-height: pxToRem(88px); 119 line-height: pxToRem(88px);
120 } 120 }
@@ -187,10 +187,14 @@ class UserModel @@ -187,10 +187,14 @@ class UserModel
187 $datas = array(); 187 $datas = array();
188 $product = array(); 188 $product = array();
189 foreach ($favProduct['data']['product_list'] as $val) { 189 foreach ($favProduct['data']['product_list'] as $val) {
  190 + if (empty($val['product_skn'])) {
  191 + continue;
  192 + }
  193 +
190 $product = array(); 194 $product = array();
191 $product['fav_id'] = $val['product_id']; 195 $product['fav_id'] = $val['product_id'];
192 - $product['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';  
193 - $product['imgUrl'] = Helpers::getImageUrl($val['image'], 447, 596); 196 + $product['link'] = isset($val['goodsId'], $val['cnAlphabet']) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
  197 + $product['imgUrl'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
194 ; 198 ;
195 $product['title'] = $val['product_name']; 199 $product['title'] = $val['product_name'];
196 $product['price'] = !empty($val['market_price']) ? '¥' . $val['market_price'] . '.00' : 0; 200 $product['price'] = !empty($val['market_price']) ? '¥' . $val['market_price'] . '.00' : 0;
@@ -247,8 +251,12 @@ class UserModel @@ -247,8 +251,12 @@ class UserModel
247 // 处理品牌产品 251 // 处理品牌产品
248 $product = array(); 252 $product = array();
249 foreach ($val['new_product'] as $one) { 253 foreach ($val['new_product'] as $one) {
  254 + if (empty($one['product_skn'])) {
  255 + continue;
  256 + }
  257 +
250 $product = array(); 258 $product = array();
251 - $product['link'] = isset($one['goods'][0]) ? Helpers::url('/product/pro_' . $one['product_id'] . '_' . $one['goods'][0]['id'] . '/' . $one['cnAlphabet'] . '.html') : ''; 259 + $product['link'] = isset($one['goods'][0], $one['cnAlphabet']) ? Helpers::url('/product/pro_' . $one['product_id'] . '_' . $one['goods'][0]['id'] . '/' . $one['cnAlphabet'] . '.html') : '';
252 $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : ''; 260 $product['imgUrl'] = (isset($one['default_images']) && !empty($one['default_images'])) ? Images::getImageUrl($one['default_images'], 235, 314) : '';
253 $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0; 261 $product['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
254 $product['discount'] = ($one['market_price'] > $one['sales_price']) ? '¥' . $one['sales_price'] : false; 262 $product['discount'] = ($one['market_price'] > $one['sales_price']) ? '¥' . $one['sales_price'] : false;
@@ -177,7 +177,7 @@ class NewsaleController extends AbstractAction @@ -177,7 +177,7 @@ class NewsaleController extends AbstractAction
177 $color = $this->get('color', null); 177 $color = $this->get('color', null);
178 $size = $this->get('size', null); 178 $size = $this->get('size', null);
179 $price = $this->get('price', null); 179 $price = $this->get('price', null);
180 - $p_d = '0.1,0.3'; 180 + $p_d = $this->get('discount', null);
181 $dayLimit = $this->get('dayLimit', null); 181 $dayLimit = $this->get('dayLimit', null);
182 $limit = $this->get('limit', 60); 182 $limit = $this->get('limit', 60);
183 $page = $this->get('page', 1); 183 $page = $this->get('page', 1);