Merge branch 'feature/colorLength' into release/5.3

@@ -54,7 +54,7 @@ const _getSkuDataByProductBaseInfo = (data) => {
             goodsGroup.productSkc = cur.product_skc;
             goodsGroup.productSkc = cur.product_skc;
             goodsGroup.src = helpers.image(cur.color_image, 40, 40);
             goodsGroup.src = helpers.image(cur.color_image, 40, 40);
             goodsGroup.title = `${_.trim(data.product_name)} ${cur.color_name}`;
             goodsGroup.title = `${_.trim(data.product_name)} ${cur.color_name}`;
-            goodsGroup.name = cur.color_name;
+            goodsGroup.name = cur.factory_goods_name;
             goodsGroup.focus = false;
             goodsGroup.focus = false;
             goodsGroup.total = 0;
             goodsGroup.total = 0;
             goodsGroup.thumbs = [];
             goodsGroup.thumbs = [];

@@ -166,7 +166,7 @@ const indexComment = (req, res, next) => {
                         DEFAULT_AVATAR_ICO,
                         DEFAULT_AVATAR_ICO,
                     userName: _.get(item, 'userInfo.nickName', ''),
                     userName: _.get(item, 'userInfo.nickName', ''),
                     date: moment(item.createTime, 'X').format('YYYY-MM-DD HH:mm:ss'),
                     date: moment(item.createTime, 'X').format('YYYY-MM-DD HH:mm:ss'),
-                    color: _.get(item, 'goods.color_name', ''),
+                    color: _.get(item, 'goods.factory_goods_name', ''),
                     size: _.get(item, 'goods.size_name', ''),
                     size: _.get(item, 'goods.size_name', ''),
                     comment: item.content,
                     comment: item.content,
                     total: pageResponse.totalCount,
                     total: pageResponse.totalCount,

@@ -295,12 +295,15 @@ const _getSkuDataByProductBaseInfo = (data) => {
             // 商品列表
             // 商品列表
             goodsGroup.productSkc = cur.product_skc;
             goodsGroup.productSkc = cur.product_skc;
             goodsGroup.src = helpers.image(cur.color_image, 40, 40);
             goodsGroup.src = helpers.image(cur.color_image, 40, 40);
-            goodsGroup.title = `${_.trim(data.product_name)} ${cur.color_name}`;
-            goodsGroup.name = cur.color_name;
+            goodsGroup.title = `${_.trim(data.product_name)} ${cur.factory_goods_name}`;
+            goodsGroup.name = cur.factory_goods_name;
             goodsGroup.focus = false;
             goodsGroup.focus = false;
             goodsGroup.total = 0;
             goodsGroup.total = 0;
             goodsGroup.thumbs = [];
             goodsGroup.thumbs = [];
             goodsGroup.size = [];
             goodsGroup.size = [];
+            if(goodsGroup.title.length > 20){
+                goodsGroup.title = goodsGroup.title.substr(0,20) + '...';
+            }
         }
         }
 
 
         _.get(cur, 'images_list', []).forEach((good) => {
         _.get(cur, 'images_list', []).forEach((good) => {
@@ -562,7 +565,7 @@ const _getBasicDescription = (productDescBo) => {
         },
         },
         {
         {
             key: '颜色',
             key: '颜色',
-            value: productDescBo.colorName,
+            value: productDescBo.factoryGoodsName,
             dColor: true
             dColor: true
         },
         },
         {
         {

@@ -45,7 +45,7 @@
                                 {{# basic}}
                                 {{# basic}}
                                     <li>
                                     <li>
                                         {{#if dColor}}
                                         {{#if dColor}}
-                                            {{key}}: <span id="desc-color">{{value}}</span>
+                                            {{key}}: <span id="desc-color" title="{{value}}" >{{value}}</span>
                                         {{^}}
                                         {{^}}
                                             {{key}}: {{value}}
                                             {{key}}: {{value}}
                                         {{/if}}
                                         {{/if}}

@@ -177,7 +177,7 @@
                         <span class="title pull-left">选颜色：</span>
                         <span class="title pull-left">选颜色：</span>
                         <ul class="colors pull-left clearfix">
                         <ul class="colors pull-left clearfix">
                             {{#each colors}}
                             {{#each colors}}
-                                <li class="{{#if focus}}focus{{/if}} {{#if disable}}disable{{/if}} pull-left"
+                                <li class="{{#if focus}}focus{{/if}} {{#if disable}}disable{{/if}} pull-left color-limit"
                                     title="{{title}}" data-color="{{name}}" data-total="{{total}}">
                                     title="{{title}}" data-color="{{name}}" data-total="{{total}}">
                                     <img src="{{src}}">
                                     <img src="{{src}}">
                                 </li>
                                 </li>

@@ -229,7 +229,7 @@
                                 <a href="\{{product_url}}">\{{product_name}}</a>
                                 <a href="\{{product_url}}">\{{product_name}}</a>
                             </p>
                             </p>
                             <p>
                             <p>
-                                颜色：\{{color_name}}
+                                颜色：<span title="\{{factory_goods_name}}">\{{factory_goods_name}}</span>
                                 尺码：\{{size_name}}
                                 尺码：\{{size_name}}
                             </p>
                             </p>
                         </div>
                         </div>

@@ -5,7 +5,7 @@
             <span class="name">{{userName}}</span>
             <span class="name">{{userName}}</span>
         </div>
         </div>
         <dl class="pull-right">
         <dl class="pull-right">
-            {{#if color}}<dd>颜色：{{color}}</dd>{{/if}}
+            {{#if color}}<dd>颜色：<span title="{{color}}">{{color}}</span></dd>{{/if}}
             {{#if size}}<dd>尺码：{{size}}</dd>{{/if}}
             {{#if size}}<dd>尺码：{{size}}</dd>{{/if}}
         </dl>
         </dl>
         <div class="comment-detail">
         <div class="comment-detail">

@@ -532,6 +532,15 @@
                 .goods-info {
                 .goods-info {
                     width: 170px;
                     width: 170px;
                     color: #b0b0b0;
                     color: #b0b0b0;
+
+                    span {
+                        display: inline-block;
+                        width: 50px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                        vertical-align: bottom;
+                    }
                 }
                 }
 
 
                 .goods-price {
                 .goods-price {

@@ -640,6 +640,15 @@
                 width: 25%;
                 width: 25%;
                 line-height: 20px;
                 line-height: 20px;
             }
             }
+
+            span {
+                display: inline-block;
+                width: 75%;
+                vertical-align: bottom;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
         }
         }
 
 
         .comfort {
         .comfort {
@@ -945,6 +954,24 @@
             .question {
             .question {
                 color: #222;
                 color: #222;
             }
             }
+
+            &+dl{
+                 margin-right: 0;
+
+                dd {
+                    width: 100px;
+                    margin-right: 0;
+
+                    span{
+                        display: inline-block;
+                        width: 62px;
+                        overflow: hidden;
+                        text-overflow: ellipsis;
+                        white-space: nowrap;
+                        vertical-align: bottom;
+                    }
+                }
+            }
         }
         }
 
 
         .user-avatar {
         .user-avatar {
@@ -1005,7 +1032,6 @@
         dl {
         dl {
             line-height:1.5;
             line-height:1.5;
             color: #999;
             color: #999;
-            /*margin-left:20px;*/
             margin-right:20px;
             margin-right:20px;
 
 
             dd {
             dd {