From 9596af4e3e29a32dfe76ff78d63bb0e40dd9ef61 Mon Sep 17 00:00:00 2001 From: hdm Date: Tue, 14 Jun 2022 18:47:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B3=E4=B8=8B=E8=A7=92=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=93=BE=E6=8E=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/home/controller/Index.php | 9 ++++----- app/home/view/index/main.html | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/home/controller/Index.php b/app/home/controller/Index.php index 8e93ac3..8f0e088 100644 --- a/app/home/controller/Index.php +++ b/app/home/controller/Index.php @@ -24,7 +24,7 @@ class Index extends BaseController $invoice_map_check[] = ['', 'exp', Db::raw("FIND_IN_SET('{$admin_id}',check_admin_ids)")]; $invoice_map_check[] = ['status','=',1]; $invoice_count_check = Db::name('Invoice')->where($invoice_map_check)->count(); - $statistics['invoice_html_check'] = ' 您有'.$invoice_count_check.'条发票申请待审核'; + $statistics['invoice_html_check'] = ' 您有'.$invoice_count_check.'条发票申请待审核'; if($invoice_count_check==0){ $statistics['invoice_html_check'] = ''; } @@ -34,7 +34,7 @@ class Index extends BaseController $invoice_map_open[] = ['open_admin_id','=',$admin_id]; $invoice_map_open[] = ['status','=',1]; $invoice_count_open = Db::name('Invoice')->where($invoice_map_open)->count(); - $statistics['invoice_html_open'] = ' 您有'.$invoice_count_open.'条发票待开具'; + $statistics['invoice_html_open'] = '您有'.$invoice_count_open.'条发票待开具'; if($invoice_count_open==0){ $statistics['invoice_html_open'] = ''; } @@ -44,8 +44,7 @@ class Index extends BaseController $expense_map_check[] = ['', 'exp', Db::raw("FIND_IN_SET('{$admin_id}',check_admin_ids)")]; $expense_map_check[] = ['status','=',1]; $expense_count_check = Db::name('Expense')->where($expense_map_check)->count(); - $statistics['expense_html_check'] = ' 您有'.$expense_count_check.'条报销单待审核'; - // $statistics['expense_count_check'] = $expense_count_check; + $statistics['expense_html_check'] = '您有'.$expense_count_check.'条报销单待审核'; if($expense_count_check==0){ $statistics['expense_html_check'] = ''; } @@ -55,7 +54,7 @@ class Index extends BaseController $msg_map[] = ['read_time','=',0]; $msg_map[] = ['status','=',1]; $msg_count = Db::name('Message')->where($msg_map)->count(); - $statistics['msg_html'] = ' 您有'.$msg_count.'条未读消息'; + $statistics['msg_html'] = '您有'.$msg_count.'条未读消息'; $statistics['msg_num'] = $msg_count; if($msg_count==0){ $statistics['msg_html'] = ''; diff --git a/app/home/view/index/main.html b/app/home/view/index/main.html index a2730bd..a13030b 100644 --- a/app/home/view/index/main.html +++ b/app/home/view/index/main.html @@ -13,7 +13,7 @@ .dashboard-logs .layui-timeline-item {padding-bottom: 1px;} .info-td { width: 90px; text-align: right;background-color: #fafafa; color: #999; padding: 5px 3px;} .info-td {width: 90px; text-align: right;background-color: #fafafa; color: #999; padding: 5px 3px;} - .layui-card-body .layui-timeline-title {padding-bottom: 0;font-size: 14px;} + .layui-card-body .layui-timeline-title {padding-bottom: 0;font-size: 14px; margin-bottom:4px;} .layui-card-body .layui-timeline-item {padding-bottom: 5px;} {/block}