Merge branch 'feature/group-buy' into 'release/313'

Feature/group buy



See merge request !1711

@@ -142,10 +142,10 @@
                          id="date"
                          id="date"
                          class="comp-count-dow-by-now">
                          class="comp-count-dow-by-now">
                         <span id="label"></span>
                         <span id="label"></span>
-                        <span class="number" id="days"></span>天
-                        <span class="number" id="hours"></span>时
-                        <span class="number" id="minutes"></span>分
-                        <span class="number" id="seconds"></span>秒
+                        <span class="number" id="days"></span> 天
+                        <span class="number" id="hours"></span> 时
+                        <span class="number" id="minutes"></span> 分
+                        <span class="number" id="seconds"></span> 秒
                     </div>
                     </div>
                 </div>
                 </div>
                 {{/ifcond}}
                 {{/ifcond}}

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.8.80-2",
+  "version": "6.8.80-3",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {

@@ -92,6 +92,10 @@
                 width: 280px;
                 width: 280px;
                 color: #444;
                 color: #444;
                 margin-left: 20px;
                 margin-left: 20px;
+                display: inline-block;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
             }
             }
 
 
             .middle {
             .middle {
@@ -138,6 +142,11 @@
             line-height: 120px;
             line-height: 120px;
             vertical-align: top;
             vertical-align: top;
             margin-left: 18px;
             margin-left: 18px;
+            overflow: hidden;
+            background-color: #fff;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            width: 200px;
         }
         }
 
 
         .shop-detail {
         .shop-detail {
@@ -224,12 +233,11 @@
         margin-top: 14px;
         margin-top: 14px;
         margin-bottom: 14px;
         margin-bottom: 14px;
         flex-direction: row;
         flex-direction: row;
-        display: flex;
-        padding: 20px;
+        padding: 16px;
     }
     }
 
 
     .support-service-item {
     .support-service-item {
-        display: flex;
+        display: inline-block;
         align-items: center;
         align-items: center;
         flex-direction: row;
         flex-direction: row;
         padding-left: 15px;
         padding-left: 15px;
@@ -240,6 +248,7 @@
         height: 30px;
         height: 30px;
         display: inline-block;
         display: inline-block;
         overflow: hidden;
         overflow: hidden;
+        vertical-align: text-bottom;
     }
     }
 
 
     .support-service-title {
     .support-service-title {

@@ -77,6 +77,13 @@
             color: #444;
             color: #444;
             letter-spacing: -0.8px;
             letter-spacing: -0.8px;
             line-height: 40px;
             line-height: 40px;
+            width: 340px;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 3;
+            overflow: hidden;
+            word-break: break-all;
+            text-overflow: ellipsis;
         }
         }
 
 
         .name .tag {
         .name .tag {
@@ -224,6 +231,13 @@
                 font-size: 28px;
                 font-size: 28px;
                 color: #444;
                 color: #444;
                 line-height: 1.4;
                 line-height: 1.4;
+                width: 460px;
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 3;
+                overflow: hidden;
+                word-break: break-all;
+                text-overflow: ellipsis;
             }
             }
         }
         }
 
 
@@ -240,7 +254,7 @@
         .prd-info .price {
         .prd-info .price {
             position: absolute;
             position: absolute;
             left: 220px;
             left: 220px;
-            bottom: 100px;
+            bottom: 80px;
             font-size: 0;
             font-size: 0;
             margin-top: 30px;
             margin-top: 30px;
         }
         }