From 4024cfb7c74eed012c5d398477b561f5836a437a Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 10 Apr 2023 12:36:41 +0800
Subject: [PATCH] no message

---
 app/Http/Controllers/Api/SystemController.php   | 12 ++++++------
 resources/assets/js/pages/manage/dashboard.vue  |  4 +++-
 resources/assets/sass/pages/page-dashboard.scss |  4 ++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 5be00603c..cc9ca2878 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -575,12 +575,12 @@ class SystemController extends AbstractController
                     $data['error'][] = '终端MAC与License不匹配';
                 }
             }
-            if ($data['user_count'] > $data['info']['people']) {
-                $data['error'][] = '终端用户数超过License限制';
-            }
-            if ($data['info']['expired_at'] && strtotime($data['info']['expired_at']) <= Base::time()) {
-                $data['error'][] = '终端License已过期';
-            }
+        }
+        if ($data['user_count'] > $data['info']['people']) {
+            $data['error'][] = '终端用户数超过License限制';
+        }
+        if ($data['info']['expired_at'] && strtotime($data['info']['expired_at']) <= Base::time()) {
+            $data['error'][] = '终端License已过期';
         }
         //
         return Base::retSuccess('success', $data);
diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue
index 71f676768..482a4671d 100644
--- a/resources/assets/js/pages/manage/dashboard.vue
+++ b/resources/assets/js/pages/manage/dashboard.vue
@@ -2,7 +2,9 @@
     <div class="page-dashboard">
         <PageTitle :title="$L('仪表盘')"/>
         <div class="dashboard-wrapper">
-            <Alert v-if="warningMsg" class="dashboard-warning" type="warning" show-icon>{{warningMsg}}</Alert>
+            <Alert v-if="warningMsg" class="dashboard-warning" type="warning" show-icon>
+                <span @click="goForward({name: 'manage-setting-license'})">{{warningMsg}}</span>
+            </Alert>
             <div class="dashboard-hello">{{$L('欢迎您，' + userInfo.nickname)}}</div>
             <div class="dashboard-desc">
                 {{$L('以下是你当前的任务统计数据')}}
diff --git a/resources/assets/sass/pages/page-dashboard.scss b/resources/assets/sass/pages/page-dashboard.scss
index 2d5c72ce5..62da73898 100644
--- a/resources/assets/sass/pages/page-dashboard.scss
+++ b/resources/assets/sass/pages/page-dashboard.scss
@@ -18,6 +18,10 @@
             border-top: 0;
             border-top-left-radius: 0;
             border-top-right-radius: 0;
+            padding-right: 14px;
+            > span {
+                cursor: pointer;
+            }
         }
 
         .dashboard-hello,