Merge branch 'feature/food-setting' into 'release/6.8.3'

Feature/food setting



See merge request !396

@@ -131,6 +131,7 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys
             imgCover: it.goods_images ? helpers.image(it.goods_images, 64, 88) : '',
             productColor: it.factory_goods_name,
             productSize: it.size_name,
+            skuTitle: it.sku_title,
             productPrice: transPrice(it.sales_price),
             productNum: Number(it.buy_number),
             storageNum: Number(it.storage_number),

@@ -346,6 +346,7 @@ module.exports = class extends global.yoho.BaseModel {
 
         result.isCollect = propOrigin('is_collect');
         result.colors = skuData.skuGoods;
+        result.skuTitle = propOrigin('skuTitle');
 
         return result;
     }

@@ -160,7 +160,7 @@
                         </td>
                         <td class="border-top color-size">
                             颜色：<span class="color">{{factory_goods_name}}</span>
-                            尺码：<span class="size">{{size_name}}</span>
+                            {{sku_title}}：<span class="size">{{size_name}}</span>
                         </td>
                         <td class="border-top price">
                             <p class="red">¥ {{round productPrice 2}}</p>

@@ -423,6 +423,7 @@ module.exports = class extends global.yoho.BaseModel {
                     newGood.name = good.product_name;
                     newGood.color = good.factory_color_name;
                     newGood.size = good.size_name;
+                    newGood.skuTitle = good.sku_title;
                     newGood.price = that.transPrice(good.sales_price);// 默认显示销售价
                     newGood.isVipPrice = good.discount_tag === 'V';
                     newGood.isStuPrice = good.discount_tag === 'S';
@@ -859,6 +860,7 @@ module.exports = class extends global.yoho.BaseModel {
                             name: good.product_name,
                             color: good.factory_color_name,
                             size: good.size_name,
+                            skuTitle: good.sku_title,
                             price: that.transPrice(good.sales_price), // 默认显示销售价
                             isVipPrice: good.discount_tag === 'V',
                             isStuPrice: good.discount_tag === 'S',

@@ -56,6 +56,7 @@ module.exports = class extends global.yoho.BaseModel {
                 name: value.product_name || '',
                 color: value.color_name,
                 size: value.size_name,
+                skuTitle: value.sku_title || '尺码',
                 yoho_coin_cut_num: value.yoho_coin_cut_num,
                 real_pay_price: transPrice(value.real_pay_price),
                 price: transPrice(value.sales_price),
@@ -81,7 +82,8 @@ module.exports = class extends global.yoho.BaseModel {
                 name: good.product_name,
                 goods_type: good.goods_type,
                 color: good.color_name,
-                size: good.size_name
+                size: good.size_name,
+                skuTitle: good.sku_title || '尺码'
             });
         });
 
@@ -209,6 +211,7 @@ module.exports = class extends global.yoho.BaseModel {
                         name: value.product_name,
                         color: value.factory_color_name,
                         size: value.size_name,
+                        skuTitle: value.sku_title || '尺码',
                         price: transPrice(value.last_price),
                         skn: value.product_skn,
                         skc: value.product_skc,
@@ -568,6 +571,7 @@ module.exports = class extends global.yoho.BaseModel {
                         name: value.product_name,
                         color: value.color_name,
                         size: value.size_name,
+                        skuTitle: value.sku_title || '尺码',
                         price: value.last_price,
                         skn: value.product_skn,
                         skc: value.product_skc,

@@ -250,7 +250,7 @@
                                                 {{/if}}
 
                                                 {{#if size}}
-                                                尺码：{{size}}
+                                                {{skuTitle}}：{{size}}
                                                 {{/if}}
 
                                                 {{#if date}}

@@ -57,7 +57,7 @@
                                 </td>
                                 <td class="return-goods-info">
                                     <a href="{{href}}">{{name}}</a>
-                                    <span style="display: block;">颜色：{{color}}    尺码：{{size}}</span>
+                                    <span style="display: block;">颜色：{{color}}    {{skuTitle}}：{{size}}</span>
                                     {{#if specialNoticeBo}}
                                         <div>
                                             <div class="special-tip">
@@ -115,9 +115,9 @@
                                         {{/ colorSize}}
                                     </p>
                                     <p>
-                                        尺码要换成:
+                                        {{skuTitle}}要换成:
                                         <select class="exchange-size" data-sku="{{sku}}" data-skc="{{skc}}" {{#if isLimitSkn}}disabled{{/if}}>
-                                            <option value="0">请选择尺码</option>
+                                            <option value="0">请选择{{skuTitle}}</option>
                                         </select>
                                     </p>
                                 </td>
@@ -220,7 +220,7 @@
                                 </td>
                                 <td class="return-goods-info">
                                     <a href="{{href}}">{{name}}</a>
-                                    <span>颜色：{{color}}    尺码：{{size}}</span>
+                                    <span>颜色：{{color}}    {{skuTitle}}：{{size}}</span>
                                     {{#if specialNoticeBo}}
                                         <div>
                                             <div class="special-tip">

@@ -119,7 +119,7 @@
 
                                         <p class="name-color-size">
                                             <a class="name" href="{{href}}" target="_blank">{{name}}</a>
-                                            颜色：{{color}} 尺码：{{size}}
+                                            颜色：{{color}} {{skuTitle}}：{{size}}
                                             {{> home/orders/order-goods-tags}}
                                         </p>
                                     </td>

@@ -49,7 +49,7 @@
                                                         {{/if}}
 
                                                         {{#if size}}
-                                                            尺码：{{size}}
+                                                            {{skuTitle}}：{{size}}
                                                         {{/if}}
                                                     </span>
                                                 </div>

@@ -50,7 +50,7 @@
                                                 {{/if}}
 
                                                 {{#if size}}
-                                                    尺码：{{size}}
+                                                    {{skuTitle}}：{{size}}
                                                 {{/if}}
 
                                                 {{#if arrivalDate}}

@@ -536,6 +536,18 @@ function _getBasicDescription(productDescBo) {
         value: sex
     }];
 
+    if (productDescBo.guaranteeDay) {
+        basic.push({key: '保质期', value: productDescBo.guaranteeDay});
+    }
+
+    if (productDescBo.releaseTime) {
+        basic.push({key: '过期时间', value: productDescBo.releaseTime});
+    }
+
+    if (productDescBo.productionTime) {
+        basic.push({key: '生产日期', value: productDescBo.productionTime});
+    }
+
     return _.get(productDescBo, 'standardBos', []).reduce((all, value) => {
         all.push({
             key: value.standardName,
@@ -1042,6 +1054,7 @@ function _detailDataPkg(origin, uid, vipLevel, cookies) {
         result.shopId = propOrigin('shop_id', 0);
         result.brandId = propOrigin('brand_info.brand_id', '');
         result.brandName = propOrigin('brand_info.brand_name', '');
+        result.skuTitle = propOrigin('skuTitle', '尺码');
 
         result.maxSortId = propOrigin('maxSortId', '');
         result.smallSortId = propOrigin('smallSortId', '');

@@ -14,7 +14,7 @@
                                     <span class="keySpace">{{{escapeType key}}}: </span>
                                     <span id="desc-color" title="{{value}}" class="value-space">{{value}}</span>
                                 {{^}}
-                                    <span class="keySpace">{{{escapeType key}}}: </span>
+                                    <span class="keySpace" data-key="{{{escapeType key}}}">{{{escapeType key}}}: </span>
                                     <span class="value-space">{{value}}</span>
                                 {{/if}}
                             </em>

 
 <div class="chose-size row clearfix">
-    <span class="title pull-left"> 尺&nbsp;&nbsp;码： </span>
+    <span class="title pull-left"><i class="sku-label">{{skuTitle}}</i>：</span>
 
     <div id="sizes" class="size-wrapper pull-left">
         {{#each colors}}

@@ -47,7 +47,7 @@
             <em class="{{#unless isOffShelve}}pay-pro-detail{{/unless}}">
                 <span>
                     <b title="{{productColor}}">颜色：{{productColor}}</b>
-                    尺码：{{productSize}}<i class="iconfont">&#xe6c7;</i>
+                    {{skuTitle}}：{{productSize}}<i class="iconfont">&#xe6c7;</i>
                 </span>
             </em>
             {{#and isAdvance preSellDate}}

@@ -17,7 +17,7 @@
             </div>
         </div>
         <div class="dl choose-size">
-            <div class="dd">尺码:</div>
+            <div class="dd">{{skuTitle}}:</div>
             {{#each colors}}
                 <div class="size-row {{#unless active}} hide{{/unless}}">
                     <div class="choose-size-detail">

@@ -359,7 +359,8 @@ function parseProductInfo(productInfo, defaultInfo) {
         colors: filterSet,
         defaultColor: defaultColor,
         defaultSize: defaultSize,
-        defaultImg: defaultImg
+        defaultImg: defaultImg,
+        skuTitle: productInfo.skuTitle
     };
 }
 

@@ -2022,14 +2022,42 @@ $(function() {
 $(function() {
     $('.size-table tbody tr:odd td').css('background-color', '#f9f9f9');
 
+    // 调整食品类商品信息的间距
+    let $productionTime = $('.description-content .basic span[data-key=生产日期]').parents('.justpostion');
+    let $releaseTime = $('.description-content .basic span[data-key=过期时间]').parents('.justpostion');
+    let releaseTimeIndex = $releaseTime.parents('li').index();
+    let postionLeft1 = '70px';
+    let postionLeft2 = '56px';
+
+    if ($releaseTime.length) {
+        if ((releaseTimeIndex + 1) % 3 === 1 && $productionTime.width() > 285) {
+            postionLeft2 = 0;
+        }
+
+        if ((releaseTimeIndex + 1) % 3 === 2) {
+            if ($releaseTime.width() > 285) {
+                postionLeft2 = 0;
+            }
+
+            if ($productionTime.width() > 285) {
+                postionLeft1 = 0;
+                postionLeft2 = 0;
+            }
+        }
+
+        if ((releaseTimeIndex + 1) % 3 === 0 && $releaseTime.width() > 285) {
+            postionLeft1 = 0;
+        }
+    }
+
     // 调整商品信息的间距
     $('.description-content .basic li').each(function(i) {
-        if ((i + 1) % 4 === 0) {
-            $(this).find('.justpostion').css({display: 'inline-block', 'margin-left': '70px'});
-        } else if ((i + 1) % 4 === 1) {
+        if ((i + 1) % 3 === 0) {
+            $(this).find('.justpostion').css({display: 'inline-block', 'margin-left': postionLeft1});
+        } else if ((i + 1) % 3 === 1) {
             return;
         } else {
-            $(this).find('.justpostion').css('margin-left', '56px');
+            $(this).find('.justpostion').css('margin-left', postionLeft2);
         }
     });
 

@@ -1037,8 +1037,8 @@
 
     .info-block {
         margin-top: 55px;
-        margin-left: 175px;
-        margin-right: 175px;
+        margin-left: 135px;
+        margin-right: 135px;
         color: #999;
         border-top: 1px solid #e0e0e0;
         font-size: 12px;
@@ -1054,7 +1054,7 @@
 
             li {
                 float: left;
-                width: 25%;
+                width: 33.33%;
                 margin-top: 10px;
                 font-size: 14px;
                 line-height: 22px;
@@ -2686,6 +2686,15 @@
         margin-top: 3px;
     }
 
+    .sku-label {
+        letter-spacing: 22px;
+        width: 54px;
+        display: inline-block;
+        overflow: hidden;
+        white-space: nowrap;
+        vertical-align: middle;
+    }
+
     li {
         float: left;
         display: block;