冲突

@@ -749,6 +749,7 @@ class Helpers
             $oneGoods['isStudents'] = $value['sales_price'] !== $value['last_vip_price'] && $value['discount_tag'] === 'S';
             $oneGoods['count'] = $value['buy_number'];
             $oneGoods['promotion_id'] = $value['promotion_id'];
+            $oneGoods['factoryColor'] = $value['factory_goods_name'] ? $value['factory_goods_name'] : $value['color_name'];
 
             if ($isValid) {
                 // 库存不足

@@ -103,17 +103,21 @@
     }
 
     .block {
-        float: left;
         display: block;
+        float: left;
         box-sizing: border-box;
-        padding: 0 20px;
-        min-width: 80px;
-        height: 80px;
+        margin-right: 0.75rem;
+        margin-bottom: 0.75rem;
+        padding: 0 0.5rem;
+        min-width: 2rem;
+        max-width: 12rem;
+        height: 2rem;
         border: 1px solid #000;
-        margin-right: 30px;
-        margin-bottom: 30px;
-        line-height: 80px;
         text-align: center;
+        line-height: 2rem;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
 
         &.chosed {
             border-color: #e10;

@@ -103,10 +103,20 @@
     }
 
     .color, .size {
+        display: inline-block;
         font-size: 0.6rem;
         color: #b6b6b6;
     }
 
+    .color {
+        display: inline-block;
+        max-width: 5.5rem;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        vertical-align: bottom;
+    }
+
     .appear-date {
         float: left;
         color: $cartRed;

@@ -376,6 +376,15 @@
             }
         }
 
+        .row .color {
+            display: inline-block;
+            max-width: 5.5rem;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+            vertical-align: bottom;
+        }
+
         .color, .size {
             color: #b6b6b6;
         }

@@ -319,6 +319,14 @@
             margin-right: 15px;
         }
     }
+    .row .color {
+        display: inline-block;
+        max-width: 5.5rem;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        vertical-align: bottom;
+    }
 
     .color, .size {
         color: #b6b6b6;

@@ -26,9 +26,9 @@
                     ×{{count}}
                 </span>
                 <p class="row color-size-row">
-                    {{#if color}}
+                    {{#if factoryColor}}
                         <span class="color">
-                            颜色:{{color}}
+                            颜色:{{factoryColor}}
                         </span>
                     {{/if}}
 

@@ -119,6 +119,7 @@ class CartModel
         }
         while (false);
 
+
         return $result;
     }
 
@@ -495,7 +496,7 @@ class CartModel
                     $oneGoods['id'] = $single['product_sku'];
                     $oneGoods['thumb'] = Images::getImageUrl($single['goods_images'], 120, 160);
                     $oneGoods['name'] = $single['product_name'];
-                    $oneGoods['color'] = $single['color_name'];
+                    $oneGoods['color'] = $single['factory_goods_name'] ? $single['factory_goods_name'] : $single['color_name'];
                     $oneGoods['size'] = $single['size_name'];
                     $oneGoods['count'] = $single['buy_number'];
                     $oneGoods['price'] = Helpers::transPrice($single['last_price']);
@@ -933,7 +934,7 @@ class CartModel
                     $oneColor = array();
                     $oneColor['id'] = $val['color_id'];
                     $oneColor['skcId'] = $val['product_skc'];
-                    $oneColor['name'] = $val['color_name'];
+                    $oneColor['name'] = $val['factory_goods_name'] ? $val['factory_goods_name'] :  $val['color_name'];
                     $oneColor['goodsName'] = $productData['product_name'];
                     $oneColor['colorNum'] = $colorNum;
                     $colorList[] = $oneColor;