Authored by yyq

commit

... ... @@ -75,10 +75,9 @@
{{#with shoppingCartData}}
{{#isY is_multi_package}}
<div class="multi-package-row">
温馨提示:您购买的商品<em class="red">分属不同仓库</em>需要品牌商调货<em class="red">预计3-5天内发货给您</em>
温馨提示:您购买的商品<em class="red">分属不同仓库</em>{{../package_title}}<em class="red">预计3-5天内发货给您</em>
<span class="show-package"></span>
<div class="package-list hide">
<div class="package-up-icon"></div>
{{#each ../package_list}}
<div class="package-item">
<p class="package-title bold">包裹{{math @index '+' 1}}:{{#isEqual supplier_id '0'}}总仓发货{{^}}异地调拨 <em class="red">预计3-5天内发货给您</em>{{/isEqual}}</p>
... ...
... ... @@ -429,6 +429,7 @@ multiPackage = {
this.$el.on('click', '.show-package', function(e) {
that.$pkgList.toggleClass('hide');
$(this).toggleClass('on');
e.stopPropagation();
}).on('click', '.toggle-icon', function() {
... ... @@ -444,7 +445,7 @@ multiPackage = {
return;
}
that.$pkgList.addClass('hide');
that.$pkgList.addClass('hide').prev().removeClass('on');
});
},
pkgPageControl: function($el, flag) {
... ...
... ... @@ -530,19 +530,17 @@
background: url(/cart/help-mark.png);
cursor: pointer;
vertical-align: text-bottom;
}
.package-up-icon {
width: 18px;
height: 9px;
background: url(/cart/jit-top-row.png);
position: absolute;
top: -9px;
left: 258px;
&.on:after {
content: '';
width: 18px;
height: 9px;
background: url(/cart/jit-top-row.png);
position: absolute;
top: 32px;
margin-left: -9px;
z-index: 10;
+ .package-item {
border-top: 0;
margin-top: 18px;
}
}
... ... @@ -560,6 +558,11 @@
position: relative;
border-top: 1px solid $borderColor;
&:first-child {
border-top: 0;
margin-top: 18px;
}
.toggle-btns {
display: none;
}
... ...