From 33b108a90d83302dca6b83f9930eb3d8e7c45bbb Mon Sep 17 00:00:00 2001 From: lemon <15040771@qq.com> Date: Wed, 8 Sep 2021 18:17:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/AdminAgent/Controllers/WorkorderController.php | 13 +++++++------ resources/views/admin/pages/index.blade.php | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/AdminAgent/Controllers/WorkorderController.php b/app/AdminAgent/Controllers/WorkorderController.php index 6fdeb4c..bd03685 100755 --- a/app/AdminAgent/Controllers/WorkorderController.php +++ b/app/AdminAgent/Controllers/WorkorderController.php @@ -29,10 +29,11 @@ class WorkorderController extends AdminController public function index(Content $content) { $workorderId = \request('workorder_id',0); - $data = $userList = $msgList = []; + $userList = $msgList = []; $workorder = \App\Models\Workorder::query() - ->with('point') + ->with(['point','publisher']) ->where(['publisher_id' => Admin::user()->id,'publisher_type' => DemandTraits::$col[0]]) + ->orWhere(['point_id' => Admin::user()->id,'point_type' => DemandTraits::$col[0]]) ->orderByDesc('updated_at') ->get(); @@ -41,8 +42,8 @@ class WorkorderController extends AdminController $arr = [ 'workorder_id' => $v->id, 'unread' => true, - 'avatar' => $v->point->avatar, - 'name' => $v->point->name, + 'avatar' => $v->publisher_type == DemandTraits::$col[0] ? $v->point->avatar : $v->publisher->avatar, + 'name' => $v->publisher_type == DemandTraits::$col[0] ? $v->point->name : $v->publisher->name, 'content' => $v->title, 'last_message' => $item ? ($item->type == 1 ? $item->content : '【 图片 】') : '', 'last_message_time' => $item->created_at ?? '', @@ -73,8 +74,8 @@ class WorkorderController extends AdminController ]; return $content - ->header('Dashboard') - ->description('Description...') + ->header('工单') + ->description('列表') ->body(admin_view('admin.pages.index',$data)); } diff --git a/resources/views/admin/pages/index.blade.php b/resources/views/admin/pages/index.blade.php index e3771ba..eed6264 100644 --- a/resources/views/admin/pages/index.blade.php +++ b/resources/views/admin/pages/index.blade.php @@ -30,7 +30,7 @@ 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; }