fe / yohobuy-node · Commits

Go to a project

Authored by 刘传洋
Commit 5beb4f728651b71703ea6eea6913af4707637a59 2 parents 48b35de4 b137e707

m

Inline Side-by-side
Showing 3 changed files with 183 additions and 1 deletions
<!-- 凑单 -->
<div class="detail-body" id="goodsTogetherDetail">
<<<<<<< HEAD
<div class="slide-img">
<p>选赠品:<em><span
class="active">1元加价购</span><code>|</code><span>59元加价购</span><code>|</code><span>99元加价购</span></em></p>
... ... @@ -94,6 +95,138 @@
</div>
</li>
</ul>
=======
<div class="slide-img">
<p>选赠品:<em><span class="active">1元加价购</span><code>|</code><span>59元加价购</span><code>|</code><span>99元加价购</span></em></p>
<div class="side-img-dd">
<ul class="img-list">
<li class="img-item active">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
<i class="iconfont checked">&#xe6cb;</i>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<li class="img-item">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="{{url}}" target="_blank">
<img class="lazy" src="{{pic_url}}"/>
</a>
</div>
</li>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;"></a>
<a class="next iconfont" href="javascript:;"></a>
</div>
</ul>
</div>
</div>
<div class="detail-goods">
<div class="detail-bigpic">
<div class="bigpic">
<img src="">
</div>
<div class="bigpic none">
<img src="">
</div>
<div class="bigpic none">
<img src="">
</div>
<div class="bigpic none">
<img src="">
</div>
<div class="bigpic none">
<img src="">
</div>
<div class="bigpic none">
<img src="">
</div>
<div class="piclist">
<span class="pre"></span>
<div class="con">
<ul>
<li class="active"><img src=""></li>
<li><img src=""></li>
<li><img src=""></li>
<li><img src=""></li>
<li><img src=""></li>
</ul>
>>>>>>> b137e7078d98e4f848cddd915b4ed37ab573c624
</div>
</div>
<div class="detail-goods">
... ...
... ... @@ -153,6 +153,44 @@ $('.side-img-dd').slider2({
shownum: 5
});
// 店铺推荐
function loadTogetherGoods() {
// $.ajax({
// type: 'GET',
// url: '',
// data: {
// // skn: skn,
// size: 20,
// num: 1
// }
// }).then(function(data) {
// var pro = data.data.products;
// if (data.code === 200) {
// if (pro.length === 0) {
// return;
// }
// $('.individual-comment').find('.block-title .title').eq(0).removeClass('hide').addClass('cur');
// $('.individual-comment').find('.block-title .title').eq(1).removeClass('cur');
// $('.individual-comment').find('.block-title').find('.sep').removeClass('hide');
//
// $('#recommend-shop').removeClass('hide');
$('.side-img-dd').slider2({
shownum: 5,
isCircle: true
});
// } else {
// $('.individual-comment').find('.block-title .title:first-child').addClass('hide');
// $('.individual-comment').find('.block-title').find('.title').addClass('cur').prev('.sep').addClass('hide');
// $('#recommend-shop').detach();
// }
// });
}
loadTogetherGoods();
// 凑单弹框 详情切换
$('body').on('click', '.piclist li', function() {
pacList = $(this).index();
... ... @@ -464,4 +502,4 @@ console.log(dialog);
dialog.show();
});
require('./cart-action');
// require('./cart-action');
... ...
... ... @@ -459,10 +459,21 @@
box-sizing: border-box;
overflow: hidden;
margin-right: 20px;
position: relative;
&:nth-child(7n){
margin-right: 0;
}
}
.active {
border: 1px solid #000;
}
.checked {
position: absolute;
top: 4px;
right: 4px;
font-size: 15px;
color: #3a3a3a;
}
.good {
float: left;
width: 65px;
... ...