Authored by 王水玲

加价购、赠品 食品类修改

@@ -153,6 +153,7 @@ const indexComment = (req, res, next) => { @@ -153,6 +153,7 @@ const indexComment = (req, res, next) => {
153 date: moment(item.createTime, 'X').format('YYYY-MM-DD HH:mm:ss'), 153 date: moment(item.createTime, 'X').format('YYYY-MM-DD HH:mm:ss'),
154 color: _.get(item, 'goods.factory_goods_name', ''), 154 color: _.get(item, 'goods.factory_goods_name', ''),
155 size: _.get(item, 'goods.size_name', ''), 155 size: _.get(item, 'goods.size_name', ''),
  156 + skuTitle: _.get(item, 'goods.sku_title', '尺码'),
156 comment: item.content, 157 comment: item.content,
157 total: pageResponse.totalCount, 158 total: pageResponse.totalCount,
158 url: _.get(item, 'url', ''), 159 url: _.get(item, 'url', ''),
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 </dt> 66 </dt>
67 </dl> 67 </dl>
68 <dl> 68 <dl>
69 - <dd class="show-size-box">尺码</dd> 69 + <dd class="show-size-box">{{skuTitle}}</dd>
70 <dt data-role="sizes"> 70 <dt data-role="sizes">
71 {{#each colors}} 71 {{#each colors}}
72 <div class="show-size-box size-row {{#unless focus}}none{{/unless}}"> 72 <div class="show-size-box size-row {{#unless focus}}none{{/unless}}">
@@ -111,6 +111,7 @@ @@ -111,6 +111,7 @@
111 <p class="submit-tip">未满足活动条件</p> 111 <p class="submit-tip">未满足活动条件</p>
112 {{/if}} 112 {{/if}}
113 </div> 113 </div>
  114 + {{#unless isFood}}
114 <div class="detail-size"> 115 <div class="detail-size">
115 <h3>尺码信息<span>(单位:厘米)</span></h3> 116 <h3>尺码信息<span>(单位:厘米)</span></h3>
116 {{# size}} 117 {{# size}}
@@ -137,4 +138,5 @@ @@ -137,4 +138,5 @@
137 ※ 以上尺寸为实物实际测量,因测量方式不同会有略微误差,相关数据仅作参考,以收到实物为准。 138 ※ 以上尺寸为实物实际测量,因测量方式不同会有略微误差,相关数据仅作参考,以收到实物为准。
138 </div> 139 </div>
139 </div> 140 </div>
  141 + {{/unless}}
140 </div> 142 </div>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </div> 8 </div>
9 <dl class="pull-right"> 9 <dl class="pull-right">
10 {{#if color}}<dd>颜色:{{color}}</dd>{{/if}} 10 {{#if color}}<dd>颜色:{{color}}</dd>{{/if}}
11 - {{#if size}}<dd>尺码{{size}}</dd>{{/if}} 11 + {{#if size}}<dd>{{skuTitle}}{{size}}</dd>{{/if}}
12 {{#if height}}<dd>身高:{{height}} 厘米</dd>{{/if}} 12 {{#if height}}<dd>身高:{{height}} 厘米</dd>{{/if}}
13 {{#if weight}}<dd>体重:{{weight}} 公斤</dd>{{/if}} 13 {{#if weight}}<dd>体重:{{weight}} 公斤</dd>{{/if}}
14 <dd>尺码符合度: 14 <dd>尺码符合度:
@@ -28,6 +28,11 @@ function renderAndShowGiftWin(plist) { @@ -28,6 +28,11 @@ function renderAndShowGiftWin(plist) {
28 new RAlert('<div class="alert-main">已抢光</div>'); 28 new RAlert('<div class="alert-main">已抢光</div>');
29 return; 29 return;
30 } 30 }
  31 +
  32 + if (plist.productInfo.skuTitle === '规格') {
  33 + plist.productInfo.isFood = true;
  34 + }
  35 +
31 $goodsSelWin.find('.detail-body').empty().html(giftsWinTpl(plist)); 36 $goodsSelWin.find('.detail-body').empty().html(giftsWinTpl(plist));
32 capi.showMDialog('#Y_goodsSelectWinDialog'); 37 capi.showMDialog('#Y_goodsSelectWinDialog');
33 38
@@ -136,6 +141,10 @@ GoodsWinAction = { @@ -136,6 +141,10 @@ GoodsWinAction = {
136 141
137 res.isView = $this.closest('.detail-body').find('.product-detail-info').data('isview'); 142 res.isView = $this.closest('.detail-body').find('.product-detail-info').data('isview');
138 143
  144 + if (res.skuTitle === '规格') {
  145 + res.isFood = true;
  146 + }
  147 +
139 $goodsSelWin.find('.product-detail-info').empty().append(productInfoTpl(res)); 148 $goodsSelWin.find('.product-detail-info').empty().append(productInfoTpl(res));
140 }); 149 });
141 150
@@ -268,6 +268,10 @@ $('.bottom-tab-slide').on('click', '.bottom-title', function() { @@ -268,6 +268,10 @@ $('.bottom-tab-slide').on('click', '.bottom-title', function() {
268 function showTogetherSelWin(id, skn, cbname) { 268 function showTogetherSelWin(id, skn, cbname) {
269 269
270 capi.getProductInfo(id, skn).then(function(res) { 270 capi.getProductInfo(id, skn).then(function(res) {
  271 + if (res.skuTitle === '规格') {
  272 + res.isFood = true;
  273 + }
  274 +
271 $goodsSelWin.find('.detail-body').empty().append(productInfoTpl(res)); 275 $goodsSelWin.find('.detail-body').empty().append(productInfoTpl(res));
272 }); 276 });
273 277