From d773279951e464f9dec1621095fa8978f1956c81 Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Fri, 20 Aug 2021 18:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E9=97=AE=E5=99=A8?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E6=8B=BC=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Order.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Models/Order.php b/app/Models/Order.php
index a363fe4..82bedab 100644
--- a/app/Models/Order.php
+++ b/app/Models/Order.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Common\OrderStatus as Status;
+use Illuminate\Support\Facades\Storage;
 
 class Order extends BaseModel
 {
@@ -32,8 +33,9 @@ class Order extends BaseModel
 	{
 		$value = $value ? json_decode($value, true) : [];
 		if (!empty($value['pictures']) && is_array($value['pictures'])) {
+			$prefix = Storage::disk('public')->url('');
 			foreach ($value['pictures'] as &$v) {
-				$v = $this->host . $v;
+				$v = $prefix . $v;
 			}
 		}
 		return $value ?? [];
@@ -41,7 +43,8 @@ class Order extends BaseModel
 
 	public function getPictureAttribute($value): string
 	{
-		return $value ? $this->host . $value : '';
+		$prefix = Storage::disk('public')->url('');
+		return $value && substr($value, 0, 4) != 'http' ? $prefix . $value : '';
 	}
 
 	public function setPictureAttribute($value)