fe / yohobuywap-node · Commits

Go to a project

Authored by 王水玲
Commit 79667d2b09e9db940c5446084b2666fe0cedda68 2 parents b4197ca1 d7a9f800

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

添加默认值



See merge request !1611
Inline Side-by-side
Showing 5 changed files with 6 additions and 6 deletions
@@ -34,7 +34,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -34,7 +34,7 @@ module.exports = class extends global.yoho.BaseModel {
34 name: value.product_name, 34 name: value.product_name,
35 color: value.factory_color_name ? value.factory_color_name : value.color_name, 35 color: value.factory_color_name ? value.factory_color_name : value.color_name,
36 size: value.size_name, 36 size: value.size_name,
37 - skuTitle: value.sku_title, 37 + skuTitle: value.sku_title || '尺码',
38 payPrice: value.real_pay_price, 38 payPrice: value.real_pay_price,
39 salePrice: transPrice(value.sales_price) || value.goods_price, 39 salePrice: transPrice(value.sales_price) || value.goods_price,
40 count: value.buy_number 40 count: value.buy_number
@@ -218,7 +218,7 @@ module.exports = class extends global.yoho.BaseModel { @@ -218,7 +218,7 @@ module.exports = class extends global.yoho.BaseModel {
218 name: data.productName, 218 name: data.productName,
219 color: data.factoryColorName ? data.factoryColorName : data.colorName, 219 color: data.factoryColorName ? data.factoryColorName : data.colorName,
220 size: data.sizeName, 220 size: data.sizeName,
221 - skuTitle: data.skuTitle, 221 + skuTitle: data.skuTitle || '尺码',
222 payPrice: data.realPayPrice, 222 payPrice: data.realPayPrice,
223 salePrice: parseFloat(data.salesPrice).toFixed(2), 223 salePrice: parseFloat(data.salesPrice).toFixed(2),
224 count: count, 224 count: count,
@@ -104,7 +104,7 @@ const formatCartGoods = (goodData, isAdvanceCart, isValid, inValidLow) => { @@ -104,7 +104,7 @@ const formatCartGoods = (goodData, isAdvanceCart, isValid, inValidLow) => {
104 thumb: goodData.goods_images ? helpers.image(goodData.goods_images, 120, 160) : '', 104 thumb: goodData.goods_images ? helpers.image(goodData.goods_images, 120, 160) : '',
105 color: goodData.factory_goods_name || goodData.color_name, 105 color: goodData.factory_goods_name || goodData.color_name,
106 size: goodData.size_name, 106 size: goodData.size_name,
107 - skuTitle: goodData.sku_title, 107 + skuTitle: goodData.sku_title || '尺码',
108 checked: goodData.selected === 'Y', 108 checked: goodData.selected === 'Y',
109 price: transPrice(goodData.last_vip_price), 109 price: transPrice(goodData.last_vip_price),
110 salesPrice: goodData.sales_price !== goodData.last_vip_price ? transPrice(goodData.sales_price) : false, 110 salesPrice: goodData.sales_price !== goodData.last_vip_price ? transPrice(goodData.sales_price) : false,
@@ -190,7 +190,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) { @@ -190,7 +190,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) {
190 obj.name = good.product_name; 190 obj.name = good.product_name;
191 obj.color = good.factory_goods_name || good.color_name; 191 obj.color = good.factory_goods_name || good.color_name;
192 obj.size = good.size_name; 192 obj.size = good.size_name;
193 - obj.skuTitle = good.sku_title; 193 + obj.skuTitle = good.sku_title || '尺码';
194 obj.count = good.buy_number; 194 obj.count = good.buy_number;
195 obj.price = good.sales_price; 195 obj.price = good.sales_price;
196 obj.isLimitSkn = good.is_limit_skn === 'Y'; 196 obj.isLimitSkn = good.is_limit_skn === 'Y';
@@ -440,7 +440,7 @@ exports.processSkusInfo = (origin) => { @@ -440,7 +440,7 @@ exports.processSkusInfo = (origin) => {
440 type: 'color', 440 type: 'color',
441 values: [] 441 values: []
442 }, { 442 }, {
443 - name: tickets ? '区域' : origin.skuTitle, 443 + name: tickets ? '区域' : origin.skuTitle || '尺码',
444 type: 'size', 444 type: 'size',
445 values: [] 445 values: []
446 }] 446 }]
@@ -495,7 +495,7 @@ exports.processSkusInfo = (origin) => { @@ -495,7 +495,7 @@ exports.processSkusInfo = (origin) => {
495 size: { 495 size: {
496 valId: size.size_id, 496 valId: size.size_id,
497 valName: size.size_name, 497 valName: size.size_name,
498 - skuTitle: origin.skuTitle 498 + skuTitle: origin.skuTitle || '尺码'
499 } 499 }
500 }, 500 },
501 limitNum: size.limit_buy_num 501 limitNum: size.limit_buy_num