From 8a306bdee29def2af446c857974589d0552f5aea Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Fri, 4 Oct 2024 13:11:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BE=A4=E7=BB=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E8=AE=BE=E5=A4=87=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/chat.js | 14 +++++ src/api/user.js | 11 ++++ src/views/DeviceList.vue | 1 + src/views/Group.vue | 113 ++++++++++++++++++++++++++++++++++++--- src/views/UserList.vue | 33 ++++++++++-- 5 files changed, 163 insertions(+), 9 deletions(-) diff --git a/src/api/chat.js b/src/api/chat.js index dd07dcc..a561879 100644 --- a/src/api/chat.js +++ b/src/api/chat.js @@ -15,6 +15,20 @@ export const getFriendListService = (data) => { ); } +export const getGroupFriendListService = (data) => { + const params = new URLSearchParams(); + for (let d in data) { + params.append(d, data[d]); + } + // request.headers["Content-Type"] = "application/json"; + request.defaults.headers["token"] = data.token.value; + return request.post('/im/get_group_req_user', params, { + headers: { + 'token': data.token, // 将 token 替换为您的令牌值 + } + } + ); +} export const getMessageService = (data) => { const params = new URLSearchParams(); for (let d in data) { diff --git a/src/api/user.js b/src/api/user.js index 2405ff2..99d1861 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -99,6 +99,17 @@ export const acceptInviteService =(Data)=> { } }) } +export const rejectInviteService =(Data)=> { + const params = new URLSearchParams(); + for (let key in Data) { + params.append(key, Data[key]) + } + return request.post('/im/reject_invite', params, { + headers: { + 'token': Data.token, // 将 token 替换为您的令牌值 + } + }) +} export const SearchUserService = (Data) => { const params = new URLSearchParams(); diff --git a/src/views/DeviceList.vue b/src/views/DeviceList.vue index 9bfd2f5..8179608 100644 --- a/src/views/DeviceList.vue +++ b/src/views/DeviceList.vue @@ -150,6 +150,7 @@ export default { result = await addDeviceService(this.addForm); if (result.code == 0) { ElMessage.success("添加成功"); + this.getDeviceList() } else { //alert("添加失败"); ElMessage.error("添加失败") diff --git a/src/views/Group.vue b/src/views/Group.vue index e7f5eb7..105448b 100644 --- a/src/views/Group.vue +++ b/src/views/Group.vue @@ -4,6 +4,9 @@ import { inject } from "vue"; import { getGroupListService } from "@/api/group.js"; import { restartDeviceService } from "@/api/device.js"; import { addDeviceService } from "@/api/device.js"; +import {sendMessageService } from "@/api/chat.js"; +import {getGroupFriendListService } from "@/api/chat.js"; +import {acceptInviteService } from "@/api/user.js"; import { deleteDeviceService } from "@/api/device.js"; import { getFriendListService } from "@/api/chat.js"; import { addGroupService} from "@/api/chat.js"; @@ -33,6 +36,7 @@ export default { hour: 0, entrydate: [], }, + add_groups:[], addForm: { group_name: "", group_info: "", @@ -58,12 +62,27 @@ export default { methods: { async getGroupList() { let result = {}; + let add_res ={}; try { result = await getGroupListService(this.tokenData); + add_res = await getFriendListService(this.tokenData); } catch (e) { console.log(e); } let data = result.data; + let m ={}; + for(let i=0;i + + 查询 + 建群 + + 我建的群组 + :row-style="this.tableRowClassName" @@ -553,6 +607,53 @@ export default { +
+ + + 我加入的群组列表 + + + + + :row-style="this.tableRowClassName" + + + + + + + + + +
diff --git a/src/views/UserList.vue b/src/views/UserList.vue index e3441be..94ec56c 100644 --- a/src/views/UserList.vue +++ b/src/views/UserList.vue @@ -3,6 +3,7 @@ import axios from "axios"; import { SearchUserService } from "@/api/user.js"; import { getFriendReqService } from "@/api/user.js"; import {acceptInviteService } from "@/api/user.js"; +import { rejectInviteService } from "@/api/user.js"; import { addGroupRequestService } from "@/api/user.js"; import {GetUserInfoService} from "@/api/user.js"; import {DelFGService} from "@/api/user.js"; @@ -144,14 +145,15 @@ export default { try{ result = await addGroupRequestService(req); - if(result.code ===0){ + console.log(result.code); + if(result.code === 0){ ElMessage.success("请求发送成功"); }else{ - ElMessage.error("操作失败：",result.error); + ElMessage.error("操作失败已有请求或者已经是群组成员"); } }catch(e){ - console.log(e); + ElMessage.error("操作失败已有请求或者已经是群组成员"); } @@ -183,6 +185,31 @@ export default { console.log(e); } }, + async RefuseFriendsOrGroup(index){ + var id = this.FriendsGRequestList[index].id; + var im_id = this.FriendsGRequestList[index].im_id; + var name = this.FriendsGRequestList[index].name; + let result ={} + try{ + result =await rejectInviteService({ + token: localStorage.getItem("token"), + id: im_id, + from_user_id: localStorage.getItem("userId"), + to_user_id: id, + msg: "拒绝好友请求", + index: 1, + type: 4, + }); + if(result.code ===0){ + ElMessage.success("拒绝请求成功"); + this.displayFriendReq() + }else{ + ElMessage.error("拒绝请求失败"); + } + }catch(e){ + console.log(e); + } + }, //获取好友请求列表 async displayFriendReq(){