Authored by 毕凯

合并代码

@@ -79,22 +79,18 @@ $('.cart-goods').on('touchstart', '.checkbox', function() { @@ -79,22 +79,18 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
79 }); 79 });
80 }).on('touchstart', '.icon-edit', function() { 80 }).on('touchstart', '.icon-edit', function() {
81 81
82 - //var $this = $(this);  
83 - //  
84 - //var $cartgood = $this.closest('.shopping-cart-good');  
85 - //  
86 - ////var id = $this.closest('.shopping-cart-good').data('id');  
87 - //  
88 - //var $viewGood = $cartgood.find('.deps');  
89 - // $editGoot = $cartgood.find('.calculate-num');  
90 - //  
91 - //if ($viewGood.hasClass('show')) {  
92 - // $viewGood.removeClass('show').addClass('hide');  
93 - // $editGoot.removeClass('hide').addClass('show');  
94 - //} else {  
95 - // $viewGood.removeClass('hide').addClass('show');  
96 - // $editGoot.removeClass('show').addClass('hide');  
97 - //} 82 + var $this = $(this),
  83 + $cartgood = $this.closest('.shopping-cart-good'),
  84 + $viewGood = $cartgood.find('.deps'),
  85 + $editGoot = $cartgood.find('.calculate-num');
  86 +
  87 + if ($viewGood.hasClass('show')) {
  88 + $viewGood.removeClass('show').addClass('hide');
  89 + $editGoot.removeClass('hide').addClass('show');
  90 + } else {
  91 + $viewGood.removeClass('hide').addClass('show');
  92 + $editGoot.removeClass('show').addClass('hide');
  93 + }
98 94
99 95
100 }).on('touchstart', '.icon-del', function(e) { 96 }).on('touchstart', '.icon-del', function(e) {
@@ -41,7 +41,6 @@ @@ -41,7 +41,6 @@
41 {{> cart/cart-content}} 41 {{> cart/cart-content}}
42 </div> 42 </div>
43 {{/ preSellCart}} 43 {{/ preSellCart}}
44 -  
45 {{/ shoppingCart}} 44 {{/ shoppingCart}}
46 </div> 45 </div>
47 46
@@ -53,6 +52,5 @@ @@ -53,6 +52,5 @@
53 </div> 52 </div>
54 {{> product/recommend-for-you}} 53 {{> product/recommend-for-you}}
55 </div> 54 </div>
56 -  
57 {{> cart/chose-panel}} 55 {{> cart/chose-panel}}
58 {{> layout/footer}} 56 {{> layout/footer}}
1 <div class="shopping-cart-good clearfix" data-id={{id}}> 1 <div class="shopping-cart-good clearfix" data-id={{id}}>
2 - {{#if isSoldOut}}  
3 - <p class="">失效</p> 2 + <span class="checkbox icon-cb-checked iconfont"></span>
  3 + <!-- {{#if isSoldOut}}
  4 +<p class="">失效</p>
4 {{^}} 5 {{^}}
5 {{#if isGift}} 6 {{#if isGift}}
6 {{^}} 7 {{^}}
7 - <span class="checkbox icon-cb-checked iconfont"></span> 8 +<span class="checkbox icon-cb-checked iconfont"></span>
8 {{/if}} 9 {{/if}}
9 10
10 - {{/if}}  
11 -  
12 - <div class=""> 11 + {{/if}}-->
  12 + <div class="info">
  13 + <img class="thumb lazy" data-original={{thumb}}>
  14 + <!--
13 <a class="" href="{{url}}"> 15 <a class="" href="{{url}}">
14 <img class="thumb lazy" data-original="{{thumb}}"> 16 <img class="thumb lazy" data-original="{{thumb}}">
15 </a> 17 </a>
@@ -23,7 +25,8 @@ @@ -23,7 +25,8 @@
23 {{#if isSoldOut}} 25 {{#if isSoldOut}}
24 <p class="few-tag">失效</p> 26 <p class="few-tag">失效</p>
25 {{/if}} 27 {{/if}}
26 - </div> 28 +
  29 + -->
27 30
28 <div class="deps show"> 31 <div class="deps show">
29 <p class="name row">{{name}}</p> 32 <p class="name row">{{name}}</p>