购物车编辑 取厂家颜色

@@ -749,7 +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'];
+            $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;

@@ -119,6 +119,7 @@ class CartModel
         }
         while (false);
 
+
         return $result;
     }
 
@@ -879,7 +880,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;