完善功能

app/admin/service/goods/GoodsService.php

@@ -470,19 +470,29 @@ class GoodsService
                     $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) {
-                    $data['goods_json'][$key1]['title'] = $key1;
-                    foreach ($item1['items'] as $key2 => $item2) {
-                        $data['goods_json'][$key1]['items'][$key2]['key'] = $key2;
-                        $data['goods_json'][$key1]['items'][$key2]['params'] = $item2;
+//                    $data['goods_json'][$key1]['title'] = $key1;
+                    $itemsNew = [];
+                    if (isset($item1['items'])) {
+                        foreach ($item1['items'] as $key2 => $item2) {
+                            $itemsNew[] = [
+                                'key' => $key2,
+                                'params' => $item2
+                            ];
+                        }
                     }
+                    $goodsJsonNew[]=[
+                        'title'=>$key1,
+                        'service'=>$item1['service'] ?? '',
+                        'items'=>$itemsNew
+                    ];
                 }
+                $data['goods_json'] = $goodsJsonNew;
             }
 
             $data['goods_on_addtimes'] = date('Y-m-d\TH:i:s.u\Z', $data['goods_on_addtimes'] - 60 * 60 * 8);
 
-            $data = json_decode(json_encode($data), true);
-
             return json_success('', $data);
         } catch (\Exception $e) {
             dump($e->getMessage());
@@ -938,6 +948,9 @@ class GoodsService
                 $goodsJson = json_decode($params['goods_json'], true);
                 $newGoodsJson = [];
                 foreach ($goodsJson as $item1) {
+                    if(empty($item1['title'])){
+                        continue;
+                    }
                     $newItem1 = [];
                     foreach ($item1['items'] as $item2) {
                         $newItem1['items'][$item2['key']] = $item2['params'];
@@ -1215,6 +1228,9 @@ class GoodsService
                 $goodsJson = json_decode($data['goods_json'], true);
                 $newGoodsJson = [];
                 foreach ($goodsJson as $item1) {
+                    if(empty($item1['title'])){
+                        continue;
+                    }
                     $newItem1 = [];
                     foreach ($item1['items'] as $item2) {
                         $newItem1['items'][$item2['key']] = $item2['params'];