diff --git a/app/Models/Product.php b/app/Models/Product.php index 34ad683..64de22d 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -4,7 +4,6 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\SoftDeletes; -use Illuminate\Support\Facades\Storage; /** * 供应商产品 @@ -21,12 +20,11 @@ class Product extends BaseModel // 获取所有产品图片 public function getPicturesAttribute($value): array { - $pictures = $value ? json_decode($value, true) : []; - foreach ($pictures as &$v) { - $v = Storage::disk('public')->url($v); + if (is_string($value)) { + $value = $value ? json_decode($value, true) : []; } $this->append('picture'); - return $pictures; + return $value ?? []; } // 获取第一张产品图片 @@ -35,17 +33,6 @@ class Product extends BaseModel return $this->pictures[0] ?? ''; } - //保存图片时去掉域名 - public function setPicturesAttribute($value) - { - if (is_array($value)) { - foreach ($value as &$v) { - $v = str_replace(Storage::disk('public')->url(''), '', $v); - } - $this->attributes['pictures'] = json_encode($value); - } - } - public function supplier() { return $this->belongsTo(Supplier::class);