张恒

更新依赖,追加用户信息

...@@ -6727,14 +6727,12 @@ ...@@ -6727,14 +6727,12 @@
6727 "balanced-match": { 6727 "balanced-match": {
6728 "version": "1.0.0", 6728 "version": "1.0.0",
6729 "bundled": true, 6729 "bundled": true,
6730 - "dev": true, 6730 + "dev": true
6731 - "optional": true
6732 }, 6731 },
6733 "brace-expansion": { 6732 "brace-expansion": {
6734 "version": "1.1.11", 6733 "version": "1.1.11",
6735 "bundled": true, 6734 "bundled": true,
6736 "dev": true, 6735 "dev": true,
6737 - "optional": true,
6738 "requires": { 6736 "requires": {
6739 "balanced-match": "^1.0.0", 6737 "balanced-match": "^1.0.0",
6740 "concat-map": "0.0.1" 6738 "concat-map": "0.0.1"
...@@ -6754,8 +6752,7 @@ ...@@ -6754,8 +6752,7 @@
6754 "concat-map": { 6752 "concat-map": {
6755 "version": "0.0.1", 6753 "version": "0.0.1",
6756 "bundled": true, 6754 "bundled": true,
6757 - "dev": true, 6755 + "dev": true
6758 - "optional": true
6759 }, 6756 },
6760 "console-control-strings": { 6757 "console-control-strings": {
6761 "version": "1.1.0", 6758 "version": "1.1.0",
...@@ -6903,7 +6900,6 @@ ...@@ -6903,7 +6900,6 @@
6903 "version": "3.0.4", 6900 "version": "3.0.4",
6904 "bundled": true, 6901 "bundled": true,
6905 "dev": true, 6902 "dev": true,
6906 - "optional": true,
6907 "requires": { 6903 "requires": {
6908 "brace-expansion": "^1.1.7" 6904 "brace-expansion": "^1.1.7"
6909 } 6905 }
...@@ -6996,8 +6992,7 @@ ...@@ -6996,8 +6992,7 @@
6996 "npm-normalize-package-bin": { 6992 "npm-normalize-package-bin": {
6997 "version": "1.0.1", 6993 "version": "1.0.1",
6998 "bundled": true, 6994 "bundled": true,
6999 - "dev": true, 6995 + "dev": true
7000 - "optional": true
7001 }, 6996 },
7002 "npm-packlist": { 6997 "npm-packlist": {
7003 "version": "1.4.8", 6998 "version": "1.4.8",
...@@ -14932,9 +14927,9 @@ ...@@ -14932,9 +14927,9 @@
14932 "dev": true 14927 "dev": true
14933 }, 14928 },
14934 "vuex": { 14929 "vuex": {
14935 - "version": "3.3.0", 14930 + "version": "3.4.0",
14936 - "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.3.0.tgz", 14931 + "resolved": "https://registry.npm.taobao.org/vuex/download/vuex-3.4.0.tgz",
14937 - "integrity": "sha1-ZltGMOoTRzFxOfzFy0laqz7F5RM=" 14932 + "integrity": "sha1-IMwIYGLXUHafzh/rs05/zurr3kU="
14938 }, 14933 },
14939 "vuex-electron": { 14934 "vuex-electron": {
14940 "version": "1.0.3", 14935 "version": "1.0.3",
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
83 "vue": "^2.6.11", 83 "vue": "^2.6.11",
84 "vue-electron": "^1.0.6", 84 "vue-electron": "^1.0.6",
85 "vue-router": "^3.1.6", 85 "vue-router": "^3.1.6",
86 - "vuex": "^3.3.0", 86 + "vuex": "^3.4.0",
87 "vuex-electron": "^1.0.3" 87 "vuex-electron": "^1.0.3"
88 }, 88 },
89 "devDependencies": { 89 "devDependencies": {
......
1 const user = { 1 const user = {
2 state: { 2 state: {
3 - token: JSON.parse(localStorage.getItem('token')), 3 + // token: JSON.parse(localStorage.getItem('token')),
4 - name: JSON.parse(localStorage.getItem('name')), 4 + // name: JSON.parse(localStorage.getItem('name')),
5 - roles: JSON.parse(localStorage.getItem('roles')) 5 + // roles: JSON.parse(localStorage.getItem('roles'))
6 + token: 'admin',
7 + name: 'Super Admin',
8 + roles: ['admin']
6 }, 9 },
7 10
8 mutations: { 11 mutations: {
...@@ -22,7 +25,9 @@ const user = { ...@@ -22,7 +25,9 @@ const user = {
22 25
23 actions: { 26 actions: {
24 // 登录 27 // 登录
25 - Login ({ commit }, data) { 28 + Login ({
29 + commit
30 + }, data) {
26 return new Promise((resolve, reject) => { 31 return new Promise((resolve, reject) => {
27 console.log('这是传过来的登录信息', data) 32 console.log('这是传过来的登录信息', data)
28 commit('SET_TOKEN', 'admin') 33 commit('SET_TOKEN', 'admin')
...@@ -33,7 +38,10 @@ const user = { ...@@ -33,7 +38,10 @@ const user = {
33 }, 38 },
34 39
35 // 登出 40 // 登出
36 - LogOut ({ commit, state }) { 41 + LogOut ({
42 + commit,
43 + state
44 + }) {
37 return new Promise((resolve, reject) => { 45 return new Promise((resolve, reject) => {
38 commit('SET_TOKEN', '') 46 commit('SET_TOKEN', '')
39 commit('SET_ROLES', []) 47 commit('SET_ROLES', [])
...@@ -42,7 +50,9 @@ const user = { ...@@ -42,7 +50,9 @@ const user = {
42 }, 50 },
43 51
44 // 前端 登出 52 // 前端 登出
45 - FedLogOut ({ commit }) { 53 + FedLogOut ({
54 + commit
55 + }) {
46 return new Promise(resolve => { 56 return new Promise(resolve => {
47 commit('SET_TOKEN', '') 57 commit('SET_TOKEN', '')
48 resolve() 58 resolve()
......