|
@@ -117,12 +117,11 @@ export default defineComponent({
|
|
|
})
|
|
|
|
|
|
const store = useStore()
|
|
|
- const token = store.state.userInfo.token
|
|
|
|
|
|
const userChange = () => {
|
|
|
if (state.username) {
|
|
|
state.isSearching = true
|
|
|
- state.searchedUserList = store.state.userList.filter((item: any) => item.friendName.includes(state.username))
|
|
|
+ state.searchedUserList = store.state.userList.filter((item: Obj) => item.friendName.includes(state.username))
|
|
|
} else {
|
|
|
state.isSearching = false
|
|
|
state.searchedUserList = []
|
|
@@ -131,9 +130,9 @@ export default defineComponent({
|
|
|
clearTimeout(state.timer)
|
|
|
state.timer = setTimeout(() => {
|
|
|
state.searchedGlobalUserList = []
|
|
|
- if (state.username.length >= 6 && store.state.userList.every((item: StrNumObj) => item.friendName !== state.username)) {
|
|
|
+ if (state.username.length >= 6 && store.state.userList.every((item: Obj) => item.friendName !== state.username)) {
|
|
|
store.commit('setIsSearching', true)
|
|
|
- findUser({token, username: state.username}).then(({data}) => {
|
|
|
+ findUser({username: state.username}).then(({data}) => {
|
|
|
state.searchedGlobalUserList = [data]
|
|
|
}).finally(() => {
|
|
|
store.commit('setIsSearching', false)
|
|
@@ -146,7 +145,7 @@ export default defineComponent({
|
|
|
if (item.id === store.state.userInfo.id) {
|
|
|
return Toast('不能添加自己')
|
|
|
}
|
|
|
- await addFriend({token, id: item.id})
|
|
|
+ await addFriend({id: item.id})
|
|
|
state.username = ''
|
|
|
state.isSearching = false
|
|
|
let obj = {
|
|
@@ -166,15 +165,14 @@ export default defineComponent({
|
|
|
}
|
|
|
|
|
|
const getUserList = async () => {
|
|
|
- if (token) {
|
|
|
- const {data} = await getFriends({token})
|
|
|
+ if (store.state.userInfo.token) {
|
|
|
+ const {data} = await getFriends()
|
|
|
store.state.userList = data
|
|
|
}
|
|
|
}
|
|
|
|
|
|
const getNoReadNum = async (item: StrNumObj) => {
|
|
|
await noReadNum({
|
|
|
- token,
|
|
|
fromId: item.userId,
|
|
|
toId: item.friendId,
|
|
|
messageType: item.isGroup
|
|
@@ -202,12 +200,12 @@ export default defineComponent({
|
|
|
if (state.name === store.state.userInfo.username) {
|
|
|
return Toast('不能添加自己')
|
|
|
}
|
|
|
- if (store.state.userList.some((item: StrNumObj) => item.friendName === state.name)) {
|
|
|
+ if (store.state.userList.some((item: Obj) => item.friendName === state.name)) {
|
|
|
return Toast(state.name + '已存在')
|
|
|
}
|
|
|
Toast.loading('提交中...')
|
|
|
- let {data} = await findUser({token, username: state.name})
|
|
|
- await addFriend({token, id: data.id})
|
|
|
+ let {data} = await findUser({username: state.name})
|
|
|
+ await addFriend({id: data.id})
|
|
|
let obj = {
|
|
|
isGroup: 1,
|
|
|
userId: store.state.userInfo.id,
|
|
@@ -218,11 +216,11 @@ export default defineComponent({
|
|
|
selectUser(obj)
|
|
|
Toast.success('添加成功')
|
|
|
} else {
|
|
|
- if (store.state.userList.some((item: StrNumObj) => item.friendName === state.name)) {
|
|
|
+ if (store.state.userList.some((item: Obj) => item.friendName === state.name)) {
|
|
|
return Toast(state.name + '已存在')
|
|
|
}
|
|
|
Toast.loading('提交中...')
|
|
|
- await addGroup({token, groupName: state.name})
|
|
|
+ await addGroup({groupName: state.name})
|
|
|
getUserList()
|
|
|
Toast.success('创建成功')
|
|
|
}
|