yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/541/MERGE
YunaiV 2024-09-07 16:54:20 +08:00
parent 3e55015d77 beaf533a14
commit e5ec820127
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layout/components/Setting/src/Setting.vue
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},
// 菜单手风琴 // 菜单手风琴

2
src/layout/components/UserInfo/src/UserInfo.vue
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')
// 锁定屏幕 // 锁定屏幕

2
src/layout/components/UserInfo/src/components/LockDialog.vue
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'])

2
src/layout/components/UserInfo/src/components/LockPage.vue
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()

2
src/views/ai/chat/index/components/message/MessageList.vue
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