|
@@ -99,10 +99,12 @@ export default defineComponent({
|
|
|
loading.value = true;
|
|
loading.value = true;
|
|
|
queryQueryWrFriend(value)
|
|
queryQueryWrFriend(value)
|
|
|
.then((res) => {
|
|
.then((res) => {
|
|
|
- if (!value) {
|
|
|
|
|
|
|
+ if (value) {
|
|
|
|
|
+ searchFriend.value = [...searchFriend.value, ...res];
|
|
|
|
|
+ } else {
|
|
|
myFriends.value = res; // 我的朋友
|
|
myFriends.value = res; // 我的朋友
|
|
|
|
|
+ searchFriend.value = res;
|
|
|
}
|
|
}
|
|
|
- searchFriend.value = res;
|
|
|
|
|
})
|
|
})
|
|
|
.catch((err: string) => message.error(err))
|
|
.catch((err: string) => message.error(err))
|
|
|
.finally(() => {
|
|
.finally(() => {
|
|
@@ -114,6 +116,10 @@ export default defineComponent({
|
|
|
const findResult = myFriends.value.filter((e) => String(e.frienduserid).includes(value));
|
|
const findResult = myFriends.value.filter((e) => String(e.frienduserid).includes(value));
|
|
|
if (findResult.length) {
|
|
if (findResult.length) {
|
|
|
searchFriend.value = findResult;
|
|
searchFriend.value = findResult;
|
|
|
|
|
+ // fix:#1191 搜索好友时,输入的数字包含在已有好友中时,会无法精确匹配到未添加的用户
|
|
|
|
|
+ if (!findResult.find((e) => e.frienduserid.toString() === value)) {
|
|
|
|
|
+ queryMyFriend(value);
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
queryMyFriend(value);
|
|
queryMyFriend(value);
|
|
|
}
|
|
}
|