From e8c6b7bb1eb0906eb7e82484f5266240832f3c2f Mon Sep 17 00:00:00 2001
From: shuixiang <mr.shuixiang@aliyun.com>
Date: Fri, 10 Sep 2021 13:51:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B7=A5=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/WorkorderController.php       |   1 +
 .../Controllers/WorkorderController.php       |   1 +
 .../Controllers/WorkorderController.php       |   1 +
 public/js/helper.js                           |   4 +
 resources/views/admin/pages/index.blade.php   | 203 ++++++++++--------
 5 files changed, 117 insertions(+), 93 deletions(-)
 create mode 100644 public/js/helper.js

diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php
index 7d7591d..ebf7df3 100755
--- a/app/AdminAgent/Controllers/WorkorderController.php
+++ b/app/AdminAgent/Controllers/WorkorderController.php
@@ -67,6 +67,7 @@ class WorkorderController extends AdminController
 				'avatar' => $v->publisher->avatar,
 				'name' => $v->publisher->name,
 				'content' => $v->content,
+				'created_at_text' => $v->created_at,
 			];
 			$msgList [] = $arr;
 		}
diff --git a/app/AdminGuide/Controllers/WorkorderController.php b/app/AdminGuide/Controllers/WorkorderController.php
index c87cf81..8fef312 100755
--- a/app/AdminGuide/Controllers/WorkorderController.php
+++ b/app/AdminGuide/Controllers/WorkorderController.php
@@ -67,6 +67,7 @@ class WorkorderController extends AdminController
 				'avatar' => $v->publisher->avatar,
 				'name' => $v->publisher->name,
 				'content' => $v->content,
+				'created_at_text' => $v->created_at,
 			];
 			$msgList [] = $arr;
 		}
diff --git a/app/AdminSupplier/Controllers/WorkorderController.php b/app/AdminSupplier/Controllers/WorkorderController.php
index 3c5c692..c978ff3 100755
--- a/app/AdminSupplier/Controllers/WorkorderController.php
+++ b/app/AdminSupplier/Controllers/WorkorderController.php
@@ -67,6 +67,7 @@ class WorkorderController extends AdminController
 				'avatar' => $v->publisher->avatar,
 				'name' => $v->publisher->name,
 				'content' => $v->content,
+				'created_at_text' => $v->created_at,
 			];
 			$msgList [] = $arr;
 		}
diff --git a/public/js/helper.js b/public/js/helper.js
new file mode 100644
index 0000000..582d23c
--- /dev/null
+++ b/public/js/helper.js
@@ -0,0 +1,4 @@
+function viewImage(ele) {
+	$('#viewImage').find('img').attr('src', $(ele).attr('src'));
+	$('#viewImage').modal();
+}
diff --git a/resources/views/admin/pages/index.blade.php b/resources/views/admin/pages/index.blade.php
index eed6264..621c7cb 100644
--- a/resources/views/admin/pages/index.blade.php
+++ b/resources/views/admin/pages/index.blade.php
@@ -1,66 +1,71 @@
 <style>
-	.chat-container { padding:  20px 40px; }
+	.chat-container { padding:  20px 40px; height: calc(100vh - 160px) }
 	.msg-chat {
-		position: relative; background-color: white; padding: 40px 20px;
-		border-top-right-radius: 8px; border-bottom-right-radius: 8px;
+		position: relative; background-color: white; padding: 40px 20px 50px 20px;
+		border-top-right-radius: 8px; border-bottom-right-radius: 8px; height: 100%;
 	}
-	.msg-chat-list {  min-height: 800px; max-height: 800px; overflow-y: auto; overflow-x: hidden; }
+	.msg-chat-list {  height: 100%; overflow-y: auto; overflow-x: hidden; padding-bottom: 20px; }
 	.msg-user { margin: 5px 0px; line-height: 30px; }
 	.msg-name { display: inline-block; font-size: 14px; font-weight: bold; padding: 0px 5px; }
 	.msg-avatar { display: inline-block; }
 	.msg-avatar img { width: 30px; height: 30px; border-radius: 50%; }
 	.msg-content { display: inline-block; background-color: #f4f4f4; padding: 20px; border-radius: 10px; }
 	.msg-content-image { max-width: 120px; max-height: 120px; }
-	.msg-send { position: absolute; bottom: 0; left: 0; z-index: 999; }
+	.msg-send { position: absolute; bottom: 0; left: 0; z-index: 999; height: 50px; }
 	.msg-send .input-group-addon { width: 40px; border: none; line-height: 2.7; background-color: #dbe3e6; cursor: pointer; }
 	.msg-send .input-group-addon.msg-text { background-color: #586cb1; color: white; padding: 5px 10px; width: 60px; line-height: 2.8; }
 	.msg-time { padding: 0 5px; color: gray; font-size: 12px; margin: 5px 0; }
 
 	.msg-list {
 		position: relative; background-color: white;
-		border-top-left-radius: 5px; border-bottom-left-radius: 5px; min-height: 900px;
-		max-height: 1000px; border-right: 1px solid #dbe3e6; overflow-y: auto;
+		border-top-left-radius: 5px; border-bottom-left-radius: 5px;
+		height: 100%; border-right: 1px solid #dbe3e6; overflow-y: auto;
 		padding: 20px 10px;
 	}
 	.msg-list-item { position: relative; border: 1px solid #dbe3e6; padding: 10px; border-radius: 5px; margin-bottom: 1px; cursor: pointer; }
 	.msg-list-item:hover { border-color: green; }
+	.msg-list-item.active { border: 1px solid green; box-shadow: 0px 0px 3px green; }
 	.msg-list-title { font-weight: bold; font-size: 14px; display: -webkit-box; -webkit-line-clamp: 1; -webkit-box-orient: vertical; border-radius: 5px; padding: 2px 5px; overflow: hidden; text-overflow: ellipsis; margin-bottom: 5px; }
 	.msg-list-content { color: gray; background-color: #f4f4f4; border-radius: 5px; padding: 2px 5px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }
 	.msg-list-badge {
 		position: absolute; right: 5px; top: 5px;
 		width: 10px; height: 10px; border-radius: 10px;
 	}
-	/*.background-red { background-color: red; }*/
+	.background-red { background-color: red; }
 	.background-gray { background-color: gray; }
 </style>
 
 <div class="row chat-container">
 	<div class="col-lg-3 col-md-4 msg-list">
 		@foreach($user_list as $key => $item)
-			<div class="msg-list-item" onclick="window.location.href = '?workorder_id={{$item['workorder_id']}}'">
-				<div class="msg-user">
-					<div class="msg-avatar">
-						<img src="{{$item['avatar']}}" alt="头像" title="头像" />
+			@if($workorder['workorder_id']==$item['workorder_id'])
+				<div class="msg-list-item active" onclick="window.location.href = '?workorder_id={{$item['workorder_id']}}'">
+			@else
+				<div class="msg-list-item" onclick="window.location.href = '?workorder_id={{$item['workorder_id']}}'">
+			@endif
+					<div class="msg-user">
+						<div class="msg-avatar">
+							<img src="{{$item['avatar']}}" alt="头像" title="头像" />
+						</div>
+						<div class="msg-name">
+							{{$item['name']}}
+						</div>
 					</div>
-					<div class="msg-name">
-						{{$item['name']}}
+					<div class="msg-list-title">
+						{{$item['content']}}
 					</div>
+					<div class="msg-list-content">
+						{{$item['last_message']}}
+					</div>
+					<div class="msg-time">
+						{{$item['last_message_time']}}
+					</div>
+						{{--@if($item['unread'] == true)--}}
+						{{--<div class="msg-list-badge background-red"></div>--}}
+					{{--@else--}}
+						{{--<div class="msg-list-badge background-gray"></div>--}}
+					{{--@endif--}}
 				</div>
-				<div class="msg-list-title">
-					{{$item['content']}}
-				</div>
-				<div class="msg-list-content">
-					{{$item['last_message']}}
-				</div>
-				<div class="msg-time">
-					{{$item['last_message_time']}}
-				</div>
-				@if($item['unread'] == true)
-					<div class="msg-list-badge background-red"></div>
-				@else
-					<div class="msg-list-badge background-gray"></div>
-				@endif
-			</div>
 		@endforeach
 	</div>
 
@@ -91,12 +96,12 @@
 							@if($item['it_type'] == 1)
 								{{$item['content']}}
 							@elseif($item['it_type'] == 2)
-								<img class="msg-content-image" src="{{$item['content']}}" alt="图片" title="图片" />
+								<img class="msg-content-image" onclick="viewImage(this)" src="{{$item['content']}}" alt="图片" title="图片" />
 							@endif
 						</div>
 
 						<div class="msg-time">
-							2021-01-01 12:02:03
+							{{$item['created_at_text']}}
 						</div>
 					</div>
 				</div>
@@ -116,12 +121,12 @@
 							@if($item['it_type'] == 1)
 								{{$item['content']}}
 							@elseif($item['it_type'] == 2)
-								<img class="msg-content-image" src="{{$item['content']}}" alt="图片" title="图片" />
+								<img class="msg-content-image" onclick="viewImage(this)" src="{{$item['content']}}" alt="图片" title="图片" />
 							@endif
 						</div>
 
 						<div class="msg-time">
-							2021-01-01 12:02:03
+							{{$item['created_at_text']}}
 						</div>
 					</div>
 				</div>
@@ -171,71 +176,83 @@
 	</div>
 </div>
 
-<script>
-	Dcat.ready(function() {
-		$('.msg-image').on('click', function (e) {
-			$('.image').click();
-		});
+<div class="modal fade" tabindex="-1" role="dialog" id="viewImage">
+	<div class="modal-dialog modal-lg" role="document">
+		<div class="modal-content">
+			<img src="" style="width: 100%; height: 100%;" />
+		</div>
+	</div>
+</div>
+	<script src="js/helper.js" type="application/javascript"></script>
+	<script>
 
-		$('.image').on('change', function (e) {
-
-			let formData = new FormData()
-			formData.append("image", $(this)[0].files[0])
-			formData.append("workorder_id", $('input[name=workorder-id]').val())
-			$.ajax({
-				url: '/admin-agent/send_image',
-				type: 'POST',
-				data: formData,
-				processData: false,
-				contentType: false,
-				dataType: 'json',
-				success: function(res) {
-					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="图片" />'
-					templateHtml = templateHtml.replace('#contents', imgDoc)
-					templateHtml = templateHtml.replace('#times', msgTime)
-					$(".msg-chat-list").append(templateHtml)
-					$(".msg-chat-list").animate({ scrollTop: $(".msg-chat-list")[0].scrollHeight - $('.msg-chat-list').height() }, 1)
-				},
-				error: function (error) {
-					console.log(error)
-				}
+		Dcat.ready(function() {
+
+			$(".msg-chat-list").animate({ scrollTop: $(".msg-chat-list")[0].scrollHeight - $('.msg-chat-list').height() }, 1)
+
+			$('.msg-image').on('click', function (e) {
+				$('.image').click();
 			});
-		});
 
-		$('input[name=msg-input]').on('keyup', function (e) {
-			if (e.keyCode == 13) {
-				$('.msg-text').click()
-			}
-		});
+			$('.image').on('change', function (e) {
 
-		$('.msg-text').on('click', function (e) {
-
-			let msgText = $('input[name=msg-input]').val()
-			let workorderId = $('input[name=workorder-id]').val()
-
-			$.ajax({
-				url: '/admin-agent/send_text',
-				type: 'POST',
-				data: {content: msgText, workorder_id: workorderId},
-				dataType: 'json',
-				success: function(res) {
-					let msgText = res.data.content
-					let msgTime = res.data.created_at
-					let templateHtml = $('.template-my').html()
-					templateHtml = templateHtml.replace('#contents', msgText)
-					templateHtml = templateHtml.replace('#times', msgTime)
-					$(".msg-chat-list").append(templateHtml)
-					$('input[name=msg-input]').val('')
-					$(".msg-chat-list").animate({ scrollTop: $(".msg-chat-list")[0].scrollHeight - $('.msg-chat-list').height() }, 1)
-				},
-				error: function (error) {
-					console.log(error)
+				let formData = new FormData()
+				formData.append("image", $(this)[0].files[0])
+				formData.append("workorder_id", $('input[name=workorder-id]').val())
+				$.ajax({
+					url: '/admin-agent/send_image',
+					type: 'POST',
+					data: formData,
+					processData: false,
+					contentType: false,
+					dataType: 'json',
+					success: function(res) {
+						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" onclick="viewImage(this)" src="'+imageUrl+'" alt="图片" title="图片" />'
+						templateHtml = templateHtml.replace('#contents', imgDoc)
+						templateHtml = templateHtml.replace('#times', msgTime)
+						$(".msg-chat-list").append(templateHtml)
+						$(".msg-chat-list").animate({ scrollTop: $(".msg-chat-list")[0].scrollHeight - $('.msg-chat-list').height() }, 1)
+					},
+					error: function (error) {
+						console.log(error)
+					}
+				});
+			});
+
+			$('input[name=msg-input]').on('keyup', function (e) {
+				if (e.keyCode == 13) {
+					$('.msg-text').click()
 				}
 			});
+
+			$('.msg-text').on('click', function (e) {
+
+				let msgText = $('input[name=msg-input]').val()
+				let workorderId = $('input[name=workorder-id]').val()
+
+				$.ajax({
+					url: '/admin-agent/send_text',
+					type: 'POST',
+					data: {content: msgText, workorder_id: workorderId},
+					dataType: 'json',
+					success: function(res) {
+						let msgText = res.data.content
+						let msgTime = res.data.created_at
+						let templateHtml = $('.template-my').html()
+						templateHtml = templateHtml.replace('#contents', msgText)
+						templateHtml = templateHtml.replace('#times', msgTime)
+						$(".msg-chat-list").append(templateHtml)
+						$('input[name=msg-input]').val('')
+						$(".msg-chat-list").animate({ scrollTop: $(".msg-chat-list")[0].scrollHeight - $('.msg-chat-list').height() }, 1)
+					},
+					error: function (error) {
+						console.log(error)
+					}
+				});
+			});
 		});
-	});
-</script>
+	</script>