Merge branch 'feature/group-home-correct' into 'release/6.9.2'

Feature/group home correct



See merge request !1747

@@ -32,10 +32,12 @@
                                     <img src="{{image2 defaultImages w=188 h=250 q=60 mode=3}}"></img>
                                 </div>
                                 <div class="product-name">{{productName}}</div>
+                                {{#if formatCollagePrice}}
                                     <div class='product-price-wrap'>
                                         <span class='product-people-number'>{{joinPeopleNum}}人团</span>
                                         <span class='product-price'>{{formatCollagePrice}}</span>
                                     </div>
+                                {{/if}}
                                 {{#if collagedPersonNum}}
                                     <div class="product-price-wrap">
                                         <span class="product-sell-number">已拼{{collagedPersonNum}}件</span>

 {
   "name": "yohobuywap-node",
-  "version": "6.9.2-5",
+  "version": "6.9.2-6",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -16,9 +16,9 @@
     }
 
     .swiper-container {
-        height: 450px;
         margin-left: 20px;
         margin-right: 20px;
+        padding-bottom: 60px;
     }
 
     .swiper-pagination .swiper-pagination-bullet-active {
@@ -28,7 +28,6 @@
     .swiper-slide {
         text-align: center;
         font-size: 18px;
-        height: 88%;
 
         .product-image-bg {
             height: 250px;
@@ -36,6 +35,7 @@
         }
 
         .product-name {
+            margin-bottom: 20px;
             font-family: PingFang-SC-Regular, sans-serif;
             color: #222;
             text-align: left;