From ea1df51ef13a4068b3056df3fde482f6ee30a8dc Mon Sep 17 00:00:00 2001 From: shuixiang Date: Fri, 10 Sep 2021 15:58:38 +0800 Subject: [PATCH 1/5] no message --- app/AdminGuide/Controllers/WorkorderController.php | 2 +- app/AdminSupplier/Controllers/WorkorderController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/AdminGuide/Controllers/WorkorderController.php b/app/AdminGuide/Controllers/WorkorderController.php index 97958fb..88d4e7d 100755 --- a/app/AdminGuide/Controllers/WorkorderController.php +++ b/app/AdminGuide/Controllers/WorkorderController.php @@ -44,7 +44,7 @@ class WorkorderController extends AdminController // 先这么处理吧 if ($workorderId == 0 && !empty($workorder)) { - return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id); + return redirect('/admin-guide/workorder_item?workorder_id='.$workorder[0]->id); } foreach ($workorder as $v) { diff --git a/app/AdminSupplier/Controllers/WorkorderController.php b/app/AdminSupplier/Controllers/WorkorderController.php index e8a6640..fc86b8c 100755 --- a/app/AdminSupplier/Controllers/WorkorderController.php +++ b/app/AdminSupplier/Controllers/WorkorderController.php @@ -43,7 +43,7 @@ class WorkorderController extends AdminController // 先这么处理吧 if ($workorderId == 0 && !empty($workorder)) { - return redirect('/admin-agent/workorder_item?workorder_id='.$workorder[0]->id); + return redirect('/admin-supplier/workorder_item?workorder_id='.$workorder[0]->id); } foreach ($workorder as $v) { From 66ae1fe06b2173c1055085cc47cbcfc5cc3b3376 Mon Sep 17 00:00:00 2001 From: shuixiang Date: Fri, 10 Sep 2021 16:17:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/admin/pages/guide-index.blade.php | 395 ++++++++++-------- resources/views/admin/pages/index.blade.php | 2 +- .../admin/pages/supplier-index.blade.php | 395 ++++++++++-------- 3 files changed, 423 insertions(+), 369 deletions(-) diff --git a/resources/views/admin/pages/guide-index.blade.php b/resources/views/admin/pages/guide-index.blade.php index fccf251..2907cb5 100644 --- a/resources/views/admin/pages/guide-index.blade.php +++ b/resources/views/admin/pages/guide-index.blade.php @@ -1,241 +1,268 @@
- @foreach($user_list as $key => $item) -
-
-
- 头像 -
-
- {{$item['name']}} + @if(empty($user_list)) +
暂无工单数据
+ @else + @foreach($user_list as $key => $item) + @if($workorder['workorder_id']==$item['workorder_id']) +
+ @else +
+ @endif +
+
+ 头像 +
+
+ {{$item['name']}} +
+
+
+ {{$item['content']}} +
+
+ {{$item['last_message']}} +
+
+ {{$item['last_message_time']}} +
+ {{--@if($item['unread'] == true)--}} + {{--
--}} + {{--@else--}} + {{--
--}} + {{--@endif--}} +
+ @endforeach + @endif
-
-
- {{$item['content']}} -
-
- {{$item['last_message']}} -
-
- {{$item['last_message_time']}} -
- @if($item['unread'] == true) -
- @else -
- @endif -
- @endforeach -
-
- -
- -
-
发送
- -
-
- @foreach($msg_list as $key => $item) - - @if($item['type'] == 'op') -
-
-
-
- 头像 +
+ @if(empty($msg_list)) +
暂无工单数据
+ @else +
+ +
+
发送
+
-
+
+ @foreach($msg_list as $key => $item) + + @if($item['type'] == 'op') +
+
+
+
+ 头像 +
+
- {{$item['name']}} + {{$item['name']}} +
+
+
+ @if($item['it_type'] == 1) + {{$item['content']}} + @elseif($item['it_type'] == 2) + 图片 + @endif +
+ +
+ {{$item['created_at_text']}} +
+
+
+ @elseif($item['type'] == 'my') +
+
+
+
+ {{$item['name']}} +
+
+ 头像 +
+
+ +
+ @if($item['it_type'] == 1) + {{$item['content']}} + @elseif($item['it_type'] == 2) + 图片 + @endif +
+ +
+ {{$item['created_at_text']}} +
+
+
+ @endif + @endforeach
-
-
- @if($item['it_type'] == 1) - {{$item['content']}} - @elseif($item['it_type'] == 2) - 图片 - @endif -
- -
- 2021-01-01 12:02:03 -
+ @endif
-
- @elseif($item['type'] == 'my') -
-
-
-
- {{$item['name']}} -
-
- 头像 -
-
- -
- @if($item['it_type'] == 1) - {{$item['content']}} - @elseif($item['it_type'] == 2) - 图片 - @endif -
- -
- 2021-01-01 12:02:03 -
+ +
+ +
+
+ +
-
- -
-
- -