Merge branch 'dev' of http://172.16.100.91:3000/scout666/chat-pc into dev
This commit is contained in:
commit
af2c80f902
@ -2,12 +2,14 @@ import { post, get, upload } from '@/utils/request'
|
|||||||
|
|
||||||
//ES搜索-主页搜索什么都有、指定用户、指定群、群与用户概览
|
//ES搜索-主页搜索什么都有、指定用户、指定群、群与用户概览
|
||||||
export const ServeSeachQueryAll = (data = {}) => {
|
export const ServeSeachQueryAll = (data = {}) => {
|
||||||
return post('/api/v1/elasticsearch/query-all/v2', data)
|
return post('/api/v1/elasticsearch/query-all', data)
|
||||||
|
// return post('/api/v1/elasticsearch/query-all/v2', data)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ES搜索用户数据
|
// ES搜索用户数据
|
||||||
export const ServeQueryUser = (data) => {
|
export const ServeQueryUser = (data) => {
|
||||||
return post('/api/v1/elasticsearch/query-user/v2', data)
|
return post('/api/v1/elasticsearch/query-user', data)
|
||||||
|
// return post('/api/v1/elasticsearch/query-user/v2', data)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ES搜索群组数据
|
// ES搜索群组数据
|
||||||
|
@ -142,13 +142,14 @@ watch(
|
|||||||
() => talkParams,
|
() => talkParams,
|
||||||
(newValue, oldValue) => {
|
(newValue, oldValue) => {
|
||||||
// 判断是否为好友
|
// 判断是否为好友
|
||||||
if (talkParams.type !== 2) {
|
// if (talkParams.type !== 2) {
|
||||||
ServeCheckFriend({ receiver_id: newValue.receiver_id, talk_type: 1 }).then((res) => {
|
// ServeCheckFriend({ receiver_id: newValue.receiver_id, talk_type: 1 }).then((res) => {
|
||||||
if (res?.code === 200) {
|
// if (res?.code === 200) {
|
||||||
isFriend.value = res.data.is_friend
|
// isFriend.value = res.data.is_friend
|
||||||
}
|
// }
|
||||||
})
|
// })
|
||||||
}
|
// }
|
||||||
|
console.log(newValue)
|
||||||
},
|
},
|
||||||
{ deep: true, immediate: true }
|
{ deep: true, immediate: true }
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user