Merge branch 'feature/cart' of git.yoho.cn:fe/yohobuywap-node into feature/cart

@@ -6,11 +6,9 @@
                 {{#promotions}}
                 {{#promotions}}
                     <div class="promo-item" data-id="{{promotionId}}" data-title="{{promotionOriginTitle}}" data-type="{{promotionType}}" data-status="{{status}}">
                     <div class="promo-item" data-id="{{promotionId}}" data-title="{{promotionOriginTitle}}" data-type="{{promotionType}}" data-status="{{status}}">
                         <div class="info"><i class="iconfont cuxiao"></i>{{promotionTitle}}</div>
                         <div class="info"><i class="iconfont cuxiao"></i>{{promotionTitle}}</div>
-                        {{#if optTitle}}
                         <div class="opt to-gift">
                         <div class="opt to-gift">
                             <a href="javascript:;">{{optTitle}}</a><i class="iconfont to-arrow"></i>
                             <a href="javascript:;">{{optTitle}}</a><i class="iconfont to-arrow"></i>
                         </div>
                         </div>
-                        {{/if}}
                     </div>
                     </div>
                 {{/promotions}}
                 {{/promotions}}
                 <div class="down-arrow">
                 <div class="down-arrow">

@@ -236,7 +236,6 @@
 
 
 .activity-title {
 .activity-title {
     background-color: #fff;
     background-color: #fff;
-    border-top: 1PX solid #e0e0e0;
     font-size: 32px;
     font-size: 32px;
     padding: 20px 20px 0;
     padding: 20px 20px 0;
 }
 }
@@ -265,7 +264,7 @@
     padding: 20px;
     padding: 20px;
     border-top: 1px solid #e0e0e0;
     border-top: 1px solid #e0e0e0;
     font-size: 28px;
     font-size: 28px;
-    margin-bottom: 38px;
+    margin-bottom: 20px;
 
 
     .title {
     .title {
         display: inline-block;
         display: inline-block;