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

加价购、赠品 食品类修改



See merge request !404

@@ -153,6 +153,7 @@ const indexComment = (req, res, next) => {
                     date: moment(item.createTime, 'X').format('YYYY-MM-DD HH:mm:ss'),
                     color: _.get(item, 'goods.factory_goods_name', ''),
                     size: _.get(item, 'goods.size_name', ''),
+                    skuTitle: _.get(item, 'goods.sku_title', '尺码'),
                     comment: item.content,
                     total: pageResponse.totalCount,
                     url: _.get(item, 'url', ''),

@@ -66,7 +66,7 @@
                 </dt>
             </dl>
             <dl>
-                <dd class="show-size-box">选尺码：</dd>
+                <dd class="show-size-box">选{{skuTitle}}：</dd>
                 <dt data-role="sizes">
                     {{#each colors}}
                         <div class="show-size-box size-row {{#unless focus}}none{{/unless}}">
@@ -111,6 +111,7 @@
             <p class="submit-tip">未满足活动条件</p>
         {{/if}}
     </div>
+    {{#unless isFood}}
     <div class="detail-size">
         <h3>尺码信息<span>（单位：厘米）</span></h3>
         {{# size}}
@@ -137,4 +138,5 @@
             ※ 以上尺寸为实物实际测量，因测量方式不同会有略微误差，相关数据仅作参考，以收到实物为准。
         </div>
     </div>
+    {{/unless}}
 </div>

@@ -8,7 +8,7 @@
         </div>
         <dl class="pull-right">
             {{#if color}}<dd>颜色：{{color}}</dd>{{/if}}
-            {{#if size}}<dd>尺码：{{size}}</dd>{{/if}}
+            {{#if size}}<dd>{{skuTitle}}：{{size}}</dd>{{/if}}
             {{#if height}}<dd>身高：{{height}} 厘米</dd>{{/if}}
             {{#if weight}}<dd>体重：{{weight}} 公斤</dd>{{/if}}
             <dd>尺码符合度：

@@ -28,6 +28,11 @@ function renderAndShowGiftWin(plist) {
         new RAlert('<div class="alert-main">已抢光</div>');
         return;
     }
+
+    if (plist.productInfo.skuTitle === '规格') {
+        plist.productInfo.isFood = true;
+    }
+
     $goodsSelWin.find('.detail-body').empty().html(giftsWinTpl(plist));
     capi.showMDialog('#Y_goodsSelectWinDialog');
 
@@ -136,6 +141,10 @@ GoodsWinAction = {
 
             res.isView = $this.closest('.detail-body').find('.product-detail-info').data('isview');
 
+            if (res.skuTitle === '规格') {
+                res.isFood = true;
+            }
+
             $goodsSelWin.find('.product-detail-info').empty().append(productInfoTpl(res));
         });
 

@@ -268,6 +268,10 @@ $('.bottom-tab-slide').on('click', '.bottom-title', function() {
 function showTogetherSelWin(id, skn, cbname) {
 
     capi.getProductInfo(id, skn).then(function(res) {
+        if (res.skuTitle === '规格') {
+            res.isFood = true;
+        }
+
         $goodsSelWin.find('.detail-body').empty().append(productInfoTpl(res));
     });