v1.3 版本发布,代码同步后端v1.3版本

This commit is contained in:
郑杰
2018-12-31 17:07:02 +08:00
parent 7f2e4ed3f9
commit c97e401918
38 changed files with 1338 additions and 40 deletions

View File

@@ -6,10 +6,14 @@ const getters = {
visitedViews: state => state.tagsView.visitedViews,
cachedViews: state => state.tagsView.cachedViews,
name: state => state.user.name,
createTime: state => state.user.createTime,
email: state => state.user.email,
roles: state => state.user.roles,
permission_routers: state => state.permission.routers,
addRouters: state => state.permission.addRouters,
socketApi: state => state.api.socketApi,
imagesUploadApi: state => state.api.imagesUploadApi
imagesUploadApi: state => state.api.imagesUploadApi,
updateAvatarApi: state => state.api.updateAvatarApi,
qiNiuUploadApi: state => state.api.qiNiuUploadApi
}
export default getters

View File

@@ -1,8 +1,14 @@
const baseUrl = process.env.BASE_API
const api = {
state: {
// 实时控制台
socketApi: baseUrl + '/websocket?token=kl',
imagesUploadApi: baseUrl + '/api/pictures'
// 图片上传
imagesUploadApi: baseUrl + '/api/pictures',
// 修改头像
updateAvatarApi: baseUrl + '/api/users/updateAvatar',
// 上传文件到七牛云
qiNiuUploadApi: baseUrl + '/api/qiNiuContent'
}
}

View File

@@ -1,11 +1,14 @@
import { login, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
import { parseTime } from '@/utils/index'
const user = {
state: {
token: getToken(),
name: '',
email: '',
avatar: '',
createTime: '',
roles: []
},
@@ -21,6 +24,12 @@ const user = {
},
SET_ROLES: (state, roles) => {
state.roles = roles
},
SET_CREATE_TIME: (state, createTime) => {
state.createTime = createTime
},
SET_EMAIL: (state, email) => {
state.email = email
}
},
@@ -46,6 +55,8 @@ const user = {
commit('SET_ROLES', res.roles)
commit('SET_NAME', res.username)
commit('SET_AVATAR', res.avatar)
commit('SET_EMAIL', res.email)
commit('SET_CREATE_TIME', parseTime(res.createTime))
resolve(res)
}).catch(error => {
reject(error)