Authored by htoooth

merge

... ... @@ -1393,10 +1393,10 @@ $(function() {
type: 'GET',
url: '/product/detail/getPacakge',
data: {
skn: '51127118'
skn: skn
}
}).then(function(result) {
if (result.code === 200) {
if (result.code === 200 && result.data.packageData.length > 0) {
var packageTpl = require('hbs/product/package.hbs'); // eslint-disable-line
pkgData = result.data;
... ... @@ -1406,6 +1406,8 @@ $(function() {
$('.good-info .good-detail-text > a').dotdotdot({
wrap: 'letter'
});
} else {
$('#package').addClass('hide');
}
});
... ... @@ -1516,11 +1518,13 @@ $('.bottom-tab').on('click', '.bottom-title', function() {
// 店铺推荐
$recommendComment.slideDown(SLIDETIME);
$latestWalk.slideUp(SLIDETIME);
$('.change').removeClass('hide');
} else {
// 最近游览
fetchLatestWalk(); // eslint-disable-line
$recommendComment.slideUp(SLIDETIME);
$latestWalk.slideDown(SLIDETIME);
$('.change').addClass('hide');
}
});
... ... @@ -1633,6 +1637,16 @@ $('.redcar').on('click', '.option', function() {
$this.addClass('fixed');
});
$('.redcar').on('click', function() {
var $addToCart = $('#add-to-cart');
var sc = $(document);
if (maxStock === -1) {
sc.scrollTop(0);
} else {
$addToCart.trigger('click');
}
});
$(function() {
$('.bottom-tab .change').click(function() {
$('.img-brand-switch .next').trigger('click');
... ...
... ... @@ -748,8 +748,10 @@
padding-bottom: 30px;
border-left: 1px solid #eaeceb;
border-right: 1px solid #eaeceb;
width: 980px;
border-bottom: 1px solid #eaeceb;
width: 988px;
float: left;
margin-top: 30px;
.video-player {
width: 750px;
... ... @@ -843,17 +845,18 @@
position: fixed;
top:-30px;
margin-left: 982px;
margin-left: 990px;
}
.redcar{
background-color: #f5f5f5;
float: left;
height: 240px;
margin-top: 30px;
width: 165px;
width: 159px;
border-right: 1px solid #eaeceb;
height: 1000px;
margin-top: 30px;
.redcar-btn{
display:block;
... ... @@ -873,7 +876,7 @@
}
.redcar-nav{
padding: 20px 40px 0px 40px;
padding: 20px 30px 0px 30px;
li{
display: block;
... ... @@ -919,10 +922,17 @@
}
#goodsMessage{
margin-top: 0;
margin-left: 0;
margin-right: 0;
}
.info-block {
margin-top: 30px;
margin-left: 40px;
margin-right: 40px;
color: #999;
border-top: 2px solid #eaeceb;
font-size: 12px;
... ... @@ -971,7 +981,7 @@
}
.info-bootom {
margin-top: 0px;
margin: 0px;
}
#block-title-head {
... ... @@ -991,7 +1001,7 @@
.title {
display: inline-block;
padding-top: 15px;
font-weight: bold;
cursor: pointer;
font-size: 16px;
margin-left: auto;
... ... @@ -1954,7 +1964,7 @@
}
.commom-consults{
margin: 10px 40px 10px 40px;
margin: 10px auto;
.common-question{
width: 100%;
... ... @@ -2099,7 +2109,7 @@
padding: 8px 26px;
text-align: center;
background-color: #444;
font-weight: bold;
font-weight: 100;
}
}
}
... ...