fe / yohobuy-node · Commits

Go to a project

Authored by 王水玲
Commit 71fe8e03c8a39f9fce516bd7c15e4aa3a0061022 1 parent b2cc7761

食品类 尺码改规格

Inline Side-by-side
Showing 13 changed files with 22 additions and 13 deletions
@@ -131,6 +131,7 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys @@ -131,6 +131,7 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys
131 imgCover: it.goods_images ? helpers.image(it.goods_images, 64, 88) : '', 131 imgCover: it.goods_images ? helpers.image(it.goods_images, 64, 88) : '',
132 productColor: it.factory_goods_name, 132 productColor: it.factory_goods_name,
133 productSize: it.size_name, 133 productSize: it.size_name,
  134 + skuTitle: it.sku_title,
134 productPrice: transPrice(it.sales_price), 135 productPrice: transPrice(it.sales_price),
135 productNum: Number(it.buy_number), 136 productNum: Number(it.buy_number),
136 storageNum: Number(it.storage_number), 137 storageNum: Number(it.storage_number),
@@ -346,6 +346,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -346,6 +346,7 @@ module.exports = class extends global.yoho.BaseModel {
346 346
347 result.isCollect = propOrigin('is_collect'); 347 result.isCollect = propOrigin('is_collect');
348 result.colors = skuData.skuGoods; 348 result.colors = skuData.skuGoods;
  349 + result.skuTitle = propOrigin('skuTitle');
349 350
350 return result; 351 return result;
351 } 352 }
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
160 </td> 160 </td>
161 <td class="border-top color-size"> 161 <td class="border-top color-size">
162 颜色：<span class="color">{{factory_goods_name}}</span> 162 颜色：<span class="color">{{factory_goods_name}}</span>
163 - 尺码：<span class="size">{{size_name}}</span> 163 + {{sku_title}}：<span class="size">{{size_name}}</span>
164 </td> 164 </td>
165 <td class="border-top price"> 165 <td class="border-top price">
166 <p class="red">¥ {{round productPrice 2}}</p> 166 <p class="red">¥ {{round productPrice 2}}</p>
@@ -423,6 +423,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -423,6 +423,7 @@ module.exports = class extends global.yoho.BaseModel {
423 newGood.name = good.product_name; 423 newGood.name = good.product_name;
424 newGood.color = good.factory_color_name; 424 newGood.color = good.factory_color_name;
425 newGood.size = good.size_name; 425 newGood.size = good.size_name;
  426 + newGood.skuTitle = good.sku_title;
426 newGood.price = that.transPrice(good.sales_price);// 默认显示销售价 427 newGood.price = that.transPrice(good.sales_price);// 默认显示销售价
427 newGood.isVipPrice = good.discount_tag === 'V'; 428 newGood.isVipPrice = good.discount_tag === 'V';
428 newGood.isStuPrice = good.discount_tag === 'S'; 429 newGood.isStuPrice = good.discount_tag === 'S';
@@ -859,6 +860,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -859,6 +860,7 @@ module.exports = class extends global.yoho.BaseModel {
859 name: good.product_name, 860 name: good.product_name,
860 color: good.factory_color_name, 861 color: good.factory_color_name,
861 size: good.size_name, 862 size: good.size_name,
  863 + skuTitle: good.sku_title,
862 price: that.transPrice(good.sales_price), // 默认显示销售价 864 price: that.transPrice(good.sales_price), // 默认显示销售价
863 isVipPrice: good.discount_tag === 'V', 865 isVipPrice: good.discount_tag === 'V',
864 isStuPrice: good.discount_tag === 'S', 866 isStuPrice: good.discount_tag === 'S',
@@ -56,6 +56,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -56,6 +56,7 @@ module.exports = class extends global.yoho.BaseModel {
56 name: value.product_name || '', 56 name: value.product_name || '',
57 color: value.color_name, 57 color: value.color_name,
58 size: value.size_name, 58 size: value.size_name,
  59 + skuTitle: value.sku_title || '尺码',
59 yoho_coin_cut_num: value.yoho_coin_cut_num, 60 yoho_coin_cut_num: value.yoho_coin_cut_num,
60 real_pay_price: transPrice(value.real_pay_price), 61 real_pay_price: transPrice(value.real_pay_price),
61 price: transPrice(value.sales_price), 62 price: transPrice(value.sales_price),
@@ -81,7 +82,8 @@ module.exports = class extends global.yoho.BaseModel { @@ -81,7 +82,8 @@ module.exports = class extends global.yoho.BaseModel {
81 name: good.product_name, 82 name: good.product_name,
82 goods_type: good.goods_type, 83 goods_type: good.goods_type,
83 color: good.color_name, 84 color: good.color_name,
84 - size: good.size_name 85 + size: good.size_name,
  86 + skuTitle: good.sku_title || '尺码'
85 }); 87 });
86 }); 88 });
87 89
@@ -209,6 +211,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -209,6 +211,7 @@ module.exports = class extends global.yoho.BaseModel {
209 name: value.product_name, 211 name: value.product_name,
210 color: value.factory_color_name, 212 color: value.factory_color_name,
211 size: value.size_name, 213 size: value.size_name,
  214 + skuTitle: value.sku_title || '尺码',
212 price: transPrice(value.last_price), 215 price: transPrice(value.last_price),
213 skn: value.product_skn, 216 skn: value.product_skn,
214 skc: value.product_skc, 217 skc: value.product_skc,
@@ -568,6 +571,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -568,6 +571,7 @@ module.exports = class extends global.yoho.BaseModel {
568 name: value.product_name, 571 name: value.product_name,
569 color: value.color_name, 572 color: value.color_name,
570 size: value.size_name, 573 size: value.size_name,
  574 + skuTitle: value.sku_title || '尺码',
571 price: value.last_price, 575 price: value.last_price,
572 skn: value.product_skn, 576 skn: value.product_skn,
573 skc: value.product_skc, 577 skc: value.product_skc,
@@ -250,7 +250,7 @@ @@ -250,7 +250,7 @@
250 {{/if}} 250 {{/if}}
251 251
252 {{#if size}} 252 {{#if size}}
253 - 尺码：{{size}} 253 + {{skuTitle}}：{{size}}
254 {{/if}} 254 {{/if}}
255 255
256 {{#if date}} 256 {{#if date}}
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 </td> 57 </td>
58 <td class="return-goods-info"> 58 <td class="return-goods-info">
59 <a href="{{href}}">{{name}}</a> 59 <a href="{{href}}">{{name}}</a>
60 - <span style="display: block;">颜色：{{color}} 尺码：{{size}}</span> 60 + <span style="display: block;">颜色：{{color}} {{skuTitle}}：{{size}}</span>
61 {{#if specialNoticeBo}} 61 {{#if specialNoticeBo}}
62 <div> 62 <div>
63 <div class="special-tip"> 63 <div class="special-tip">
@@ -115,9 +115,9 @@ @@ -115,9 +115,9 @@
115 {{/ colorSize}} 115 {{/ colorSize}}
116 </p> 116 </p>
117 <p> 117 <p>
118 - 尺码要换成: 118 + {{skuTitle}}要换成:
119 <select class="exchange-size" data-sku="{{sku}}" data-skc="{{skc}}" {{#if isLimitSkn}}disabled{{/if}}> 119 <select class="exchange-size" data-sku="{{sku}}" data-skc="{{skc}}" {{#if isLimitSkn}}disabled{{/if}}>
120 - <option value="0">请选择尺码</option> 120 + <option value="0">请选择{{skuTitle}}</option>
121 </select> 121 </select>
122 </p> 122 </p>
123 </td> 123 </td>
@@ -220,7 +220,7 @@ @@ -220,7 +220,7 @@
220 </td> 220 </td>
221 <td class="return-goods-info"> 221 <td class="return-goods-info">
222 <a href="{{href}}">{{name}}</a> 222 <a href="{{href}}">{{name}}</a>
223 - <span>颜色：{{color}} 尺码：{{size}}</span> 223 + <span>颜色：{{color}} {{skuTitle}}：{{size}}</span>
224 {{#if specialNoticeBo}} 224 {{#if specialNoticeBo}}
225 <div> 225 <div>
226 <div class="special-tip"> 226 <div class="special-tip">
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 119
120 <p class="name-color-size"> 120 <p class="name-color-size">
121 <a class="name" href="{{href}}" target="_blank">{{name}}</a> 121 <a class="name" href="{{href}}" target="_blank">{{name}}</a>
122 - 颜色：{{color}} 尺码：{{size}} 122 + 颜色：{{color}} {{skuTitle}}：{{size}}
123 {{> home/orders/order-goods-tags}} 123 {{> home/orders/order-goods-tags}}
124 </p> 124 </p>
125 </td> 125 </td>
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 {{/if}} 49 {{/if}}
50 50
51 {{#if size}} 51 {{#if size}}
52 - 尺码：{{size}} 52 + {{skuTitle}}：{{size}}
53 {{/if}} 53 {{/if}}
54 </span> 54 </span>
55 </div> 55 </div>
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 {{/if}} 50 {{/if}}
51 51
52 {{#if size}} 52 {{#if size}}
53 - 尺码：{{size}} 53 + {{skuTitle}}：{{size}}
54 {{/if}} 54 {{/if}}
55 55
56 {{#if arrivalDate}} 56 {{#if arrivalDate}}
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 <em class="{{#unless isOffShelve}}pay-pro-detail{{/unless}}"> 47 <em class="{{#unless isOffShelve}}pay-pro-detail{{/unless}}">
48 <span> 48 <span>
49 <b title="{{productColor}}">颜色：{{productColor}}</b> 49 <b title="{{productColor}}">颜色：{{productColor}}</b>
50 - 尺码：{{productSize}}<i class="iconfont">&#xe6c7;</i> 50 + {{skuTitle}}：{{productSize}}<i class="iconfont">&#xe6c7;</i>
51 </span> 51 </span>
52 </em> 52 </em>
53 {{#and isAdvance preSellDate}} 53 {{#and isAdvance preSellDate}}
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 </div> 17 </div>
18 </div> 18 </div>
19 <div class="dl choose-size"> 19 <div class="dl choose-size">
20 - <div class="dd">尺码:</div> 20 + <div class="dd">{{skuTitle}}:</div>
21 {{#each colors}} 21 {{#each colors}}
22 <div class="size-row {{#unless active}} hide{{/unless}}"> 22 <div class="size-row {{#unless active}} hide{{/unless}}">
23 <div class="choose-size-detail"> 23 <div class="choose-size-detail">
@@ -359,7 +359,8 @@ function parseProductInfo(productInfo, defaultInfo) { @@ -359,7 +359,8 @@ function parseProductInfo(productInfo, defaultInfo) {
359 colors: filterSet, 359 colors: filterSet,
360 defaultColor: defaultColor, 360 defaultColor: defaultColor,
361 defaultSize: defaultSize, 361 defaultSize: defaultSize,
362 - defaultImg: defaultImg 362 + defaultImg: defaultImg,
  363 + skuTitle: productInfo.skuTitle
363 }; 364 };
364 } 365 }
365 366