From 1a8334058bd312e85d7384e499d7cbd9090d8754 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Tue, 3 Jul 2018 15:11:52 +0800
Subject: [PATCH] no message

Former-commit-id: fde02fa98ee6a9cc6a6a9ed4933b34715910b342 [formerly fde02fa98ee6a9cc6a6a9ed4933b34715910b342 [formerly fde02fa98ee6a9cc6a6a9ed4933b34715910b342 [formerly fde02fa98ee6a9cc6a6a9ed4933b34715910b342 [formerly 343afc4dcaafa419ac669d402a897531de023220 [formerly ee190663eea91b7c43fa0950ca5e599c121f227f]]]]]
Former-commit-id: b963a285c043a8f87f235b4a3d79798dc862a62e
Former-commit-id: ff681ca1d0bfd0f3487ef6f74b658e031a58db2f
Former-commit-id: ac3d0795933f1508b956b2c6a039ead7e6fb3d4a [formerly b3c5b462d69758026cef3cc29eccc1f04d454e2f]
Former-commit-id: 8a73105b1e6dee21d61cf13dd661546f13f203f2
Former-commit-id: 976f312c74cf1833ef92dd7a6c7fa36b4da6e925
Former-commit-id: 87a343d87b25969aa8bcc12665cc7e63044c8bf2
Former-commit-id: a34ef0de27cc6992af1e3c12f7ec7df6dc1618aa
Former-commit-id: 7edde307d869292feb955b4bfbf90fc03c128bd0
---
 .../core/d2-layout-main/components/-user/index.vue    | 11 ++++++++++-
 src/pages/core/login/index.vue                        |  8 ++++++++
 src/store/modules/d2admin.js.REMOVED.git-id           |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/components/core/d2-layout-main/components/-user/index.vue b/src/components/core/d2-layout-main/components/-user/index.vue
index b937e9c7..18616d3c 100644
--- a/src/components/core/d2-layout-main/components/-user/index.vue
+++ b/src/components/core/d2-layout-main/components/-user/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dropdown class="d2-mr">
-    <span class="btn-text">你好</span>
+    <span class="btn-text">你好 {{username}}</span>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item @click.native="logOff"><d2-icon name="power-off"/> 注销</el-dropdown-item>
       <el-dropdown-item><d2-icon name="user-circle-o"/> 个人中心</el-dropdown-item>
@@ -9,8 +9,16 @@
 </template>
 
 <script>
+// 插件
 import Cookies from 'js-cookie'
+import { mapState } from 'vuex'
+
 export default {
+  computed: {
+    ...mapState({
+      username: state => state.d2admin.username
+    })
+  },
   methods: {
     logOff () {
       this.$confirm('注销此账户吗?', '注销', {
@@ -20,6 +28,7 @@ export default {
       }).then(() => {
         // 删除cookie
         Cookies.remove('token')
+        Cookies.remove('uuid')
         // 跳转路由
         this.$router.push({
           name: 'login'
diff --git a/src/pages/core/login/index.vue b/src/pages/core/login/index.vue
index c84b6c6b..512703e3 100644
--- a/src/pages/core/login/index.vue
+++ b/src/pages/core/login/index.vue
@@ -48,6 +48,8 @@ require('particles.js')
 // https://vincentgarreau.com/particles.js/#default
 import config from './config/default'
 import Cookies from 'js-cookie'
+import { mapMutations } from 'vuex'
+
 export default {
   data () {
     return {
@@ -74,6 +76,9 @@ export default {
     particlesJS('login', config)
   },
   methods: {
+    ...mapMutations([
+      'd2adminUsernameSet'
+    ]),
     // 提交登陆信息
     submit () {
       this.$refs.loginForm.validate((valid) => {
@@ -93,8 +98,11 @@ export default {
               const setting = {
                 expires: 1
               }
+              // 设置 cookie
               Cookies.set('uuid', res.uuid, setting)
               Cookies.set('token', res.token, setting)
+              // 设置 vuex
+              this.d2adminUsernameSet(res.name)
               // 跳转路由
               this.$router.push({
                 name: 'index'
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 1a8e9199..13527a7d 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-9cb5ae65d8c8b6c41644e115280f0d3e8ef38d33
\ No newline at end of file
+d778c730422f7b1f5003b5674b98394d12362a90
\ No newline at end of file