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

@@ -2646,6 +2646,10 @@ exports.init = function(num) {
             $shopEntry.eq(shopEntryLen - 1).css({
             $shopEntry.eq(shopEntryLen - 1).css({
                 width: '100%'
                 width: '100%'
             });
             });
+
+            $shopEntry.eq(shopEntryLen - 1).find('.name').css({
+                width: '600px'
+            });
         } else if (shopEntryLen % 3 === 2) {
         } else if (shopEntryLen % 3 === 2) {
             $shopEntry.eq(shopEntryLen - 1).css({
             $shopEntry.eq(shopEntryLen - 1).css({
                 width: '49%'
                 width: '49%'
@@ -2654,6 +2658,14 @@ exports.init = function(num) {
             $shopEntry.eq(shopEntryLen - 2).css({
             $shopEntry.eq(shopEntryLen - 2).css({
                 width: '49%'
                 width: '49%'
             });
             });
+
+            $shopEntry.eq(shopEntryLen - 1).find('.name').css({
+                width: '230px'
+            });
+
+            $shopEntry.eq(shopEntryLen - 2).find('.name').css({
+                width: '230px'
+            });
         }
         }
 
 
         $('.shop-entry:nth-child(3n+1)').css({
         $('.shop-entry:nth-child(3n+1)').css({

@@ -33,6 +33,10 @@ exports.init = function(num) {
             $shopEntry.eq(shopEntryLen - 1).css({
             $shopEntry.eq(shopEntryLen - 1).css({
                 width: '100%'
                 width: '100%'
             });
             });
+
+            $shopEntry.eq(shopEntryLen - 1).find('.name').css({
+                width: '600px'
+            });
         } else if (shopEntryLen % 3 === 2) {
         } else if (shopEntryLen % 3 === 2) {
             $shopEntry.eq(shopEntryLen - 1).css({
             $shopEntry.eq(shopEntryLen - 1).css({
                 width: '49%'
                 width: '49%'
@@ -41,6 +45,14 @@ exports.init = function(num) {
             $shopEntry.eq(shopEntryLen - 2).css({
             $shopEntry.eq(shopEntryLen - 2).css({
                 width: '49%'
                 width: '49%'
             });
             });
+
+            $shopEntry.eq(shopEntryLen - 1).find('.name').css({
+                width: '230px'
+            });
+
+            $shopEntry.eq(shopEntryLen - 2).find('.name').css({
+                width: '230px'
+            });
         }
         }
 
 
         $('.shop-entry:nth-child(3n+1)').css({
         $('.shop-entry:nth-child(3n+1)').css({

@@ -26,18 +26,31 @@
 
 
     .name {
     .name {
         margin-left: 10px;
         margin-left: 10px;
+        width: 75px;
     }
     }
 
 
     .shop-name {
     .shop-name {
         font-size: 16px;
         font-size: 16px;
         color: #222;
         color: #222;
         line-height: 26px;
         line-height: 26px;
+        width: 100%;
+        height: 26px;
+        display: block;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
     }
     }
 
 
     .sorts {
     .sorts {
         color: #999;
         color: #999;
         font-size: 12px;
         font-size: 12px;
         line-height: 18px;
         line-height: 18px;
+        width: 100%;
+        height: 18px;
+        display: block;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
 
 
         a {
         a {
             color: #999;
             color: #999;

@@ -78,8 +78,8 @@ class ItemModel
         $goodsInfo['vipPrice'] = self::getVipDataByProductBaseInfo($baseInfo, $vipLevel, $uid);
         $goodsInfo['vipPrice'] = self::getVipDataByProductBaseInfo($baseInfo, $vipLevel, $uid);
         //促销活动banner
         //促销活动banner
         $goodsInfo['activity'] = self::getActivityDataByProductBaseInfo($baseInfo);
         $goodsInfo['activity'] = self::getActivityDataByProductBaseInfo($baseInfo);
-
-        if (isset($baseInfo['productPriceBo']['yohoCoinNum'])) {
+        
+        if (isset($baseInfo['productPriceBo']['yohoCoinNum']) && $baseInfo['productPriceBo']['yohoCoinNum'] !== 0) {
             array_push($goodsInfo['activity'],
             array_push($goodsInfo['activity'],
                 array('type' => '返YOHO币', 'des' => '每件返 ' . $baseInfo['productPriceBo']['yohoCoinNum'] . '个 YOHO币')
                 array('type' => '返YOHO币', 'des' => '每件返 ' . $baseInfo['productPriceBo']['yohoCoinNum'] . '个 YOHO币')
             );
             );