diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index effe749f1..9c4eea5ad 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -298,14 +298,14 @@ export default { } } // 会议事件 - window.__onMeetingEvent = ({act, uuid}) => { + window.__onMeetingEvent = ({act,uuid,meetingid}) => { switch (act) { // 获取用户信息 - case "getInfo": + case "getInfo": this.$store.dispatch("call", { url: 'users/basic', data: { - userid: [(uuid + "").substring(6)] + userid: [ (uuid+"").substring(6) ] } }).then(({data}) => { $A.eeuiAppSendMessage({ @@ -321,22 +321,23 @@ export default { }); break; //加入成功 - case "success": - // 关闭添加会议窗口 - this.$store.dispatch("closeMeetingWindow", "add") + case "success": + this.$store.dispatch("closeMeetingWindow","add") break; // 邀请 - case "invent": - // 关闭邀请会议窗口 - this.$store.dispatch("closeMeetingWindow", "invitation") + case "invent": + this.$store.dispatch("showMeetingWindow",{ + type: "invitation", + meetingid: meetingid + }) break; //结束会议 - case "endMeeting": - + case "endMeeting": + break; //加入失败 - case "error": - this.$store.dispatch("closeMeetingWindow", "error") + case "error": + this.$store.dispatch("closeMeetingWindow","error") break; default: break; diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue index 92ac8e831..de4103028 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; } @@ -266,6 +267,7 @@ export default { $A.eeuiAppSendMessage({ action: 'startMeeting', meetingParams: { + name: this.addData.name, token: data.token, channel: data.channel, uuid: data.uid, @@ -274,6 +276,7 @@ export default { username: data.nickname, video: this.addData.tracks.includes("video"), audio: this.addData.tracks.includes("audio"), + meetingid: data.meetingid } }); this.loadIng--; diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index b4dc0f58d..d3cb63500 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -3403,19 +3403,33 @@ export default { /** *****************************************************************************************/ - /** ************************************* meeting *******************************************/ + /** *************************************** meeting *********************************************/ /** *****************************************************************************************/ /** - * 关闭会议窗口 - * @param state - * @param type - * @param data - */ + * 关闭会议窗口 + * @param state + * @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 } }; diff --git a/resources/mobile b/resources/mobile index 62195f572..7d8f452fc 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 62195f572247d05830049ab06fa7cbddbfc70560 +Subproject commit 7d8f452fc2f93a03b6e8ef05f62af6722b1c7514