Merge branch 'feature/cart' of http://git.dev.yoho.cn/web/yohobuy into fix/cart

@@ -79,22 +79,18 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
     });
 }).on('touchstart', '.icon-edit', function() {
 
-    //var $this = $(this);
-    //
-    //var $cartgood = $this.closest('.shopping-cart-good');
-    //
-    ////var id = $this.closest('.shopping-cart-good').data('id');
-    //
-    //var $viewGood = $cartgood.find('.deps');
-    //    $editGoot = $cartgood.find('.calculate-num');
-    //
-    //if ($viewGood.hasClass('show')) {
-    //    $viewGood.removeClass('show').addClass('hide');
-    //    $editGoot.removeClass('hide').addClass('show');
-    //} else {
-    //    $viewGood.removeClass('hide').addClass('show');
-    //    $editGoot.removeClass('show').addClass('hide');
-    //}
+    var $this = $(this),
+        $cartgood = $this.closest('.shopping-cart-good'),
+        $viewGood = $cartgood.find('.deps'),
+        $editGoot = $cartgood.find('.calculate-num');
+
+    if ($viewGood.hasClass('show')) {
+        $viewGood.removeClass('show').addClass('hide');
+        $editGoot.removeClass('hide').addClass('show');
+    } else {
+        $viewGood.removeClass('hide').addClass('show');
+        $editGoot.removeClass('show').addClass('hide');
+    }
 
 
 }).on('touchstart', '.icon-del', function(e) {

 <div class="shopping-cart-good clearfix" data-id={{id}}>
     <span class="checkbox icon-cb-checked iconfont"></span>
+    <!--    {{#if isSoldOut}}
+<p class="">失效</p>
+        {{^}}
+        {{#if isGift}}
+        {{^}}
+<span class="checkbox icon-cb-checked iconfont"></span>
+        {{/if}}
+
+        {{/if}}-->
     <div class="info">
         <img class="thumb lazy" data-original={{thumb}}>
+        <!--
+         <a class="" href="{{url}}">
+            <img class="thumb lazy" data-original="{{thumb}}">
+        </a>
+        {{#if isAdvanceBuy}}
+            <p class="few-tag">加价购</p>
+        {{^}}
+            {{#if isGift}}
+            <p class="few-tag">赠品</p>
+            {{/if}}
+        {{/if}}
+        {{#if isSoldOut}}
+        <p class="few-tag">失效</p>
+        {{/if}}
+
+        -->
 
         <div class="deps show">
             <p class="name row">{{name}}</p>