From d22898d7341bf4fa96b956afe14bd93a51ada923 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 20 Jul 2018 10:39:24 +0800
Subject: [PATCH] demo/playground/ua

Former-commit-id: a96394ff0be7a95a5d96adf54391339d69af9fd5 [formerly a96394ff0be7a95a5d96adf54391339d69af9fd5 [formerly a96394ff0be7a95a5d96adf54391339d69af9fd5 [formerly a96394ff0be7a95a5d96adf54391339d69af9fd5 [formerly 0d5cde6f3159acbcd0da4cafbfd1beeb4a2dcf53 [formerly 9d7bd149e7a497dae325b8a76ec2327acb928591]]]]]
Former-commit-id: 44d07b4ce0e2fda3c4f12e4677053a93fdf3e287
Former-commit-id: 0878c077a3e58ca7ae2550563f3277afb2a1505e
Former-commit-id: dd4ec1cd40077c87e04a46b7916b1cb695772598 [formerly 260ba0013721f93c1b750c9a4baced47d846d2b0]
Former-commit-id: f386481937b2dee6b5cb5a55e4150e62194a0d74
Former-commit-id: d6f7d9662b1c5208fb39887b22d91e3ba65f515a
Former-commit-id: c0d04a36620b3811b1ee061c66844a4c45208130
Former-commit-id: 73acb00308ff05f3fb15065b4187126dc5715aa0
Former-commit-id: 0a2e96437f1090566da11b05c19d9b38738890fa
---
 src/menu/modules/demo-playground.js         |  3 +-
 src/pages/demo/element/data-table/index.vue |  2 +-
 src/pages/demo/playground/ua/index.vue      | 23 +++++++++++
 src/pages/login/config/README.md            |  2 +
 src/pages/login/page.vue                    | 44 ++++-----------------
 src/router/routes.js.REMOVED.git-id         |  2 +-
 src/store/modules/d2admin.js.REMOVED.git-id |  2 +-
 7 files changed, 38 insertions(+), 40 deletions(-)
 create mode 100644 src/pages/demo/playground/ua/index.vue
 create mode 100644 src/pages/login/config/README.md

diff --git a/src/menu/modules/demo-playground.js b/src/menu/modules/demo-playground.js
index 46ccb6e7..328e0540 100644
--- a/src/menu/modules/demo-playground.js
+++ b/src/menu/modules/demo-playground.js
@@ -25,6 +25,7 @@ export default {
     { path: `${pre}theme`, title: '主题', icon: 'flask' },
     { path: `${pre}fullscreen`, title: '全屏', icon: 'arrows-alt' },
     { path: `${pre}gray`, title: '灰度模式', icon: 'eye' },
-    { path: `${pre}db`, title: '数据持久化', icon: 'database' }
+    { path: `${pre}db`, title: '数据持久化', icon: 'database' },
+    { path: `${pre}ua`, title: '浏览器信息', icon: 'info-circle' }
   ])('/demo/playground/')
 }
diff --git a/src/pages/demo/element/data-table/index.vue b/src/pages/demo/element/data-table/index.vue
index 53f64ad7..cd7fd8cf 100644
--- a/src/pages/demo/element/data-table/index.vue
+++ b/src/pages/demo/element/data-table/index.vue
@@ -1,6 +1,6 @@
 <template>
   <d2-container>
-    
+
     <h1 class="d2-mt-0">基础用法</h1>
     <el-table
       :data="tableData"
diff --git a/src/pages/demo/playground/ua/index.vue b/src/pages/demo/playground/ua/index.vue
new file mode 100644
index 00000000..1e5019c7
--- /dev/null
+++ b/src/pages/demo/playground/ua/index.vue
@@ -0,0 +1,23 @@
+<template>
+  <d2-container>
+    <p class="d2-mt-0">useragent</p>
+    <el-input :value="ua.ua"></el-input>
+    <p>格式化数据 in vuex: state.d2admin.ua</p>
+    <d2-highlight :code="uaStr"/>
+  </d2-container>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  computed: {
+    ...mapState({
+      ua: state => state.d2admin.ua
+    }),
+    uaStr () {
+      const { browser, engine, os, device, cpu } = this.ua
+      return JSON.stringify({ browser, engine, os, device, cpu }, null, 2)
+    }
+  }
+}
+</script>
diff --git a/src/pages/login/config/README.md b/src/pages/login/config/README.md
new file mode 100644
index 00000000..87be2291
--- /dev/null
+++ b/src/pages/login/config/README.md
@@ -0,0 +1,2 @@
+// 例子插件配置地址
+// https://vincentgarreau.com/particles.js/#default
\ No newline at end of file
diff --git a/src/pages/login/page.vue b/src/pages/login/page.vue
index f0c2c419..c5b6f692 100644
--- a/src/pages/login/page.vue
+++ b/src/pages/login/page.vue
@@ -56,12 +56,9 @@
 <script>
 /* eslint-disable */
 require('particles.js')
-// 配置地址
-// https://vincentgarreau.com/particles.js/#default
 import config from './config/default'
 import Cookies from 'js-cookie'
-import { mapMutations } from 'vuex'
-
+import { mapMutations, mapActions } from 'vuex'
 export default {
   data () {
     return {
@@ -113,6 +110,9 @@ export default {
       'd2adminUserInfoSet',
       'd2adminLoginSuccessLoad'
     ]),
+    ...mapActions([
+      'd2adminLogin'
+    ]),
     /**
      * @description 接收选择一个用户快速登陆的事件
      * @param {object} user 用户信息
@@ -129,39 +129,11 @@ export default {
     submit () {
       this.$refs.loginForm.validate((valid) => {
         if (valid) {
-          // 开始请求登录接口
-          this.$axios({
-            method: 'post',
-            url: '/login',
-            data: {
-              username: this.formLogin.username,
-              password: this.formLogin.password
-            }
+          this.d2adminLogin({
+            vm: this,
+            username: this.formLogin.username,
+            password: this.formLogin.password
           })
-            .then(res => {
-              // cookie 一天的有效期
-              const setting = {
-                expires: 1
-              }
-              // 设置 cookie 一定要存 uuid 和 token 两个 cookie，整个系统依赖这两个数据进行校验和存储
-              Cookies.set('uuid', res.data.uuid, setting)
-              Cookies.set('token', res.data.token, setting)
-              // 设置 vuex 用户信息
-              this.d2adminUserInfoSet({
-                name: res.data.name
-              })
-              // 用户登陆后从数据库加载一系列的设置
-              this.d2adminLoginSuccessLoad()
-              // 跳转路由
-              this.$router.push({
-                name: 'index'
-              })
-            })
-            .catch(err => {
-              console.group('登陆结果')
-              console.log('err: ', err)
-              console.groupEnd()
-            })
         } else {
           return false
         }
diff --git a/src/router/routes.js.REMOVED.git-id b/src/router/routes.js.REMOVED.git-id
index 91a2adb0..6592cf19 100644
--- a/src/router/routes.js.REMOVED.git-id
+++ b/src/router/routes.js.REMOVED.git-id
@@ -1 +1 @@
-d1fc661cca201ded872328bf7926689075938e00
\ No newline at end of file
+8f76893e76107fa094818a6c495320ab7023c0ab
\ No newline at end of file
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index d1abd206..77633349 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-5c74482dc6e71d5efa34bc5fdfb5c40943d5d386
\ No newline at end of file
+87f7615f1492b3bc4534633f7da875df831a5940
\ No newline at end of file