Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

@@ -392,9 +392,9 @@ const formatPromotion = (it, selectedGiftsList) => {
         let tipTxt = `差${ -Math.round(info.conditionValue * 100) / 100}`;
         let tipTxt = `差${ -Math.round(info.conditionValue * 100) / 100}`;
 
 
         if (info.conditionUnit === 1) {
         if (info.conditionUnit === 1) {
-            tipTxt += '件    ';
+            tipTxt += '件满足    ';
         } else if (info.conditionUnit === 2) {
         } else if (info.conditionUnit === 2) {
-            tipTxt += '元    ';
+            tipTxt += '元满足    ';
         }
         }
 
 
         info.promotionTitle = tipTxt + info.promotionTitle;
         info.promotionTitle = tipTxt + info.promotionTitle;

@@ -54,7 +54,7 @@
                         <li>{{promotionTitle}}
                         <li>{{promotionTitle}}
                             {{>mix/cart/cart-promotion-btn}}
                             {{>mix/cart/cart-promotion-btn}}
                             {{#if isNotReach}}
                             {{#if isNotReach}}
-                                <a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;></a>
+                                <a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;</a>
                             {{/if}}
                             {{/if}}
                         </li>
                         </li>
                     {{/promotionInfos}}
                     {{/promotionInfos}}

@@ -76,15 +76,15 @@
                     </div>
                     </div>
                 {{/if}}
                 {{/if}}
 
 
-                {{#if promotionInfos}}
-                    <div class="gift-sell">
-                        {{#promotionInfos}}
-                            <p class="gift-sell-info"><code class="order-pay-mark">{{tag}}</code>{{promotionTitle}}
-                                <!--<a class="btn-clear blue" data-together-id="6">去凑单&nbsp;&gt;</a>-->
-                            </p>
-                        {{/promotionInfos}}
-                    </div>
-                {{/if}}
+                <!--{{#if promotionInfos}}-->
+                    <!--<div class="gift-sell">-->
+                        <!--{{#promotionInfos}}-->
+                            <!--<p class="gift-sell-info"><code class="order-pay-mark">{{tag}}</code>{{promotionTitle}}-->
+                                <!--&lt;!&ndash;<a class="btn-clear blue" data-together-id="6">去凑单&nbsp;&gt;</a>&ndash;&gt;-->
+                            <!--</p>-->
+                        <!--{{/promotionInfos}}-->
+                    <!--</div>-->
+                <!--{{/if}}-->
             </div>
             </div>
         {{/advanceCart}}
         {{/advanceCart}}
 
 
@@ -232,7 +232,7 @@
                             data-promotionid="{{promotionId}}"
                             data-promotionid="{{promotionId}}"
                             data-num="{{productNum}}">
                             data-num="{{productNum}}">
                                         <span class="good-name" style="width: 392px;">
                                         <span class="good-name" style="width: 392px;">
-                                            <a href="{{link}}" target="_blank">{{productTitle}}</a>
+                                            <a href="{{link}}" target="_blank" title="{{productTitle}}">{{productTitle}}</a>
                                         </span>
                                         </span>
                             <span class="good-price" style="width: 148px;">{{productPrice}}</span>
                             <span class="good-price" style="width: 148px;">{{productPrice}}</span>
                             <span class="good-num" style="width: 128px;">{{productNum}}</span>
                             <span class="good-num" style="width: 128px;">{{productNum}}</span>

@@ -57,7 +57,7 @@
         <div class="go-full-cart">
         <div class="go-full-cart">
             <div>
             <div>
                 <p data-role="totalinfo"
                 <p data-role="totalinfo"
-                   data-total="{{total}}">购物车里还有<span data-role="last-num"></span>件商品</p>
+                   data-total="{{total}}">购物车里还有<span data-role="last-num">{{total}}</span>件商品</p>
                 <a href="//www.yohobuy.com/shopping/cart">查看我的购物车</a>
                 <a href="//www.yohobuy.com/shopping/cart">查看我的购物车</a>
             </div>
             </div>
         </div>
         </div>

@@ -193,6 +193,8 @@
             dd {
             dd {
                 width: 55px;
                 width: 55px;
                 float: left;
                 float: left;
+                letter-spacing: 0;
+                word-spacing: 0;
                 padding-bottom: 15px;
                 padding-bottom: 15px;
                 text-align: left;
                 text-align: left;
             }
             }

@@ -739,7 +739,7 @@
             padding: 30px 15px;
             padding: 30px 15px;
             border: 1px solid #000;
             border: 1px solid #000;
             background-color: #fff;
             background-color: #fff;
-            z-index: 20;
+            z-index: 24;
             display:none;
             display:none;
             &:after{
             &:after{
                  position: absolute;
                  position: absolute;
@@ -1000,6 +1000,7 @@
                 position: absolute;
                 position: absolute;
                 text-align: left;
                 text-align: left;
                 left: 22%;
                 left: 22%;
+                z-index: 21;
             }
             }
         }
         }
         .sale-info {
         .sale-info {
@@ -1068,8 +1069,8 @@
                         margin-top: 0;
                         margin-top: 0;
                      }
                      }
                     a {
                     a {
-                        position: absolute;
-                        right: 0;
+                        /*position: absolute;*/
+                        /*right: 0;*/
                         display: inline-block;
                         display: inline-block;
                         color: #ff575c;
                         color: #ff575c;
                         cursor: pointer;
                         cursor: pointer;
@@ -1333,6 +1334,9 @@
         font-size: 14px;
         font-size: 14px;
         color: #000;
         color: #000;
         text-align: left;
         text-align: left;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
     }
     }
     .good-price {
     .good-price {
         font-size: 14px;
         font-size: 14px;