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

@@ -114,7 +114,7 @@
         &.no-login {
             padding: 0;
             height: pxToRem(88px);
-            .link-item {
+            .link-item p {
                 font-size: pxToRem(32px);
                 line-height: pxToRem(88px);
             }

@@ -187,10 +187,14 @@ class UserModel
             $datas = array();
             $product = array();
             foreach ($favProduct['data']['product_list'] as $val) {
+	            if (empty($val['product_skn'])) {
+		            continue;
+	            }
+
                 $product = array();
                 $product['fav_id'] = $val['product_id'];
-                $product['link'] = isset($val['goodsId']) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
-                $product['imgUrl'] = Helpers::getImageUrl($val['image'], 447, 596);
+                $product['link'] = isset($val['goodsId'], $val['cnAlphabet']) ? Helpers::url('/product/pro_' . $val['product_id'] . '_' . $val['goodsId'] . '/' . $val['cnAlphabet'] . '.html') : '';
+                $product['imgUrl'] = !empty($val['image']) ? Helpers::getImageUrl($val['image'], 447, 596) : '';
                 ;
                 $product['title'] = $val['product_name'];
                 $product['price'] = !empty($val['market_price']) ? '¥' . $val['market_price'] . '.00' : 0;
@@ -247,8 +251,12 @@ class UserModel
                 // 处理品牌产品
                 $product = array();
                 foreach ($val['new_product'] as $one) {
+	                if (empty($one['product_skn'])) {
+		                continue;
+	                }
+
                     $product = array();
-	                $product['link'] = isset($one['goods'][0]) ? 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['price'] = !empty($one['market_price']) ? '¥' . $one['market_price'] : 0;
                     $product['discount'] = ($one['market_price'] > $one['sales_price']) ? '¥' . $one['sales_price'] : false;

@@ -177,7 +177,7 @@ class NewsaleController extends AbstractAction
             $color = $this->get('color', null);
             $size = $this->get('size', null);
             $price = $this->get('price', null);
-            $p_d = '0.1,0.3';
+            $p_d = $this->get('discount', null);
             $dayLimit = $this->get('dayLimit', null);
             $limit = $this->get('limit', 60);
             $page = $this->get('page', 1);