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

添加默认值



See merge request !1611

@@ -34,7 +34,7 @@ module.exports = class extends global.yoho.BaseModel {
                 name: value.product_name,
                 color: value.factory_color_name ? value.factory_color_name : value.color_name,
                 size: value.size_name,
-                skuTitle: value.sku_title,
+                skuTitle: value.sku_title || '尺码',
                 payPrice: value.real_pay_price,
                 salePrice: transPrice(value.sales_price) || value.goods_price,
                 count: value.buy_number

@@ -218,7 +218,7 @@ module.exports = class extends global.yoho.BaseModel {
                         name: data.productName,
                         color: data.factoryColorName ? data.factoryColorName : data.colorName,
                         size: data.sizeName,
-                        skuTitle: data.skuTitle,
+                        skuTitle: data.skuTitle || '尺码',
                         payPrice: data.realPayPrice,
                         salePrice: parseFloat(data.salesPrice).toFixed(2),
                         count: count,

@@ -104,7 +104,7 @@ const formatCartGoods = (goodData, isAdvanceCart, isValid, inValidLow) => {
         thumb: goodData.goods_images ? helpers.image(goodData.goods_images, 120, 160) : '',
         color: goodData.factory_goods_name || goodData.color_name,
         size: goodData.size_name,
-        skuTitle: goodData.sku_title,
+        skuTitle: goodData.sku_title || '尺码',
         checked: goodData.selected === 'Y',
         price: transPrice(goodData.last_vip_price),
         salesPrice: goodData.sales_price !== goodData.last_vip_price ? transPrice(goodData.sales_price) : false,

@@ -190,7 +190,7 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) {
             obj.name = good.product_name;
             obj.color = good.factory_goods_name || good.color_name;
             obj.size = good.size_name;
-            obj.skuTitle = good.sku_title;
+            obj.skuTitle = good.sku_title || '尺码';
             obj.count = good.buy_number;
             obj.price = good.sales_price;
             obj.isLimitSkn = good.is_limit_skn === 'Y';

@@ -440,7 +440,7 @@ exports.processSkusInfo = (origin) => {
             type: 'color',
             values: []
         }, {
-            name: tickets ? '区域' : origin.skuTitle,
+            name: tickets ? '区域' : origin.skuTitle || '尺码',
             type: 'size',
             values: []
         }]
@@ -495,7 +495,7 @@ exports.processSkusInfo = (origin) => {
                     size: {
                         valId: size.size_id,
                         valName: size.size_name,
-                        skuTitle: origin.skuTitle
+                        skuTitle: origin.skuTitle || '尺码'
                     }
                 },
                 limitNum: size.limit_buy_num