wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by 郝肖肖
Commit 8ab87f9701cbcbee2853ce20583abe8840ff02fe 2 parents 8fd3d1e7 f640a446

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

Inline Side-by-side
Showing 10 changed files with 39 additions and 2 deletions
... ... @@ -2646,6 +2646,10 @@ exports.init = function(num) {
$shopEntry.eq(shopEntryLen - 1).css({
width: '100%'
});
$shopEntry.eq(shopEntryLen - 1).find('.name').css({
width: '600px'
});
} else if (shopEntryLen % 3 === 2) {
$shopEntry.eq(shopEntryLen - 1).css({
width: '49%'
... ... @@ -2654,6 +2658,14 @@ exports.init = function(num) {
$shopEntry.eq(shopEntryLen - 2).css({
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({
... ...
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.

759 Bytes | W: | H:

13.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

759 Bytes | W: | H:

13.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -33,6 +33,10 @@ exports.init = function(num) {
$shopEntry.eq(shopEntryLen - 1).css({
width: '100%'
});
$shopEntry.eq(shopEntryLen - 1).find('.name').css({
width: '600px'
});
} else if (shopEntryLen % 3 === 2) {
$shopEntry.eq(shopEntryLen - 1).css({
width: '49%'
... ... @@ -41,6 +45,14 @@ exports.init = function(num) {
$shopEntry.eq(shopEntryLen - 2).css({
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({
... ...
... ... @@ -26,18 +26,31 @@
.name {
margin-left: 10px;
width: 75px;
}
.shop-name {
font-size: 16px;
color: #222;
line-height: 26px;
width: 100%;
height: 26px;
display: block;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.sorts {
color: #999;
font-size: 12px;
line-height: 18px;
width: 100%;
height: 18px;
display: block;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
a {
color: #999;
... ...
... ... @@ -78,8 +78,8 @@ class ItemModel
$goodsInfo['vipPrice'] = self::getVipDataByProductBaseInfo($baseInfo, $vipLevel, $uid);
//促销活动banner
$goodsInfo['activity'] = self::getActivityDataByProductBaseInfo($baseInfo);
if (isset($baseInfo['productPriceBo']['yohoCoinNum'])) {
if (isset($baseInfo['productPriceBo']['yohoCoinNum']) && $baseInfo['productPriceBo']['yohoCoinNum'] !== 0) {
array_push($goodsInfo['activity'],
array('type' => '返YOHO币', 'des' => '每件返 ' . $baseInfo['productPriceBo']['yohoCoinNum'] . '个 YOHO币')
);
... ...