fe / YOHOBUYWAP · Commits

Go to a project

Authored by zhangxiaoru
Commit 38aebfe9523b2286faf39318d177ab0c25cadb24 1 parent 435431b8

厂家颜色

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -496,7 +496,7 @@ class CartModel @@ -496,7 +496,7 @@ class CartModel
496 $oneGoods['id'] = $single['product_sku']; 496 $oneGoods['id'] = $single['product_sku'];
497 $oneGoods['thumb'] = Images::getImageUrl($single['goods_images'], 120, 160); 497 $oneGoods['thumb'] = Images::getImageUrl($single['goods_images'], 120, 160);
498 $oneGoods['name'] = $single['product_name']; 498 $oneGoods['name'] = $single['product_name'];
499 - $oneGoods['color'] = !isset($single['factory_goods_name']) ? $single['color_name'] : $single['factory_goods_name']; 499 + $oneGoods['color'] = isset($single['factory_goods_name']) ? $single['factory_goods_name'] : $single['color_name'];
500 $oneGoods['size'] = $single['size_name']; 500 $oneGoods['size'] = $single['size_name'];
501 $oneGoods['count'] = $single['buy_number']; 501 $oneGoods['count'] = $single['buy_number'];
502 $oneGoods['price'] = Helpers::transPrice($single['last_price']); 502 $oneGoods['price'] = Helpers::transPrice($single['last_price']);
@@ -934,7 +934,7 @@ class CartModel @@ -934,7 +934,7 @@ class CartModel
934 $oneColor = array(); 934 $oneColor = array();
935 $oneColor['id'] = $val['color_id']; 935 $oneColor['id'] = $val['color_id'];
936 $oneColor['skcId'] = $val['product_skc']; 936 $oneColor['skcId'] = $val['product_skc'];
937 - $oneColor['name'] = !isset($val['factory_goods_name']) ? $val['color_name'] : $val['factory_goods_name']; 937 + $oneColor['name'] = isset($val['factory_goods_name']) ? $val['factory_goods_name'] : $val['color_name'];
938 $oneColor['goodsName'] = $productData['product_name']; 938 $oneColor['goodsName'] = $productData['product_name'];
939 $oneColor['colorNum'] = $colorNum; 939 $oneColor['colorNum'] = $colorNum;
940 $colorList[] = $oneColor; 940 $colorList[] = $oneColor;