Merge branch 'feature/cart' into 'release/5.4.1'

购物车样式问题



See merge request !308

@@ -60,6 +60,7 @@
             height: 35px;
             height: 35px;
             box-sizing: content-box;
             box-sizing: content-box;
             flex: 1;
             flex: 1;
+            position: relative;
         }
         }
 
 
         .nav-item.active {
         .nav-item.active {
@@ -527,6 +528,7 @@
             color: #444;
             color: #444;
             font-size: 29px;
             font-size: 29px;
             border-radius: 4px;
             border-radius: 4px;
+            padding: 0px;
         }
         }
     }
     }
 }
 }

@@ -28,6 +28,7 @@ const formatPromotionTitle = (promo) => {
     let match = regPromoTitle.exec(promo.promotion_title);
     let match = regPromoTitle.exec(promo.promotion_title);
     let promotionTitle = match !== null && match.length > 1 ? match[1] : promo.promotion_title;
     let promotionTitle = match !== null && match.length > 1 ? match[1] : promo.promotion_title;
 
 
+    promotionTitle.replace('￥', '¥');
     return `${title}【${promotionTitle}】`;
     return `${title}【${promotionTitle}】`;
 };
 };
 const formatPromotionOpt = (promo) => {
 const formatPromotionOpt = (promo) => {