|
@@ -1,12 +1,12 @@
|
|
|
-import { getStore, setStore } from '@/util/store'
|
|
|
-import { isURL, validatenull } from '@/util/validate'
|
|
|
-import { getUserInfo, loginByMobile, loginBySocial, loginByUsername, logout, refreshToken } from '@/api/login'
|
|
|
-import { deepClone, encryption } from '@/util/util'
|
|
|
+import {getStore, setStore} from '@/util/store'
|
|
|
+import {isURL, validatenull} from '@/util/validate'
|
|
|
+import {getUserInfo, loginByMobile, loginBySocial, loginByUsername, logout, refreshToken} from '@/api/login'
|
|
|
+import {deepClone, encryption} from '@/util/util'
|
|
|
import webiste from '@/const/website'
|
|
|
-import { resetRouter } from '@/router/router'
|
|
|
-import { GetMenu } from '@/api/admin/menu'
|
|
|
+import {resetRouter} from '@/router/router'
|
|
|
+import {getMenu, getTopMenu} from '@/api/admin/menu'
|
|
|
|
|
|
-function addPath (ele, first) {
|
|
|
+function addPath(ele, first) {
|
|
|
const menu = webiste.menu
|
|
|
const propsConfig = menu.props
|
|
|
const propsDefault = {
|
|
@@ -49,7 +49,7 @@ const user = {
|
|
|
},
|
|
|
actions: {
|
|
|
// 根据用户名登录
|
|
|
- LoginByUsername ({ commit }, userInfo) {
|
|
|
+ LoginByUsername({commit}, userInfo) {
|
|
|
const user = encryption({
|
|
|
data: userInfo,
|
|
|
key: 'pigxpigxpigxpigx',
|
|
@@ -69,7 +69,7 @@ const user = {
|
|
|
})
|
|
|
},
|
|
|
// 根据手机号登录
|
|
|
- LoginByPhone ({ commit }, userInfo) {
|
|
|
+ LoginByPhone({commit}, userInfo) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
loginByMobile(userInfo.mobile, userInfo.code).then(response => {
|
|
|
const data = response.data
|
|
@@ -84,7 +84,7 @@ const user = {
|
|
|
})
|
|
|
},
|
|
|
// 根据OpenId登录
|
|
|
- LoginBySocial ({ commit }, param) {
|
|
|
+ LoginBySocial({commit}, param) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
loginBySocial(param.state, param.code).then(response => {
|
|
|
const data = response.data
|
|
@@ -98,7 +98,7 @@ const user = {
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
- GetUserInfo ({ commit }) {
|
|
|
+ GetUserInfo({commit}) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
getUserInfo().then((res) => {
|
|
|
const data = res.data.data || {}
|
|
@@ -112,7 +112,7 @@ const user = {
|
|
|
})
|
|
|
},
|
|
|
// 刷新token
|
|
|
- RefreshToken ({ commit, state }) {
|
|
|
+ RefreshToken({commit, state}) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
refreshToken(state.refresh_token).then(response => {
|
|
|
const data = response.data
|
|
@@ -127,7 +127,7 @@ const user = {
|
|
|
})
|
|
|
},
|
|
|
// 登出
|
|
|
- LogOut ({ commit }) {
|
|
|
+ LogOut({commit}) {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
logout().then(() => {
|
|
|
resetRouter();
|
|
@@ -147,7 +147,7 @@ const user = {
|
|
|
})
|
|
|
},
|
|
|
// 注销session
|
|
|
- FedLogOut ({ commit }) {
|
|
|
+ FedLogOut({commit}) {
|
|
|
return new Promise(resolve => {
|
|
|
resetRouter();
|
|
|
commit('SET_MENU', [])
|
|
@@ -162,22 +162,29 @@ const user = {
|
|
|
})
|
|
|
},
|
|
|
// 获取系统菜单
|
|
|
- GetMenu ({
|
|
|
- commit
|
|
|
- }, type) {
|
|
|
+ GetMenu({commit}, obj) {
|
|
|
return new Promise(resolve => {
|
|
|
- GetMenu().then((res) => {
|
|
|
+ getMenu(obj.id).then((res) => {
|
|
|
const data = res.data.data
|
|
|
const menu = deepClone(data)
|
|
|
menu.forEach(ele => {
|
|
|
addPath(ele)
|
|
|
})
|
|
|
- commit('SET_MENU', { type, menu })
|
|
|
+ let type = obj.type
|
|
|
+ commit('SET_MENU', {type, menu})
|
|
|
resolve(menu)
|
|
|
})
|
|
|
})
|
|
|
+ },
|
|
|
+ //顶部菜单
|
|
|
+ GetTopMenu() {
|
|
|
+ return new Promise(resolve => {
|
|
|
+ getTopMenu().then((res) => {
|
|
|
+ const data = res.data.data || []
|
|
|
+ resolve(data)
|
|
|
+ })
|
|
|
+ })
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
mutations: {
|
|
|
SET_ACCESS_TOKEN: (state, access_token) => {
|
|
@@ -208,7 +215,7 @@ const user = {
|
|
|
state.userInfo = userInfo
|
|
|
},
|
|
|
SET_MENU: (state, params = {}) => {
|
|
|
- let { menu, type } = params;
|
|
|
+ let {menu, type} = params;
|
|
|
if (type !== false) state.menu = menu
|
|
|
setStore({
|
|
|
name: 'menu',
|