|
@@ -618,9 +618,9 @@ class GoodsService
|
|
|
}
|
|
|
}
|
|
|
if (!empty($data['goods_json']) && $data['join_goods_category_id'] == 65) {
|
|
|
- foreach ($data['goods_json'] as $key => $datum) {
|
|
|
- $data['goods_json'][$key]['color'] = rgbToHex($datum['color']);
|
|
|
- }
|
|
|
+// foreach ($data['goods_json'] as $key => $datum) {
|
|
|
+// $data['goods_json'][$key]['color'] = rgbToHex($datum['color']);
|
|
|
+// }
|
|
|
} elseif (!empty($data['goods_json']) && $data['join_goods_category_id'] == 43) {
|
|
|
$goodsJsonNew = [];
|
|
|
foreach ($data['goods_json'] as $key1 => $item1) {
|
|
@@ -1479,12 +1479,12 @@ class GoodsService
|
|
|
$data['goods_attribute_json'] = json_encode($data['goods_attribute_json']);
|
|
|
}
|
|
|
if (!empty($data['goods_json']) && $data['join_goods_category_id'] == 65) {
|
|
|
- $goodsJson = json_decode($data['goods_json'], true);
|
|
|
- foreach ($goodsJson as $key => $item) {
|
|
|
- $goodsJson[$key]['color'] = hexToRgb($item['color']);
|
|
|
- }
|
|
|
-
|
|
|
- $data['goods_json'] = json_encode($goodsJson);
|
|
|
+// $goodsJson = json_decode($data['goods_json'], true);
|
|
|
+// foreach ($goodsJson as $key => $item) {
|
|
|
+// $goodsJson[$key]['color'] = hexToRgb($item['color']);
|
|
|
+// }
|
|
|
+//
|
|
|
+// $data['goods_json'] = json_encode($goodsJson);
|
|
|
} elseif (!empty($data['goods_json']) && $data['join_goods_category_id'] == 43) {
|
|
|
$goodsJson = json_decode($data['goods_json'], true);
|
|
|
$newGoodsJson = [];
|