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

@@ -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>
-        {{^}}
-            {{#if isGift}}
-            {{^}}
     <span class="checkbox icon-cb-checked iconfont"></span>
     <span class="checkbox icon-cb-checked iconfont"></span>
-            {{/if}}
-
-        {{/if}}
-
-    <div class="">
-        <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>
+    <div class="info">
+        <img class="thumb lazy" data-original={{thumb}}>
 
 
         <div class="deps show">
         <div class="deps show">
             <p class="name row">{{name}}</p>
             <p class="name row">{{name}}</p>