Merge branch 'feature/shoppingCart' into release/5.4.1

@@ -42,9 +42,6 @@ const getShoppingKeyByCookie = (req) => {
 const transPrice = (price) => {
     return price ? (price * 1).toFixed(2) : '0.00';
 };
-const trans = (x) => {
-    return x * 1;
-};
 
 /**
  * 生成公开的TOKEN凭证
@@ -424,10 +421,9 @@ const formatPromotion = (it, selectedGiftsList) => {
         }
 
         tipTxt = '<span style=\'color:#ff575c\'>' + tipTxt + '</span>';
-
-        info.promotionTitle = '还差' + tipTxt + '满足' + '&nbsp;&nbsp;&nbsp;' + info.promotionTitle;
+        info.promotionTitle = '还差' + tipTxt + '满足&nbsp;&nbsp;&nbsp;' + info.promotionTitle;
     } else if (status === 10) {
-        info.promotionTitle = '已满足' + '&nbsp;&nbsp;&nbsp;' + info.promotionTitle;
+        info.promotionTitle = '已满足&nbsp;&nbsp;&nbsp;' + info.promotionTitle;
     }
 
     if (info.giftGoodsList) {

@@ -19,6 +19,17 @@ const productAPI = require('./product-api');
 const cartApi = require('./cart-api');
 const chelper = require('./cart-helper');
 
+
+/**
+ * 转换价格
+ *
+ * @param float|string $price 价格
+ * @return float|string 转换之后的价格
+ */
+const transPrice = (price) => {
+    return price ? (price * 1).toFixed(2) : '0.00';
+};
+
 const _getProductIntroAsync = (productSkn) => {
     return co(function * () {
         let result = yield Promise.props({
@@ -990,7 +1001,7 @@ const getMiniCartData = (uid, shoppingKey) => {
                 product_name: g.product_name,
                 factory_goods_name: g.factory_goods_name,
                 size_name: g.size_name,
-                show_price: g.real_price,
+                show_price: transPrice(g.real_price),
                 buy_number: g.buy_number,
                 goods_incart_id: g.shopping_cart_id,
                 product_sku: g.product_sku,

@@ -64,10 +64,10 @@
                 <span class="sale-info-title">促销信息<i></i></span>
                 <ul class="none">
                     {{#promotionInfos}}
-                        <li>{{promotionTitle}}
+                        <li>{{{promotionTitle}}}
                             {{>mix/cart/cart-promotion-btn}}
                             {{#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;&nbsp;去凑单&nbsp;</a>
                             {{/if}}
                         </li>
                     {{/promotionInfos}}

@@ -1039,6 +1039,9 @@
                 left: 22%;
                 z-index: 21;
             }
+            .tip-message {
+                margin-top: -2px;
+            }
         }
         .sale-info {
             &.active {

@@ -754,7 +754,6 @@
         border: 1px solid $borderColor;
         border-bottom-color: #fff;
 
-
         dt {
             line-height: 36px;
 
@@ -775,6 +774,7 @@
 
         dd {
             display: none;
+            margin: 10px 0;
         }
 
         .open + dd {
@@ -954,7 +954,7 @@
             width: 70%;
             position: absolute;
             right: 0;
-            top: -32px;
+            top: -40px;
             padding-right: 20px;
             text-align: right;