浏览代码

Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop

pull/102/head
yufei111 1年前
父节点
当前提交
0c8f62039c
共有 3 个文件被更改,包括 5 次插入2 次删除
  1. +1
    -0
      src/layout/components/Header/index.vue
  2. +3
    -1
      src/store/modules/user.js
  3. +1
    -1
      src/views/login/index.vue

+ 1
- 0
src/layout/components/Header/index.vue 查看文件

@@ -66,6 +66,7 @@ export default defineComponent({
}

const getUserInfo = computed(() => {
console.log(userStore, '==============')
return {
hasLogin: userStore.hasLogin,
// avatar: userStore.avatar,

+ 3
- 1
src/store/modules/user.js 查看文件

@@ -8,7 +8,9 @@ export const useUserStore = defineStore('user', {
state() {
return {
userInfo: {
hasLogin: false
hasLogin: false,
realname: '',
avatar: ''
}
}
},

+ 1
- 1
src/views/login/index.vue 查看文件

@@ -25,7 +25,7 @@ export default {
updateLoginTime().then(res => {})
// router.push({ path: getPath() })
// removePath()
// userStore.getUserInfos()
userStore.getUserInfos()
const authority = res.profile.authority
const { VITE_PLATFORM } = import.meta.env
if (authority && (authority.includes(VITE_PLATFORM) || authority.includes('admin'))) {

正在加载...
取消
保存