From 68fac22bbf41422e5ea335d93b6c9c60c04812dd Mon Sep 17 00:00:00 2001 From: unknown <1162963624@qq.com> Date: Mon, 30 Nov 2020 11:17:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8F=90=E4=BA=A4=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/common.js | 18 ++++++++++++++++-- public/zhibo.html | 7 +++++++ src/views/regime/Liveing.vue | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/public/js/common.js b/public/js/common.js index f2c5cd0..fef8525 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -164,12 +164,26 @@ function setBtnClickFuc() { $('#room-root').hide(); $('#login-root').show(); $.ajax({ - url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, + url: window.url + 'onExitRoom?roomid=' + window.roomid, headers: "Bearer " + localStorage.getItem("token"), + method:"POST", + data:{ + type:1, + memberid:window.mid, + liveid:wiondow.liveid, + length:window.mytime + }, success(){ - window.parent.location.href="/regime/live"; + $.ajax({ + url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, + headers: "Bearer " + localStorage.getItem("token"), + success(){ + window.parent.location.href="/regime/live"; + } + }) } }) + } else{ diff --git a/public/zhibo.html b/public/zhibo.html index 629cd57..ad3fca8 100644 --- a/public/zhibo.html +++ b/public/zhibo.html @@ -411,6 +411,7 @@ const urldata = GetRequest('roomid') window.roomid = urldata.roomid window.mid = urldata.memberid + window.lvieid = urldata.liveid window.uname = urldata.name @@ -436,6 +437,12 @@ + \ No newline at end of file diff --git a/src/views/regime/Liveing.vue b/src/views/regime/Liveing.vue index 5cf3fee..9c126cf 100644 --- a/src/views/regime/Liveing.vue +++ b/src/views/regime/Liveing.vue @@ -18,7 +18,7 @@ export default defineComponent({ if(id && typeof id == 'string'){ getliveinfo(parseInt(id)).then((res: any)=>{ luzhi(res.roomid) - url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}` + url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}$liveid=${res.liveid}` }) }