支持attr

app/Modules/Mini/Services/GoodsService.php

@@ -7,6 +7,7 @@ use App\Exceptions\ClientException;
 use App\Models\Goods\Goods;
 use App\Models\Goods\GoodsCategoryMap;
 use App\Models\Goods\GoodsSku;
+use App\Models\Goods\GoodsSpecMap;
 use App\Models\Goods\Spec;
 use App\Models\Goods\SpecAttr;
 use App\Models\User\UserFav;
@@ -46,21 +47,20 @@ class GoodsService extends BaseService
                     throw new ClientException("商品规格有误，请联系管理员");
                 }
             }, $goods->spec),
-            "sku" => $goods->sku->map(function (GoodsSku $sku) {
-                if (empty($sku->sn)) {
-                    return null;
-                }
-                return [
-                    "id" => $sku->id,
-                    "sn" => $sku->sn,
-                    "url_3d" => $sku->url_3d,
-                    "spec_attr" => $sku->spec_attr_list,
-                ];
-            })->filter()->values(),
             "desc_html" => $goods->desc_html,
             "faq_html" => $goods->faq_html,
             "spec_attr_html" => $goods->spec_attr_html,
             "is_fav" => (int)$this->goodsIsFav($goods->id),
+            "sn" => $goods->sn,
+            "url_3d" => $goods->url_3d,
+            "spec_map" => $goods->specMap->map(function (GoodsSpecMap $m) {
+                return [
+                    "id" => $m->id,
+                    "spec_id" => $m->spec_id,
+                    "value" => $m->value,
+                    "name" => $m->spec->name,
+                ];
+            }),
         ];
 
     }