Authored by htoooth

merge

... ... @@ -38,7 +38,7 @@
{{> product/package}}
<div class="other-infos">
<div class="description-material info-block" id="goodsMessage">
<div class="description-material info-block getnav" id="goodsMessage" data-id="0">
<p class="block-title"id="block-title-head">
<span class="title-head">
<span class="title cur">商品信息</span>
... ... @@ -110,7 +110,7 @@
{{/ material}}
</div>
</div>
<div class="description-material-tab info-block" id="sizeMessage">
<div class="description-material-tab info-block getnav" id="sizeMessage" data-id="1">
<p class="block-title">
<span class="title-head">
<span class="title cur">尺码信息</span>
... ... @@ -259,7 +259,7 @@
</div>
</div>{{/if}}
<div class="details info-block" id="goodsInside">
<div class="details info-block getnav" id="goodsInside" data-id="2">
<p class="block-title">
<span class="title-head">
<span class="title cur">商品详情</span>
... ... @@ -288,7 +288,7 @@
</textarea>
</div>
<div class="consult-comment info-block" id="judge">
<div class="consult-comment info-block getnav" id="judge" data-id="3">
<p class="block-title">
<span class="title-head">
... ... @@ -331,7 +331,7 @@
</div>
<div class="consult-comment info-block" id="goodsAsk">
<div class="consult-comment info-block getnav" id="goodsAsk" data-id="4">
<p class="block-title">
<span class="title-head">
... ... @@ -448,38 +448,6 @@
</div>
<!-- <div class="consults cc-content">
<h2>顾客咨询(<em class="consult-num">0</em>)</h2>
<ul id="consults-ul"></ul>
<p class="more-wrap">
<span class="load-more-consults load-more">
加载更多
<i class="iconfont">&#xe61d;</i>
</span>
</p>
<p class="btn-wrap">
<span id="consults-btn" class="btn">
<i class="iconfont">&#xe61e;</i>
我要咨询
</span>
</p>
<div class="new-consult hide">
<textarea class="my-consult"></textarea>
<span class="consult-warn warn-tip hide">
<i class="iconfont">&#xe61f;</i>
请输入咨询内容
</span>
<span id="submit-consult" class="btn submit-consult">提交咨询</span>
</div>
<div class="consult-success hide">
<p>
<span class="iconfont">&#xe605;</span>
咨询成功,请等待客服回复
</p>
</div>
</div> -->
</div>
{{/ consultComment}}
... ... @@ -496,7 +464,7 @@
<li><a href="#sizeMessage" class="option">&nbsp;&nbsp;尺码信息</a></li>
<li><a href="#goodsInside" class="option">&nbsp;&nbsp;商品详情</a></li>
<li><a href="#judge" class="option">&nbsp;&nbsp;商品评价</a></li>
<li><a href="#goodsAsk" class="option">&nbsp;&nbsp;商品咨询</a></li>
<li><a href="#goodsAsk" class="option">&nbsp;&nbsp;常见咨询</a></li>
</ul>
</div>
</div>
... ...
... ... @@ -17,13 +17,14 @@ module.exports = {
cookieDomain: '.yohobuy.com',
domains: {
favApi: 'http://192.168.102.31:8092/brower',
//api: 'http://api-test3.yohops.com:9999/',
//service: 'http://service-test3.yohops.com:9999/',
//
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/',
//api: 'http://dev-api.yohops.com:9999/',
// api: 'http://api-test3.yohops.com:9999/',
// service: 'http://service-test3.yohops.com:9999/',
// //
api: 'http://api.yoho.cn/',
service: 'http://service.yoho.cn/',
// api: 'http://dev-api.yohops.com:9999/',
// service: 'http://dev-service.yohops.com:9999/',
search: 'http://192.168.102.216:8080/yohosearch/'
... ...
... ... @@ -428,7 +428,7 @@ bindEvent.add(function() {
});
$enableNotifyYou.on('click', function() {
new Alert("fjdsl").show();
new Alert('fjdsl').show();
});
// 增加购买数量
... ... @@ -596,7 +596,7 @@ bindEvent.add(function() {
}
});
//套餐
// 套餐
$('#buy-detail').click(function() {
var opt = {
className: 'pkg-dialog',
... ... @@ -606,6 +606,7 @@ bindEvent.add(function() {
new Dialog(opt).show();
});
// 继续购物
$('#keep-shopping').click(function() {
$('#type-chose').slideDown(SLIDETIME);
... ... @@ -1199,6 +1200,7 @@ function loadRecommend() {
$('#recommend-shop').removeClass('hide');
$('#recommend-content').append(html);
$('.recommend-slider').slider2({
shownum: 5,
... ... @@ -1241,33 +1243,6 @@ $('.recommend-slider').on('click', '.img-item', function() {
window.loadRecommend = loadRecommend;
// 推荐和浏览切换
// $('.individual-comment').on('click', '.title', function() {
// var $this = $(this),
// index = $this.index();
//
// var $latestWalk = $('.latest-walk'),
// $recommendComment = $('#recommend-shop');
//
// if ($this.hasClass('cur')) {
// return;
// }
//
// $this.addClass('cur');
// $this.siblings('.cur').removeClass('cur');
//
// if (index === 0) {
// // 店铺推荐
// $recommendComment.slideDown(SLIDETIME);
// $latestWalk.slideUp(SLIDETIME);
// } else {
// // 最近游览
// fetchLatestWalk(); // eslint-disable-line
// $recommendComment.slideUp(SLIDETIME);
// $latestWalk.slideDown(SLIDETIME);
// }
// });
$('.bottom-tab').on('click', '.bottom-title', function() {
var $this = $(this),
index = $this.index();
... ... @@ -1361,13 +1336,37 @@ bindEvent.fire();
}());
$(window).scroll(function() {
var sc = $(document);
var win = $(window);
var scrollStart = $('.other-infos').offset().top;
var scrollEnd = $('#judge').offset().top;
if ($(document).scrollTop() >= scrollStart && $(document).scrollTop() <= scrollEnd) {
var scrollBottom = sc.height() - $('#after-service-switch').offset().top;
var scrollEnd = $('#textbox').offset().top;
if (sc.scrollTop() >= scrollStart && sc.scrollTop() <= scrollEnd) {
$('.redcar').addClass('fixednav');
} else {
$('.redcar').removeClass('fixednav');
}
if (sc.height() - win.height() - sc.scrollTop() <= scrollBottom) {
$('.redcar').height(win.height() - (scrollBottom + win.height() + sc.scrollTop() - sc.height()));
} else {
$('.redcar').height(1000);
}
$('.getnav').each(function(i, ele) {
var data;
if ($(ele).offset().top - $(window).scrollTop() < 100) {
data = $(ele).data('id');
$('.redcar-nav li:eq(' + data + ')').siblings().find('a').removeClass('fixed');
$('.redcar-nav li:eq(' + data + ')').find('a').addClass('fixed');
}
});
});
$('.redcar').on('click', '.option', function() {
... ... @@ -1381,5 +1380,12 @@ $('.redcar').on('click', '.option', function() {
$this.addClass('fixed');
});
$(function() {
$('.bottom-tab .change').click(function() {
$('.img-brand-switch .next').trigger('click');
});
});
// 数据懒加载
dataLazyLoad.init({cls: '.datalazyload', threshold: 0});
... ...
... ... @@ -841,18 +841,14 @@
right:22px;
}
.redcar{
background-color: #f5f5f5;
float: left;
height: 1000px;
height: 240px;
margin-top: 30px;
width: 14.5%;
border-right: 1px solid #eaeceb;
/*position: fixed;
top:-30px;
right:22px;*/
height: 1000px;
.redcar-btn{
display:block;
... ... @@ -874,7 +870,6 @@
.redcar-nav{
padding: 20px 40px 0px 40px;
li{
display: block;
font-size: 14px;
... ... @@ -1564,17 +1559,18 @@
.latest-walk {
overflow: inherit;
border-top: none;
display: none;
.goods {
width: 990px;
width: 1150px;
margin: 0 auto;
height: auto;
margin-top: 30px;
height: 410px;
margin-top: 20px;
> div {
float: left;
width: 180px;
margin-right: 22px;
width: 222px;
margin-right: 10px;
&:nth-child(5n) {
margin-right: 0;
... ... @@ -1583,8 +1579,8 @@
}
img {
height: 240px;
width: 180px;
height: 300px;
width: 222px;
display: block;
}
... ... @@ -1593,12 +1589,14 @@
margin-top: 5px;
color: #222;
line-height: 16px;
margin: 0 auto;
}
.price {
color: #222;
font-weight: bold;
margin-top: 5px;
text-align: center;
}
.market-price {
... ... @@ -1739,7 +1737,7 @@
.img-brand-switch {
display: block;
display: none;
a {
position: absolute;
top: 50%;
... ...