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

加入购物车图片放大 促销短语加空格判断



See merge request !321

@@ -26,10 +26,10 @@ const tool = {
         // dest.virtualGoods = (origin.attribute * 1 === 3);
         // dest.virtualGoods = (origin.attribute * 1 === 3);
 
 
         // 活动促销短语
         // 活动促销短语
-        origin.market_phrase && (dest.marketPhrase = origin.market_phrase);
+        origin.market_phrase && origin.market_phrase !== ' ' && (dest.marketPhrase = origin.market_phrase);
 
 
         // 商品促销短语
         // 商品促销短语
-        origin.sales_phrase && (dest.goodsSubtitle = origin.sales_phrase);
+        origin.sales_phrase && origin.sales_phrase !== ' ' && (dest.goodsSubtitle = origin.sales_phrase);
 
 
         // 商品标签
         // 商品标签
         if (origin.tags) {
         if (origin.tags) {

@@ -388,4 +388,22 @@
     .discount-gray {
     .discount-gray {
         background-color: #e0e0e0;
         background-color: #e0e0e0;
     }
     }
+
+    .hover {
+        position: fixed;
+        width: 100%;
+        background-color: black;
+        height: 100%;
+        top: 0;
+        left: 0;
+        right: 0;
+        border: 0;
+        z-index: 999;
+        align-items: center;
+        display: flex;
+
+        img {
+            width: 100%;
+        }
+    }
 }
 }