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

@@ -79,22 +79,18 @@ $('.cart-goods').on('touchstart', '.checkbox', function() {
     });
     });
 }).on('touchstart', '.icon-edit', 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) {
 }).on('touchstart', '.icon-del', function(e) {

@@ -41,23 +41,8 @@
                 {{> shopping-cart/cart-content}}
                 {{> shopping-cart/cart-content}}
             </div>
             </div>
         {{/ preSellCart}}
         {{/ preSellCart}}
-
     {{/ shoppingCart}}
     {{/ shoppingCart}}
 </div>
 </div>
-<div id="advanceBuy" class="shopping-cart-page yoho-page hide">
-{{# shoppingCart}}
-    {{# commonCart}}
-        {{# advanceBuy}}
-        <span>
-            {{promotionTitle}}
-        </span>
-        {{# goods}}
-            {{> shopping-cart/gift-advance-good}}
-        {{/ goods}}
-        {{/ advanceBuy}}
-    {{/ commonCart}}
-{{/ shoppingCart}}
-</div>
 
 
 <div class="shopping-cart-zero yoho-page hide">
 <div class="shopping-cart-zero yoho-page hide">
     <div class="cart-zero">
     <div class="cart-zero">
@@ -67,6 +52,5 @@
     </div>
     </div>
     {{> product/recommend-for-you}}
     {{> product/recommend-for-you}}
 </div>
 </div>
-
-        {{> shopping-cart/chose-panel}}
+{{> shopping-cart/chose-panel}}
 {{> layout/footer}}
 {{> layout/footer}}

 <div class="shopping-cart-good clearfix" data-id={{id}}>
 <div class="shopping-cart-good clearfix" data-id={{id}}>
-        {{#if isSoldOut}}
-             <p class="">失效</p>
+    <span class="checkbox icon-cb-checked iconfont"></span>
+    <!--    {{#if isSoldOut}}
+<p class="">失效</p>
         {{^}}
         {{^}}
         {{#if isGift}}
         {{#if isGift}}
         {{^}}
         {{^}}
-                <span class="checkbox icon-cb-checked iconfont"></span>
+<span class="checkbox icon-cb-checked iconfont"></span>
         {{/if}}
         {{/if}}
 
 
-        {{/if}}
-
-    <div class="">
+        {{/if}}-->
+    <div class="info">
+        <img class="thumb lazy" data-original={{thumb}}>
+        <!--
          <a class="" href="{{url}}">
          <a class="" href="{{url}}">
             <img class="thumb lazy" data-original="{{thumb}}">
             <img class="thumb lazy" data-original="{{thumb}}">
         </a>
         </a>
@@ -23,7 +25,8 @@
         {{#if isSoldOut}}
         {{#if isSoldOut}}
         <p class="few-tag">失效</p>
         <p class="few-tag">失效</p>
         {{/if}}
         {{/if}}
-    </div>
+
+        -->
 
 
         <div class="deps show">
         <div class="deps show">
             <p class="name row">{{name}}</p>
             <p class="name row">{{name}}</p>