Authored by biao

update for close jit window when click body

@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
2 <div class="order"> 2 <div class="order">
3 {{# returnsList}} 3 {{# returnsList}}
4 {{> common/subtitle}} 4 {{> common/subtitle}}
5 - {{#if list}}  
6 <div class="table"> 5 <div class="table">
7 <ul class="header"> 6 <ul class="header">
8 <li class="info">商品信息</li> 7 <li class="info">商品信息</li>
@@ -10,6 +9,7 @@ @@ -10,6 +9,7 @@
10 <li class="op">操作</li> 9 <li class="op">操作</li>
11 </ul> 10 </ul>
12 </div> 11 </div>
  12 + {{#if list}}
13 {{#list}} 13 {{#list}}
14 <div class="table"> 14 <div class="table">
15 {{> order/order-header}} 15 {{> order/order-header}}
@@ -54,6 +54,17 @@ if ($('.left-time').length) { @@ -54,6 +54,17 @@ if ($('.left-time').length) {
54 countDown.start(); 54 countDown.start();
55 } 55 }
56 56
  57 +$('body').on('click', function(e) {
  58 + if ($(e.target).hasClass('show-package')) {
  59 + return false;
  60 + }
  61 +
  62 + e.preventDefault();
  63 +
  64 + if (!$('.package-list').hasClass('hide')) {
  65 + $('.package-list').addClass('hide');
  66 + }
  67 +});
57 68
58 $('.show-package').on('click', function() { 69 $('.show-package').on('click', function() {
59 $(this).next('.package-list').toggleClass('hide'); 70 $(this).next('.package-list').toggleClass('hide');
@@ -29,7 +29,7 @@ module.exports = { @@ -29,7 +29,7 @@ module.exports = {
29 var timeStr = min + '分'; 29 var timeStr = min + '分';
30 30
31 31
32 - if (src <= 0) { 32 + if (parseInt(src, 10) <= 0) {
33 timeStr = '已失效'; 33 timeStr = '已失效';
34 $('.hide-when-invalid').hide(); 34 $('.hide-when-invalid').hide();
35 $('.user-order .table .common-column .pay-operation .left-time').css('margin-left', '0'); 35 $('.user-order .table .common-column .pay-operation .left-time').css('margin-left', '0');
@@ -69,4 +69,8 @@ @@ -69,4 +69,8 @@
69 left: 3px; 69 left: 3px;
70 } 70 }
71 } 71 }
  72 +
  73 + .check-all:hover {
  74 + @extend .blue;
  75 + }
72 } 76 }
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 {{# sub_express_deatil}} 14 {{# sub_express_deatil}}
15 {{#if @first}} 15 {{#if @first}}
16 <div class="tip"> 16 <div class="tip">
17 - <p>以上为最新跟踪信息<a href='/me/order/detail?orderCode={{order_code}}' target="_blank">查看全部</a></p> 17 + <p>以上为最新跟踪信息<a class="check-all" href='/me/order/detail?orderCode={{order_code}}' target="_blank">查看全部</a></p>
18 </div> 18 </div>
19 {{/if}} 19 {{/if}}
20 {{/ sub_express_deatil}} 20 {{/ sub_express_deatil}}