diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index f0a34f7c5..023c84bc6 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -298,7 +298,7 @@ export default { } } // 会议事件 - window.__onMeetingEvent = ({act,uuid}) => { + window.__onMeetingEvent = ({act,uuid,channelID}) => { switch (act) { // 获取用户信息 case "getInfo": @@ -322,13 +322,14 @@ export default { break; //加入成功 case "success": - // 关闭添加会议窗口 this.$store.dispatch("closeMeetingWindow","add") break; // 邀请 case "invent": - // 关闭邀请会议窗口 - this.$store.dispatch("closeMeetingWindow","invitation") + this.$store.dispatch("showMeetingWindow",{ + type: "invitation", + meetingid: channelID + }) break; //结束会议 case "endMeeting": diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue index 5e7eceedf..9f2abad42 100644 --- a/resources/assets/js/pages/manage/components/MeetingManager.vue +++ b/resources/assets/js/pages/manage/components/MeetingManager.vue @@ -189,18 +189,19 @@ export default { handler(val) { switch (val.type) { case 'add': - this.addShow = val.show + this.addShow = val.show; this.loadIng = 0; break; case 'invitation': - this.invitationShow = val.show - this.invitationLoad = 0; + this.invitationShow = val.show; + this.invitationLoad = false; + this.invitationData.meetingid = val.meetingid; break; case 'error': - this.addShow = val.show + this.addShow = val.show; this.loadIng = 0; - this.invitationShow = val.show - this.invitationLoad = 0; + this.invitationShow = val.show; + this.invitationLoad = false; $A.modalError('加入会议失败'); break; } @@ -274,6 +275,7 @@ export default { username: data.nickname, video: this.addData.tracks.includes("video"), audio: this.addData.tracks.includes("audio"), + channelID: data.meetingid, } }); this.loadIng--; diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index bd3099199..d3cb63500 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -3403,18 +3403,33 @@ export default { /** *****************************************************************************************/ - /** *************************************** pgp *********************************************/ + /** *************************************** meeting *********************************************/ /** *****************************************************************************************/ /** * 关闭会议窗口 * @param state - * @param data + * @param type */ closeMeetingWindow({state}, type) { state.meetingWindow = { show: false, - type: type + type: type, + meetingid: 0 + }; + }, + + /** + * 显示会议窗口 + * @param state + * @param type + * @param meetingid + */ + showMeetingWindow({state}, {type, meetingid}) { + state.meetingWindow = { + show: true, + type: type, + meetingid: meetingid }; }, } diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js index ef07e21ea..e9b146e00 100644 --- a/resources/assets/js/store/state.js +++ b/resources/assets/js/store/state.js @@ -199,5 +199,6 @@ export default { meetingWindow: { show: false, type: "", + meetingid: 0 } };