Merge branch 'feature/bugfix61' into 'release/6.1'

Feature/bugfix61



See merge request !920

 
 @import "layout/swiper";
 
-$swiper-container-height: 232px;
+$swiper-container-height: 233px;
 
 .jit-detail-page {
     background-color: #f0f0f0;
@@ -20,6 +20,8 @@ $swiper-container-height: 232px;
     }
 
     .top {
+        padding-top: 4px;
+        padding-bottom: 4px;
         margin-bottom: 1PX;
         font-size: 26px;
     }
@@ -31,6 +33,7 @@ $swiper-container-height: 232px;
     .bottom {
         font-size: 28px;
         margin-bottom: 28px;
+        padding-bottom: 8px;
     }
 
     .swiper-container {

@@ -445,24 +445,25 @@ function transformJit(packageList) {
         };
 
         if (pValue.shopping_cost !== '0.00') {
-            perPackageData.push({
+            _.assign(perPackageData, {
                 expressCost: pValue.shopping_cost
             });
         }
         if (pValue.shopping_cut_cost !== '0.00') {
-            perPackageData.push({
+            _.assign(perPackageData, {
                 discount: pValue.shopping_cut_cost
             });
         }
-        result.packages.push(perPackageData);
 
         _.forEach(pValue.goods_list, gValue => {
-            result.packages[pKey].goods.push({
+            perPackageData.goods.push({
                 thumb: gValue.goods_images,
                 isAdd: gValue.goods_type === 'price_gift',
                 isGift: gValue.goods_type === 'gift'
             });
         });
+
+        result.packages.push(perPackageData);
     });
     return result;
 }