Commit ff44f8a6 by lijinqi

重写init

parent f8389862
import request from '@/utils/request'
// 登录方法
export function login(mobile, password, code, uuid) {
export function login(mobile, password, code) {
const data = {
mobile,
password,
code,
uuid
code
}
return request({
url: '/member/auth/login',
......@@ -34,7 +33,7 @@ export function register(data) {
// 获取用户详细信息
export function getInfo() {
return request({
url: '/getInfo',
url: '/member/user/get',
method: 'get'
})
}
......
......@@ -42,7 +42,7 @@ const appStore = useAppStore()
const settingsStore = useSettingsStore()
const permissionStore = usePermissionStore()
const sidebarRouters = computed(() => {
return permissionStore.sidebarRouters.filter(item => item.path === '/console') // 只展示控制台的菜单项
return constantRoutes.filter(item => item.path === '/console') // 只展示控制台的菜单项
})
const showLogo = computed(() => settingsStore.sidebarLogo)
const sideTheme = computed(() => settingsStore.sideTheme)
......
......@@ -35,7 +35,7 @@ router.beforeEach((to, from, next) => {
useUserStore().getInfo().then(res => {
})
next()
} else {
} /*else {
if (useUserStore().roles.length === 0) {
isRelogin.show = true
// 判断当前用户是否已拉取完user_info信息
......@@ -59,7 +59,7 @@ router.beforeEach((to, from, next) => {
} else {
next()
}
}
}*/
} else {
// 没有token
if (whiteList.indexOf(to.path) !== -1) {
......
......@@ -19,13 +19,13 @@ const useUserStore = defineStore(
const mobile = userInfo.mobile.trim()
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
login(mobile, password, code, uuid).then(res => {
login(mobile, password, code).then(res => {
setToken(res.data.accessToken)
this.token = res.data.token
debugger;
this.token = res.data.accessToken
resolve()
}).catch(error => {
reject(error)
......@@ -36,16 +36,16 @@ const useUserStore = defineStore(
getInfo() {
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
const user = res.data
const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
/*if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
this.roles = res.roles
this.permissions = res.permissions
} else {
this.roles = ['ROLE_DEFAULT']
}
this.id = user.userId
}*/
this.id = user.id
this.name = user.mobile
this.avatar = avatar
resolve(res)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment