From 67bb821a0e371a37d11bd83b608de72856217448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com> Date: Thu, 10 Mar 2022 18:57:53 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E9=A6=96=E9=A1=B5=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F=E5=8F=8A=E6=96=87=E6=A1=88?= =?UTF-8?q?=E5=92=8C=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/ProjectController.php | 6 ++--- app/Http/Controllers/Api/UsersController.php | 2 +- resources/assets/js/pages/index.vue | 22 ++++++++--------- resources/assets/sass/dark.scss | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php index 42f622579..11d28fe01 100755 --- a/app/Http/Controllers/Api/ProjectController.php +++ b/app/Http/Controllers/Api/ProjectController.php @@ -964,13 +964,13 @@ class ProjectController extends AbstractController // if ($complete === 'yes') { $builder->whereNotNull('project_tasks.complete_at'); - } elseif ($complete === 'no') { + } elseif ($complete === 'no' && $deleted == 'no') { $builder->whereNull('project_tasks.complete_at'); } // if ($archived == 'yes') { $builder->whereNotNull('project_tasks.archived_at'); - } elseif ($archived == 'no') { + } elseif ($archived == 'no' && $deleted == 'no') { $builder->whereNull('project_tasks.archived_at'); } // @@ -979,7 +979,7 @@ class ProjectController extends AbstractController } // foreach ($sorts as $column => $direction) { - if (!in_array($column, ['complete_at', 'archived_at', 'end_at'])) continue; + if (!in_array($column, ['complete_at', 'archived_at', 'end_at', 'deleted_at'])) continue; if (!in_array($direction, ['asc', 'desc'])) continue; $builder->orderBy('project_tasks.' . $column, $direction); } diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index ce2656935..f45cf4643 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -92,7 +92,7 @@ class UsersController extends AbstractController Cache::forget("code::" . $email); if ($isRegVerify && $user->is_email_verity === 0) { UserEmailVerification::userEmailSend($user); - return $retError('请验证邮箱后再登录'); + return $retError('您还没有验证邮箱，请先登录邮箱通过验证邮件验证邮箱'); } } // diff --git a/resources/assets/js/pages/index.vue b/resources/assets/js/pages/index.vue index 6d4d9d6d3..130551ab6 100644 --- a/resources/assets/js/pages/index.vue +++ b/resources/assets/js/pages/index.vue @@ -4,13 +4,13 @@
- +
{{ $L("注册账号") }}
-
+
{{ $L("登录") }}
@@ -48,13 +48,13 @@ $L("DooTask是一款轻量级的开源在线项目任务管理工具，提供各类文档协作工具、在线思维导图、在线流程图、项目管理、任务分发、即时IM，文件管理等工具。") }}
-
-
+
@@ -62,7 +62,7 @@
-
+
@@ -90,7 +90,7 @@
-
+
@@ -113,7 +113,7 @@
-
+
@@ -139,11 +139,11 @@
-
+
-
+
@@ -159,7 +159,7 @@
-
+
{{ $L("开启您的 Dootask 团队协作") }} diff --git a/resources/assets/sass/dark.scss b/resources/assets/sass/dark.scss index baac98d32..f61efd7ef 100644 --- a/resources/assets/sass/dark.scss +++ b/resources/assets/sass/dark.scss @@ -306,4 +306,28 @@ body.dark-mode-reverse { } } } + + .page-warp { + .page-header { + .header-nav { + .header-nav-box { + .header-right-one { + .header-right-one-dropdown { + color: #000000; + } + } + + .header-right-two { + color: #000000; + } + } + } + + .header-content { + .header-title, .header-tips { + color: #000000; + } + } + } + } }