Merge remote-tracking branch 'origin/release/6.8.3' into feature/yoluck

# Conflicts:
#	package.json

@@ -34,6 +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 || '尺码',
                 payPrice: value.real_pay_price,
                 salePrice: transPrice(value.sales_price) || value.goods_price,
                 count: value.buy_number

@@ -218,6 +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 || '尺码',
                         payPrice: data.realPayPrice,
                         salePrice: parseFloat(data.salesPrice).toFixed(2),
                         count: count,

@@ -408,6 +408,9 @@ module.exports = class extends global.yoho.BaseModel {
             }
         }).then((result) => {
             if (result && result.code === 200) {
+                if (params.yh_channel === 4) {
+                    result.data.defaultTerms = [];
+                }
                 if (result.data.hotTerms && result.data.hotTerms.length > 10) {
                     result.data.hotTerms = result.data.hotTerms.slice(0, 10);
                 }

@@ -18,7 +18,7 @@
 
             {{#if size}}
                 <span class="size">
-                    {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}}
+                    {{#if tickets}}区域{{else}}{{skuTitle}}{{/if}}:{{size}}
                 </span>
             {{/if}}
 

@@ -30,7 +30,7 @@
 
             {{#if size}}
                 <span class="size">
-                    {{#if tickets}}区域{{else}}尺码{{/if}}:{{size}}
+                    {{#if tickets}}区域{{else}}{{skuTitle}}{{/if}}:{{size}}
                 </span>
             {{/if}}
         </p>

@@ -31,7 +31,7 @@
                             <a href="javascript:;">{{name}}</a>
                         </div>
                     </div>
-                    <p class="color-size-row"><span class="color">颜色:{{color}}</span><span class="size">尺码:{{size}}</span></p>
+                    <p class="color-size-row"><span class="color">颜色:{{color}}</span><span class="size">{{skuTitle}}:{{size}}</span></p>
                 </div>
                 {{#ifnot noEdit}}
                 <div class="intro intro-edit">
@@ -46,7 +46,7 @@
                             <input type="hidden" class="good-num" value="{{count}}" data-min="{{minNumber}}" data-max="{{maxNumber}}">
                         {{/unless}}
                         <div class="edit-size-info {{#ifnot parent.isBundle}} edit-size-info-notop {{/ifnot}}">
-                            <div class="txt">颜色:{{color}} 尺码:{{size}}</div>
+                            <div class="txt">颜色:{{color}} {{skuTitle}}:{{size}}</div>
                             <div class="down">
                                 <i class="iconfont"></i>
                             </div>

@@ -63,7 +63,8 @@ $selectBtn.on('touchend', function() {
                 colorName = colorName.substring(0, 4) + '...';
 
                 product.data('sku', result.sku.skuId);
-                product.html('颜色：' + colorName + ' 尺码：' + result.sku.prop.size.valName);
+                product.html('颜色：' + colorName + ' ' +
+                result.sku.prop.size.skuTitle + '：' + result.sku.prop.size.valName);
             }
         }, () => {});
     });

@@ -77,21 +77,18 @@ $basicBtnC: #eb0313;
                 .column {
                     box-sizing: border-box;
                     padding: 6px 3%;
-                    width: 49.9%;
+                    width: 50%;
                     border: 1px solid #fff;
                     background-color: $tableCellC;
                     text-overflow: ellipsis;
                     overflow: hidden;
                     white-space: nowrap;
                     font-size: 24px;
-                }
-
-                .column:nth-child(2n+1) {
                     float: left;
                 }
 
-                .column:nth-child(2n+2) {
-                    float: right;
+                .merge-column {
+                    width: 100% !important;
                 }
 
                 .oldbox {

@@ -104,6 +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 || '尺码',
         checked: goodData.selected === 'Y',
         price: transPrice(goodData.last_vip_price),
         salesPrice: goodData.sales_price !== goodData.last_vip_price ? transPrice(goodData.sales_price) : false,

@@ -190,6 +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.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 ? '区域' : '尺码',
+            name: tickets ? '区域' : origin.skuTitle || '尺码',
             type: 'size',
             values: []
         }]
@@ -494,7 +494,8 @@ exports.processSkusInfo = (origin) => {
                     },
                     size: {
                         valId: size.size_id,
-                        valName: size.size_name
+                        valName: size.size_name,
+                        skuTitle: origin.skuTitle || '尺码'
                     }
                 },
                 limitNum: size.limit_buy_num