From 780c5071ed0cf5a372462833890781edb27404dc Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 21 Mar 2019 22:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=8C=BA=E5=88=86=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: aeb2b84bf8da5275a1e8eafc9079954dd41bf80c [formerly aeb2b84bf8da5275a1e8eafc9079954dd41bf80c [formerly aeb2b84bf8da5275a1e8eafc9079954dd41bf80c [formerly aeb2b84bf8da5275a1e8eafc9079954dd41bf80c [formerly 350c8c6514e327fbab5060978b4b7523a098f6d0 [formerly 17c340c2f594b545b945d52cc1a8647348ae3389]]]]]
Former-commit-id: 52db1bdfa3c024dfe218c09e9cf75747b6abb038
Former-commit-id: b2f85a553a4e78de0daa8c18c3d332e5b92510b1
Former-commit-id: ecd4f39b10208f44d030bfaba635e21215053ebc [formerly e68563d7da177cf374736e7f0b8170f0e407a9f4]
Former-commit-id: 2f8af3f79a52372c93e4b27d1f034d214edcd64d
Former-commit-id: 960bd7e3d8cfb67e152c07312ff68652114d480b
Former-commit-id: 9a716fc01315ad5e1064d9c64b671cdc36301721
Former-commit-id: 02d7d4a0e3aab9bfc0318e5dfbe355f306d1f9c3
Former-commit-id: 0c0c46088a4e916e3cd9c1099594b3e1a15bce46
---
 src/plugin/error/index.js                |  2 +-
 src/store/modules/d2admin/modules/log.js |  4 ++--
 src/views/system/log/index.vue           | 14 +++++++++++++-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/plugin/error/index.js b/src/plugin/error/index.js
index 2271b9bc..66b60008 100644
--- a/src/plugin/error/index.js
+++ b/src/plugin/error/index.js
@@ -8,7 +8,7 @@ export default {
         // store 追加 log
         store.dispatch('d2admin/log/push', {
           message: `${info}: ${error.message}`,
-          type: 'error',
+          type: 'danger',
           meta: {
             error,
             instance
diff --git a/src/store/modules/d2admin/modules/log.js b/src/store/modules/d2admin/modules/log.js
index 1e4a3d8a..4d3d2aee 100644
--- a/src/store/modules/d2admin/modules/log.js
+++ b/src/store/modules/d2admin/modules/log.js
@@ -8,7 +8,7 @@ export default {
     // 错误日志
     // + 日志条目的属性
     //   - message 必须 日志信息
-    //   - type 非必须 类型 success | warning | info | error
+    //   - type 非必须 类型 success | warning | info(默认) | error
     //   - time 必须 日志记录时间
     //   - meta 非必须 其它携带信息
     log: []
@@ -36,7 +36,7 @@ export default {
      * @param {String} param type {String} 类型
      * @param {Object} param meta {Object} 附带的信息
      */
-    push ({ rootState, commit }, { message, type, meta }) {
+    push ({ rootState, commit }, { message, type = 'info', meta }) {
       commit('push', {
         message,
         type,
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index ac302985..92d4a5ee 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -16,7 +16,7 @@
         v-for="(logItem, logIndex) in log"
         :key="logIndex">
         <span class="log-time">{{logItem.time}}</span>
-        <span class="log-message">{{logItem.message}}</span>
+        <span class="log-message" :class="`log-message--${logItem.type}`">{{logItem.message}}</span>
       </p>
     </section>
   </d2-container>
@@ -79,6 +79,18 @@ export default {
     }
     .log-message {
       color: $color-text-normal;
+      &.log-message--success {
+        color: $color-success;
+      }
+      &.log-message--warning {
+        color: $color-warning;
+      }
+      &.log-message--info {
+        color: $color-info;
+      }
+      &.log-message--danger {
+        color: $color-danger;
+      }
     }
   }
 }