Merge remote-tracking branch 'origin/develop' into develop

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
@@ -67,7 +68,8 @@ class WorkorderController extends AdminController
 
 		$data = [
 			'user_list' => $userList,
-			'msg_list' => $msgList
+			'msg_list' => $msgList,
+			'user' => Admin::user()
 		];
 
 		return $content
@@ -215,7 +217,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;

resources/views/admin/pages/index.blade.php

@@ -159,10 +159,10 @@
 		<div class="col-lg-11 offset-1 text-right">
 			<div class="msg-user">
 				<div class="msg-name">
-					供应商5566
+					{{$user->name}}
 				</div>
 				<div class="msg-avatar">
-					<img src="http://local.base_pro.com/vendor/dcat-admin/images/default-avatar.jpg" alt="头像" title="头像" />
+					<img src="{{$user->avatar}}" alt="头像" title="头像" />
 				</div>
 			</div>
 			<div class="msg-content text-left">#contents</div>
@@ -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.content
 					let msgTime = res.data.created_at
 					let templateHtml = $('.template-my').html()
 					let imgDoc = '<img class="msg-content-image" src="'+imageUrl+'" alt="图片" title="图片" />'