!540 【功能修复】修复新创建用户未上传头像时,头像不显示的bug。 修复布局配置中标签页图标key错误的bug

Merge pull request !540 from kuxiao/pass20240907
pull/541/head
芋道源码 2024-09-07 08:15:14 +00:00 committed by Gitee
commit beaf533a14
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 5 additions and 5 deletions

View File

@ -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},
// //

View File

@ -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')
// //

View File

@ -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'])

View File

@ -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()

View File

@ -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