!540 【功能修复】修复新创建用户未上传头像时,头像不显示的bug。 修复布局配置中标签页图标key错误的bug
Merge pull request !540 from kuxiao/pass20240907pull/541/head
commit
beaf533a14
|
@ -129,7 +129,7 @@ const copyConfig = async () => {
|
||||||
// 标签页
|
// 标签页
|
||||||
tagsViewImmerse: ${appStore.getTagsViewImmerse},
|
tagsViewImmerse: ${appStore.getTagsViewImmerse},
|
||||||
// 标签页图标
|
// 标签页图标
|
||||||
getTagsViewIcon: ${appStore.getTagsViewIcon},
|
tagsViewIcon: ${appStore.getTagsViewIcon},
|
||||||
// logo
|
// logo
|
||||||
logo: ${appStore.getLogo},
|
logo: ${appStore.getLogo},
|
||||||
// 菜单手风琴
|
// 菜单手风琴
|
||||||
|
|
|
@ -23,7 +23,7 @@ const { getPrefixCls } = useDesign()
|
||||||
|
|
||||||
const prefixCls = getPrefixCls('user-info')
|
const prefixCls = getPrefixCls('user-info')
|
||||||
|
|
||||||
const avatar = computed(() => userStore.user.avatar ?? avatarImg)
|
const avatar = computed(() => userStore.user.avatar || avatarImg)
|
||||||
const userName = computed(() => userStore.user.nickname ?? 'Admin')
|
const userName = computed(() => userStore.user.nickname ?? 'Admin')
|
||||||
|
|
||||||
// 锁定屏幕
|
// 锁定屏幕
|
||||||
|
|
|
@ -21,7 +21,7 @@ const props = defineProps({
|
||||||
})
|
})
|
||||||
|
|
||||||
const userStore = useUserStore()
|
const userStore = useUserStore()
|
||||||
const avatar = computed(() => userStore.user.avatar ?? avatarImg)
|
const avatar = computed(() => userStore.user.avatar || avatarImg)
|
||||||
const userName = computed(() => userStore.user.nickname ?? 'Admin')
|
const userName = computed(() => userStore.user.nickname ?? 'Admin')
|
||||||
|
|
||||||
const emit = defineEmits(['update:modelValue'])
|
const emit = defineEmits(['update:modelValue'])
|
||||||
|
|
|
@ -22,7 +22,7 @@ const showDate = ref(true)
|
||||||
const { getPrefixCls } = useDesign()
|
const { getPrefixCls } = useDesign()
|
||||||
const prefixCls = getPrefixCls('lock-page')
|
const prefixCls = getPrefixCls('lock-page')
|
||||||
|
|
||||||
const avatar = computed(() => userStore.user.avatar ?? avatarImg)
|
const avatar = computed(() => userStore.user.avatar || avatarImg)
|
||||||
const userName = computed(() => userStore.user.nickname ?? 'Admin')
|
const userName = computed(() => userStore.user.nickname ?? 'Admin')
|
||||||
|
|
||||||
const lockStore = useLockStore()
|
const lockStore = useLockStore()
|
||||||
|
|
|
@ -78,7 +78,7 @@ const userStore = useUserStore()
|
||||||
const messageContainer: any = ref(null)
|
const messageContainer: any = ref(null)
|
||||||
const isScrolling = ref(false) //用于判断用户是否在滚动
|
const isScrolling = ref(false) //用于判断用户是否在滚动
|
||||||
|
|
||||||
const userAvatar = computed(() => userStore.user.avatar ?? userAvatarDefaultImg)
|
const userAvatar = computed(() => userStore.user.avatar || userAvatarDefaultImg)
|
||||||
const roleAvatar = computed(() => props.conversation.roleAvatar ?? roleAvatarDefaultImg)
|
const roleAvatar = computed(() => props.conversation.roleAvatar ?? roleAvatarDefaultImg)
|
||||||
|
|
||||||
// 定义 props
|
// 定义 props
|
||||||
|
|
Loading…
Reference in New Issue