Showing
3 changed files
with
17 additions
and
14 deletions
@@ -75,10 +75,9 @@ | @@ -75,10 +75,9 @@ | ||
75 | {{#with shoppingCartData}} | 75 | {{#with shoppingCartData}} |
76 | {{#isY is_multi_package}} | 76 | {{#isY is_multi_package}} |
77 | <div class="multi-package-row"> | 77 | <div class="multi-package-row"> |
78 | - 温馨提示:您购买的商品<em class="red">分属不同仓库</em>,需要品牌商调货,<em class="red">预计3-5天内发货给您</em> | 78 | + 温馨提示:您购买的商品<em class="red">分属不同仓库</em>,{{../package_title}},<em class="red">预计3-5天内发货给您</em> |
79 | <span class="show-package"></span> | 79 | <span class="show-package"></span> |
80 | <div class="package-list hide"> | 80 | <div class="package-list hide"> |
81 | - <div class="package-up-icon"></div> | ||
82 | {{#each ../package_list}} | 81 | {{#each ../package_list}} |
83 | <div class="package-item"> | 82 | <div class="package-item"> |
84 | <p class="package-title bold">包裹{{math @index '+' 1}}:{{#isEqual supplier_id '0'}}总仓发货{{^}}异地调拨 <em class="red">预计3-5天内发货给您</em>{{/isEqual}}</p> | 83 | <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 = { | @@ -429,6 +429,7 @@ multiPackage = { | ||
429 | 429 | ||
430 | this.$el.on('click', '.show-package', function(e) { | 430 | this.$el.on('click', '.show-package', function(e) { |
431 | that.$pkgList.toggleClass('hide'); | 431 | that.$pkgList.toggleClass('hide'); |
432 | + $(this).toggleClass('on'); | ||
432 | 433 | ||
433 | e.stopPropagation(); | 434 | e.stopPropagation(); |
434 | }).on('click', '.toggle-icon', function() { | 435 | }).on('click', '.toggle-icon', function() { |
@@ -444,7 +445,7 @@ multiPackage = { | @@ -444,7 +445,7 @@ multiPackage = { | ||
444 | return; | 445 | return; |
445 | } | 446 | } |
446 | 447 | ||
447 | - that.$pkgList.addClass('hide'); | 448 | + that.$pkgList.addClass('hide').prev().removeClass('on'); |
448 | }); | 449 | }); |
449 | }, | 450 | }, |
450 | pkgPageControl: function($el, flag) { | 451 | pkgPageControl: function($el, flag) { |
@@ -530,19 +530,17 @@ | @@ -530,19 +530,17 @@ | ||
530 | background: url(/cart/help-mark.png); | 530 | background: url(/cart/help-mark.png); |
531 | cursor: pointer; | 531 | cursor: pointer; |
532 | vertical-align: text-bottom; | 532 | vertical-align: text-bottom; |
533 | - } | ||
534 | 533 | ||
535 | - .package-up-icon { | ||
536 | - width: 18px; | ||
537 | - height: 9px; | ||
538 | - background: url(/cart/jit-top-row.png); | ||
539 | - position: absolute; | ||
540 | - top: -9px; | ||
541 | - left: 258px; | 534 | + &.on:after { |
535 | + content: ''; | ||
536 | + width: 18px; | ||
537 | + height: 9px; | ||
538 | + background: url(/cart/jit-top-row.png); | ||
539 | + position: absolute; | ||
540 | + top: 32px; | ||
541 | + margin-left: -9px; | ||
542 | + z-index: 10; | ||
542 | 543 | ||
543 | - + .package-item { | ||
544 | - border-top: 0; | ||
545 | - margin-top: 18px; | ||
546 | } | 544 | } |
547 | } | 545 | } |
548 | 546 | ||
@@ -560,6 +558,11 @@ | @@ -560,6 +558,11 @@ | ||
560 | position: relative; | 558 | position: relative; |
561 | border-top: 1px solid $borderColor; | 559 | border-top: 1px solid $borderColor; |
562 | 560 | ||
561 | + &:first-child { | ||
562 | + border-top: 0; | ||
563 | + margin-top: 18px; | ||
564 | + } | ||
565 | + | ||
563 | .toggle-btns { | 566 | .toggle-btns { |
564 | display: none; | 567 | display: none; |
565 | } | 568 | } |
-
Please register or login to post a comment