From 741dd4c25cf6f0bf482a3391e30c97285f9b1ef6 Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Wed, 8 Sep 2021 17:34:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/admin/pages/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/admin/pages/index.blade.php b/resources/views/admin/pages/index.blade.php index 7636e05..5a9651b 100644 --- a/resources/views/admin/pages/index.blade.php +++ b/resources/views/admin/pages/index.blade.php @@ -190,7 +190,7 @@ contentType: false, dataType: 'json', success: function(res) { - let imageUrl = {{env('APP_URL')}} + '/' + res.data.url + let imageUrl = 'https://hainan.lanzulive.com/'+res.data.url let msgTime = res.data.created_at let templateHtml = $('.template-my').html() let imgDoc = '图片' From f0cdbe667be37c10696e075d31a1f2840a118ccb Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Wed, 8 Sep 2021 17:38:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/admin/pages/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/admin/pages/index.blade.php b/resources/views/admin/pages/index.blade.php index 5a9651b..a73bc24 100644 --- a/resources/views/admin/pages/index.blade.php +++ b/resources/views/admin/pages/index.blade.php @@ -190,7 +190,7 @@ contentType: false, dataType: 'json', success: function(res) { - let imageUrl = 'https://hainan.lanzulive.com/'+res.data.url + let imageUrl = 'https://hainan.lanzulive.com/'+res.data.content let msgTime = res.data.created_at let templateHtml = $('.template-my').html() let imgDoc = '图片' From a10381ff70d5c173f0d052a99c37f089ba388a95 Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Wed, 8 Sep 2021 17:54:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminAgent/Controllers/WorkorderController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php index 09e4da1..30adb28 100755 --- a/app/AdminAgent/Controllers/WorkorderController.php +++ b/app/AdminAgent/Controllers/WorkorderController.php @@ -19,6 +19,7 @@ use Dcat\Admin\Show; use Dcat\Admin\Http\Controllers\AdminController; use Illuminate\Http\Request; use App\Traits\ResponseHelper; +use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Validator; class WorkorderController extends AdminController @@ -215,7 +216,7 @@ class WorkorderController extends AdminController } $path = $request->image->store('public/images/workorder'); - + $path = (Storage::url($path)); $item = new WorkorderItem(); $item->workorder_id = request('workorder_id',0); $item->content = $path; From aa272dc3b27cd6973e94dfec9c836a02ef0ff5ef Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Wed, 8 Sep 2021 18:02:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F=20?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminAgent/Controllers/WorkorderController.php | 3 ++- resources/views/admin/pages/index.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php index 30adb28..6fdeb4c 100755 --- a/app/AdminAgent/Controllers/WorkorderController.php +++ b/app/AdminAgent/Controllers/WorkorderController.php @@ -68,7 +68,8 @@ class WorkorderController extends AdminController $data = [ 'user_list' => $userList, - 'msg_list' => $msgList + 'msg_list' => $msgList, + 'user' => Admin::user() ]; return $content diff --git a/resources/views/admin/pages/index.blade.php b/resources/views/admin/pages/index.blade.php index a73bc24..e3771ba 100644 --- a/resources/views/admin/pages/index.blade.php +++ b/resources/views/admin/pages/index.blade.php @@ -159,10 +159,10 @@
- 供应商5566 + {{$user->name}}
- 头像 + 头像
#contents