From 155f42dd3751a27f71601abe6021b7cfd344a4a1 Mon Sep 17 00:00:00 2001 From: weifashi <605403358@qq.com> Date: Fri, 7 Jul 2023 16:54:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A=E6=89=93=E5=BC=80=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E7=AA=97=E5=8F=A3=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/App.vue | 9 ++++---- .../manage/components/MeetingManager.vue | 14 +++++++------ resources/assets/js/store/actions.js | 21 ++++++++++++++++--- resources/assets/js/store/state.js | 1 + 4 files changed, 32 insertions(+), 13 deletions(-) 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 } }; From 371c87f5a4cba20026201afe9f18f34d1953a723 Mon Sep 17 00:00:00 2001 From: weifashi <605403358@qq.com> Date: Fri, 7 Jul 2023 17:02:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9A=E7=BB=9F=E4=B8=80=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/App.vue | 4 ++-- .../assets/js/pages/manage/components/MeetingManager.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index 023c84bc6..9c4eea5ad 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -298,7 +298,7 @@ export default { } } // 会议事件 - window.__onMeetingEvent = ({act,uuid,channelID}) => { + window.__onMeetingEvent = ({act,uuid,meetingid}) => { switch (act) { // 获取用户信息 case "getInfo": @@ -328,7 +328,7 @@ export default { case "invent": this.$store.dispatch("showMeetingWindow",{ type: "invitation", - meetingid: channelID + meetingid: meetingid }) break; //结束会议 diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue index 9f2abad42..0c1a3822c 100644 --- a/resources/assets/js/pages/manage/components/MeetingManager.vue +++ b/resources/assets/js/pages/manage/components/MeetingManager.vue @@ -275,7 +275,7 @@ export default { username: data.nickname, video: this.addData.tracks.includes("video"), audio: this.addData.tracks.includes("audio"), - channelID: data.meetingid, + meetingid: data.meetingid } }); this.loadIng--; From 01b50c442e96338cd7897bbfe8dcf20a6fee81b8 Mon Sep 17 00:00:00 2001 From: weifashi <605403358@qq.com> Date: Fri, 7 Jul 2023 17:40:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat=EF=BC=9A=E5=8F=91=E9=80=81=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=90=8D=E7=A7=B0=E7=BB=99=E5=8E=9F=E7=94=9F=E9=82=A3?= =?UTF-8?q?=E8=BE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/pages/manage/components/MeetingManager.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue index 0c1a3822c..9a4611f88 100644 --- a/resources/assets/js/pages/manage/components/MeetingManager.vue +++ b/resources/assets/js/pages/manage/components/MeetingManager.vue @@ -267,6 +267,7 @@ export default { $A.eeuiAppSendMessage({ action: 'startMeeting', meetingParams: { + name: data.name, token: data.token, channel: data.channel, uuid: data.uid, From 220ce21a4aec28adb018cf71a8f472bfd54da433 Mon Sep 17 00:00:00 2001 From: weifashi <605403358@qq.com> Date: Fri, 7 Jul 2023 19:49:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=EF=BC=9A=E5=8F=91=E9=80=81=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E5=90=8D=E7=A7=B0=E7=BB=99=E5=8E=9F=E7=94=9F=E9=82=A3?= =?UTF-8?q?=E8=BE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/pages/manage/components/MeetingManager.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/pages/manage/components/MeetingManager.vue b/resources/assets/js/pages/manage/components/MeetingManager.vue index 9a4611f88..5bf702b6f 100644 --- a/resources/assets/js/pages/manage/components/MeetingManager.vue +++ b/resources/assets/js/pages/manage/components/MeetingManager.vue @@ -267,7 +267,7 @@ export default { $A.eeuiAppSendMessage({ action: 'startMeeting', meetingParams: { - name: data.name, + name: this.addData.name, token: data.token, channel: data.channel, uuid: data.uid,