diff --git a/beike/Repositories/ProductRepo.php b/beike/Repositories/ProductRepo.php index a542eaad..5fad9992 100644 --- a/beike/Repositories/ProductRepo.php +++ b/beike/Repositories/ProductRepo.php @@ -34,7 +34,7 @@ class ProductRepo if (is_int($product)) { $product = Product::query()->findOrFail($product); } - $product->load('description', 'skus', 'master_sku'); + $product->load('description', 'skus', 'master_sku', 'brand'); return $product; } diff --git a/beike/Repositories/SettingRepo.php b/beike/Repositories/SettingRepo.php index 40587329..9418f3cd 100644 --- a/beike/Repositories/SettingRepo.php +++ b/beike/Repositories/SettingRepo.php @@ -125,10 +125,13 @@ class SettingRepo /** * 创建或更新单条记录 * - * @param $data + * @param $name + * @param $value + * @param string $space + * @param string $type * @throws \Throwable */ - public static function storeValue($name, $value, $space = 'base', $type = 'system') + public static function storeValue($name, $value, string $space = 'base', string $type = 'system') { if (in_array($name, ['_method', '_token'])) { return; diff --git a/beike/Shop/Http/Controllers/ProductController.php b/beike/Shop/Http/Controllers/ProductController.php index fd3ae586..0577a9f1 100644 --- a/beike/Shop/Http/Controllers/ProductController.php +++ b/beike/Shop/Http/Controllers/ProductController.php @@ -22,6 +22,7 @@ class ProductController extends Controller $data = [ 'product' => (new ProductDetail($product))->jsonSerialize(), ]; + $data = hook_filter('product.show', $data); return view('product', $data); } diff --git a/beike/Shop/Http/Resources/ProductDetail.php b/beike/Shop/Http/Resources/ProductDetail.php index 4626318d..5f0d9260 100644 --- a/beike/Shop/Http/Resources/ProductDetail.php +++ b/beike/Shop/Http/Resources/ProductDetail.php @@ -25,6 +25,8 @@ class ProductDetail extends JsonResource 'id' => $this->id, 'name' => $this->description->name ?? '', 'description' => $this->description->content ?? '', + 'brand_id' => $this->brand->id ?? 0, + 'brand_name' => $this->brand->name ?? '', 'images' => array_map(function ($image) { return [ 'preview' => image_resize($image, 500, 500),