fe / yohobuy-node · Commits

Go to a project

Authored by 郭成尧
Commit 9b367b9c4fdf1ddcce696ffd686a3ece869d604e 2 parents f9f84333 0b8a7685

Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6

Inline Side-by-side
Showing 5 changed files with 24 additions and 100 deletions
... ... @@ -73,7 +73,7 @@
</p>
<div class="goodsList hide">
{{#goodsList}}
<div class="list" imgUrl="{{image imagesUrl 220 300}}" url="{{goodsId}}" cover="{{cover1}}"></div>
<li data-src="{{image imagesUrl 235 314}}" data-url="{{../url}}"></li>
{{/goodsList}}
</div>
</div>
... ...

2.67 KB | W: | H:

3.62 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -83,88 +83,12 @@ exports.init = function(num) {
});
}
// 原来的
// productList.addHandler('MouseEnter', function(event) {
// var itemMr = 10, // list的右边距
// itemMb = 35, // list的下边距
// ulStr = '',
// ulNum,
// wrapperWidth,
// diffWidth,
// wrapperX,
// wrapperY,
// wrapperPl, // 鼠标移入时弹层的左内边距
// wrapperPt, // 鼠标移入时弹层的上内边距
// containerPt, // 商品列表容器的上内边距
// _from = event.target.attr('data-from') || '';
//
// $.ajax({
// type: 'POST',
// url: '/product/list/getProductPic',
// dataType: 'jsonp',
// jsonp: 'callback',
// data: {
// skn: event.target.attr('data-skn'),
// skc: event.target.attr('data-skc')
// }
// }).then(function(res) {
// var data = res.data,
// colorList = createColorList(data.pics, _from);
//
// removeHtmlFn();
//
// ulStr = colorList.colorListStr; // ajax请求的颜色列表
// ulNum = colorList.ulNum;// ajax请求的颜色的数量
//
// $goodInfoMain.append(event.targetDuplicate);
// $goodSelectColor.append($(ulStr));
//
// // 点击收藏商品不需要了
// // if (data.isFavorite) {
// // $goodInfoMain.find('.col-btn').addClass('coled');
// // } else {
// // $goodInfoMain.find('.col-btn').removeClass('coled');
// // }
//
// wrapperPl = $goodItemWrapper.css('paddingLeft');
// wrapperPt = $goodItemWrapper.css('paddingTop');
// containerPt = $goodsContainer.css('paddingTop');
//
// wrapperWidth = 10 + (15 + 50) * ulNum + event.targetWidth;
//
// // wrapperWidth = $goodItemWrapper.width();
//
// wrapperX = (event.targetX - 1) * (event.targetWidth + itemMr) - (parseInt(wrapperPl) + 1);
// wrapperY = (event.targetY - 1) *
// (event.targetHeight + itemMb) + parseInt(containerPt) - (parseInt(wrapperPt) + 1);
//
// // todo
// // event.offsetR表示当前列表距离浏览器右侧边缘的距离
// diffWidth = event.offsetR - ((15 + 50) * ulNum + 25);
//
// if (diffWidth <= 0) {
// wrapperX = wrapperX + diffWidth - 25;
// }
// $goodItemWrapper.css({
// width: wrapperWidth,
// left: wrapperX,
// top: wrapperY,
// display: 'inline-block'
// });
//
// // 鼠标悬浮获取到商品信息后显示第一张图片
// if (data.pics[0] && data.pics[0].src) {
// $goodInfoMain.find('.good-thumb img').attr('src', data.pics[0].src);
// }
// });
// });
productList.addHandler('MouseEnter', function(event) {
var itemMr = 10, // list的右边距
itemMb = 35, // list的下边距
imageList,
colorList,
pic, pics,
pic,
pics,
ulNum, ulStr,
wrapperWidth,
diffWidth,
... ... @@ -177,21 +101,13 @@ exports.init = function(num) {
pics = [];
event.target.find('.goodsList').find('.list').each(function() {
pic = {
url: $(this).attr('url'),
src: $(this).attr('imgUrl'),
coverImg: $(this).attr('cover')
};
event.target.find('.hideList > li').each(function() {
pic = $(this).data();
pic.coverImg = pic.src;
pics.push(pic);
});
imageList = {
pics: pics
};
colorList = createColorList(imageList.pics, _from);
colorList = createColorList(pics, _from);
removeHtmlFn();
... ... @@ -227,8 +143,8 @@ exports.init = function(num) {
});
// 鼠标悬浮获取到商品信息后显示第一张图片
if (imageList.pics[0] && imageList.pics[0].src) {
$goodInfoMain.find('.good-thumb img').attr('src', imageList.pics[0].src);
if (pics[0] && pics[0].src) {
$goodInfoMain.find('.good-thumb img').attr('src', pics[0].src);
}
});
... ... @@ -242,11 +158,11 @@ exports.init = function(num) {
});
};
console.log(1111);
// 鼠标放在颜色列表上效果
$(document).on('hover', '.good-select-color li', function() {
$(document).on('mouseenter', '.good-select-color li', function() {
var coverImg = $(this).find('img').attr('data-cover'),
$coverImg = $(this).closest('.good-item-wrapper').find('.good-detail-img').find('img');
$coverImg = $(this).closest('.good-item-wrapper').find('.good-detail-img img');
$coverImg.attr('src', coverImg);
});
... ...
... ... @@ -314,7 +314,7 @@
background: resolve('layout/outlets.png') no-repeat center center;
width: 200px;
height: 34px;
left: 42%;
left: 45%;
margin-top: 28px;
position: absolute;
display: none;
... ... @@ -437,19 +437,20 @@
top: 30px;
right: -14px;
width: 378px;
background: #f8f8f8 resolve('layout/empty_car.png') no-repeat 106px 132px;
z-index: 1000;
background: #f8f8f8;
display: none;
.empty-cart {
padding: 280px 0 200px;
text-align: center;
background: resolve('layout/empty_car.png') no-repeat 106px 132px;
}
.loading-cart {
padding: 200px 0;
text-align: center;
background: #f8f8f8 reslove('layout/loading.gif') no-repeat center 170px;
background: resolve('layout/loading.gif') no-repeat center 170px;
}
.rich-cart {
... ... @@ -744,7 +745,6 @@
}
.sub-nav-list {
padding-left: 15%;
a {
color: #222;
... ... @@ -760,6 +760,10 @@
li:hover a {
border-color: #555;
}
li:first-child {
margin-left: 15%;
}
}
}
... ...
... ... @@ -57,4 +57,8 @@
}
}
.brand .attr-content {
max-width: 730px;
}
}
... ...