完善功能

app/admin/service/goods/GoodsService.php

@@ -472,7 +472,6 @@ class GoodsService
             } 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;
                     $itemsNew = [];
                     if (isset($item1['items'])) {
                         foreach ($item1['items'] as $key2 => $item2) {
@@ -482,10 +481,10 @@ class GoodsService
                             ];
                         }
                     }
-                    $goodsJsonNew[]=[
-                        'title'=>$key1,
-                        'service'=>$item1['service'] ?? '',
-                        'items'=>$itemsNew
+                    $goodsJsonNew[] = [
+                        'title' => $key1,
+                        'service' => $item1['service'] ?? '',
+                        'items' => $itemsNew
                     ];
                 }
                 $data['goods_json'] = $goodsJsonNew;
@@ -948,14 +947,20 @@ class GoodsService
                 $goodsJson = json_decode($params['goods_json'], true);
                 $newGoodsJson = [];
                 foreach ($goodsJson as $item1) {
-                    if(empty($item1['title'])){
+                    if (empty($item1['title'])) {
                         continue;
                     }
                     $newItem1 = [];
                     foreach ($item1['items'] as $item2) {
-                        $newItem1['items'][$item2['key']] = $item2['params'];
+                        $newParams = [];
+                        foreach ($item2['params'] as $param) {
+                            if (!empty($param[0]) || !empty($param[1])){
+                                $newParams[] = $param;
+                            }
+                        }
+                        $newItem1['items'][$item2['key']] = $newParams;
                     }
-                    $newItem1['service'] = $item1['service'];
+                    $newItem1['service'] = $item1['service'] ?? '';
                     $newGoodsJson[$item1['title']] = $newItem1;
                 }
                 $model->goods_json = json_encode($newGoodsJson);
@@ -1228,12 +1233,18 @@ class GoodsService
                 $goodsJson = json_decode($data['goods_json'], true);
                 $newGoodsJson = [];
                 foreach ($goodsJson as $item1) {
-                    if(empty($item1['title'])){
+                    if (empty($item1['title'])) {
                         continue;
                     }
                     $newItem1 = [];
                     foreach ($item1['items'] as $item2) {
-                        $newItem1['items'][$item2['key']] = $item2['params'];
+                        $newParams = [];
+                        foreach ($item2['params'] as $param) {
+                            if (!empty($param[0]) || !empty($param[1])){
+                                $newParams[] = $param;
+                            }
+                        }
+                        $newItem1['items'][$item2['key']] = $newParams;
                     }
                     $newItem1['service'] = $item1['service'];
                     $newGoodsJson[$item1['title']] = $newItem1;