diff --git a/TUIKit/components/TUIChat/index.vue b/TUIKit/components/TUIChat/index.vue index 928938f..b2b03c5 100644 --- a/TUIKit/components/TUIChat/index.vue +++ b/TUIKit/components/TUIChat/index.vue @@ -287,6 +287,7 @@ } function onCurrentConversationUpdate(conversation: IConversationModel) { + updateUIUserNotInGroup(conversation) // return when currentConversation is null if (!conversation) { diff --git a/TUIKit/components/TUIContact/contact-list/contact-list-item/index.vue b/TUIKit/components/TUIContact/contact-list/contact-list-item/index.vue index 2321594..ecb0ef1 100644 --- a/TUIKit/components/TUIContact/contact-list/contact-list-item/index.vue +++ b/TUIKit/components/TUIContact/contact-list/contact-list-item/index.vue @@ -27,12 +27,12 @@
-
{{ groupTypeForShow }} -
+
-->
('') const currentContactInfo = ref({} as IContactInfoType) @@ -237,7 +238,8 @@ function toggleCurrentContactList(key: keyof IContactList) { if (key === 'currentContactSearchingStatus') { - TUIStore.update(StoreName.CUSTOM, key, true) + navigateTo('/pages/adduser/index') + // TUIStore.update(StoreName.CUSTOM, key, true) return } if (currentContactListKey.value === key) { @@ -290,12 +292,13 @@ } const selectFriend = (item: any) => { - TUIStore.update( - StoreName.CUSTOM, - 'currentContactListKey', - 'friendList' - ) - selectItem(item) + navigateTo('/pages/adduser/details', { id: item.userID, type: '1' }) + // TUIStore.update( + // StoreName.CUSTOM, + // 'currentContactListKey', + // 'friendList' + // ) + // selectItem(item) } function onDisplayOnlineStatusUpdated(status: boolean) { diff --git a/TUIKit/components/TUIContact/index.vue b/TUIKit/components/TUIContact/index.vue index c97da45..c4cfd3e 100644 --- a/TUIKit/components/TUIContact/index.vue +++ b/TUIKit/components/TUIContact/index.vue @@ -64,6 +64,7 @@ import addCircle from '../../assets/icon/add-friend.svg' import backSVG from '../../assets/icon/back.svg' import { CONTACT_INFO_TITLE } from '../../constant' + import { navigateTo } from '../../../utils/router' const emits = defineEmits(['switchConversation']) @@ -97,11 +98,12 @@ } const openContactSearch = () => { - TUIStore.update( - StoreName.CUSTOM, - 'currentContactSearchingStatus', - true - ) + navigateTo('/pages/adduser/index') + // TUIStore.update( + // StoreName.CUSTOM, + // 'currentContactSearchingStatus', + // true + // ) } const resetContactType = () => { diff --git a/TUIKit/components/TUIConversation/conversation-header/index.vue b/TUIKit/components/TUIConversation/conversation-header/index.vue index a4cdffe..eeb9257 100644 --- a/TUIKit/components/TUIConversation/conversation-header/index.vue +++ b/TUIKit/components/TUIConversation/conversation-header/index.vue @@ -146,8 +146,7 @@ } }) } else if (item.data.name === 'isAddUser') { - console.log('添加好友') - showDialog('提示', '开发中...') + navigateTo('/pages/adduser/index') } else { listener.onClicked(item) } diff --git a/TUIKit/components/TUIGroup/create-group/index.vue b/TUIKit/components/TUIGroup/create-group/index.vue index 927014c..c01ddd0 100644 --- a/TUIKit/components/TUIGroup/create-group/index.vue +++ b/TUIKit/components/TUIGroup/create-group/index.vue @@ -372,6 +372,11 @@ diff --git a/pages/adduser/index.vue b/pages/adduser/index.vue index 95e2251..8793d05 100644 --- a/pages/adduser/index.vue +++ b/pages/adduser/index.vue @@ -1,216 +1,183 @@