From ca97c5ca4ff294dc784edeba900e927699173805 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Thu, 19 Jul 2018 17:00:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=94=80=E9=80=BB=E8=BE=91=E8=BD=AC?=
 =?UTF-8?q?=E7=A7=BB=E5=88=B0=20vuex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: f31a633b971c45a544a373c581ef603941cae327 [formerly 23fdc68df2f8fc6fd5c4e69ca8b7d884fe53decf] [formerly f31a633b971c45a544a373c581ef603941cae327 [formerly 23fdc68df2f8fc6fd5c4e69ca8b7d884fe53decf] [formerly f31a633b971c45a544a373c581ef603941cae327 [formerly 23fdc68df2f8fc6fd5c4e69ca8b7d884fe53decf] [formerly 23fdc68df2f8fc6fd5c4e69ca8b7d884fe53decf [formerly b31ed8b7ee9f03071b452e3b7086b06bf261078f [formerly 6c23c54805a07c133be8e8b70752ed73bbf34a13]]]]]
Former-commit-id: 044f1437f929847962bd7eb7f753b8770bccde9e
Former-commit-id: 5bde6cd5f3c5af8a0c1a9ac1e61f69fff025c61c
Former-commit-id: 169a1a6c4eb0c0522a30b6d9bc3f8c078f725d9e [formerly 9cb800d61661dc15361191620058015de2217714]
Former-commit-id: fc88ea03ef389486d001dbcb05798f6340b8bbb7
Former-commit-id: 9c101f9a8098d7f2c411b38a518281ecfeb535f5
Former-commit-id: 6134dbd30721e57493ae936127967df8453c95e2
Former-commit-id: 7657a1fb82e736be0caab9b3c9b3df2b549b9d61
Former-commit-id: de7f04298e233f2e6c5b42fbbbe8f877c9ba44a6
---
 public/index.html                             |  8 +++--
 .../components/header-user/index.vue          | 33 +++++--------------
 src/mock/login/index.js                       |  8 ++---
 src/pages/login/page.vue                      |  6 ++--
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 vue.config.js                                 |  9 +++--
 6 files changed, 29 insertions(+), 37 deletions(-)

diff --git a/public/index.html b/public/index.html
index 57a0ef71..01b8c8c4 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,9 +19,11 @@
         justify-content: center;
         align-items: center;
         flex-direction: column;
-        background: #757F9A;
-        background: -webkit-linear-gradient(to top, #D7DDE8, #757F9A);
-        background: linear-gradient(to top, #D7DDE8, #757F9A);
+        /* background: #757F9A; */
+        /* background: -webkit-linear-gradient(to top, #D7DDE8, #757F9A); */
+        /* background: linear-gradient(to top, #D7DDE8, #757F9A); */
+        background: linear-gradient(to bottom, rgba(255,255,255,0.15) 0%, rgba(0,0,0,0.15) 100%), radial-gradient(at top center, rgba(255,255,255,0.40) 0%, rgba(0,0,0,0.40) 120%) #989898; 
+        background-blend-mode: multiply,multiply;
       }
       .d2-app-loading-title {
         color: #FFF;
diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index 62de837b..37d17d0e 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -9,9 +9,7 @@
 </template>
 
 <script>
-// 插件
-import Cookies from 'js-cookie'
-import { mapState, mapMutations } from 'vuex'
+import { mapState, mapActions } from 'vuex'
 export default {
   computed: {
     ...mapState({
@@ -19,29 +17,16 @@ export default {
     })
   },
   methods: {
-    ...mapMutations([
-      'd2adminUtilDbRemoveByUuid'
+    ...mapActions([
+      'd2adminLogout'
     ]),
+    /**
+     * @description 登出
+     */
     logOff () {
-      this.$confirm('注销此账户吗?', '注销', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 删除用户信息
-        this.d2adminUtilDbRemoveByUuid({
-          key: 'userInfo',
-          emptyValue: ''
-        })
-        // 删除cookie
-        Cookies.remove('token')
-        Cookies.remove('uuid')
-        // 跳转路由
-        this.$router.push({
-          name: 'login'
-        })
-      }).catch(() => {
-        // 取消了注销
+      this.d2adminLogout({
+        vm: this,
+        confirm: true
       })
     }
   }
diff --git a/src/mock/login/index.js b/src/mock/login/index.js
index f5b4fd3b..dfbf1f9b 100644
--- a/src/mock/login/index.js
+++ b/src/mock/login/index.js
@@ -14,10 +14,10 @@ const userDB = [
     name: '编辑'
   },
   {
-    username: 'user',
-    password: 'user',
-    uuid: 'user-uuid',
-    name: '一般用户'
+    username: 'user1',
+    password: 'user1',
+    uuid: 'user1-uuid',
+    name: '用户1'
   }
 ]
 
diff --git a/src/pages/login/page.vue b/src/pages/login/page.vue
index 8a95575e..f0c2c419 100644
--- a/src/pages/login/page.vue
+++ b/src/pages/login/page.vue
@@ -79,9 +79,9 @@ export default {
           password: 'editor'
         },
         {
-          name: '用户',
-          username: 'user',
-          password: 'user'
+          name: '用户1',
+          username: 'user1',
+          password: 'user1'
         }
       ],
       // 表单
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 68f2d485..065090f2 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-cb5203e7da4a54f17ca8f08ae175eae15db544f0
\ No newline at end of file
+ba1f2c6d38619c095d25a69254227124c5bc6000
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 97081e1c..76a03967 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,6 +12,7 @@ module.exports = {
     publicPath: '/d2-admin-preview/' // 和 baseUrl 保持一致
   },
   // webpack 设置
+  // 默认设置: https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-service/lib/config/base.js
   chainWebpack: config => {
     // markdown
     config.module
@@ -48,8 +49,12 @@ module.exports = {
       .add(resolve('src/assets/svg-icons/icons'))
       .end()
     // 重新设置 alias
-    config.resolve
-      .alias
+    config.resolve.alias
       .set('@', resolve('src'))
+    // babel-polyfill 加入 entry
+    const entry = config.entry('app')
+    entry
+      .add('babel-polyfill')
+      .end()
   }
 }