diff --git a/dist/js/common.js b/dist/js/common.js index f2c5cd0..2ae8f5a 100644 --- a/dist/js/common.js +++ b/dist/js/common.js @@ -165,7 +165,7 @@ function setBtnClickFuc() { $('#login-root').show(); $.ajax({ url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, - headers: "Bearer " + localStorage.getItem("token"), + headers: { "Authorization": "Bearer " + localStorage.getItem("token")}, success(){ window.parent.location.href="/regime/live"; } diff --git a/public/js/common.js b/public/js/common.js index fef8525..adf5d88 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -163,24 +163,12 @@ function setBtnClickFuc() { leave(); $('#room-root').hide(); $('#login-root').show(); + $.ajax({ - url: window.url + 'onExitRoom?roomid=' + window.roomid, + url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, headers: "Bearer " + localStorage.getItem("token"), - method:"POST", - data:{ - type:1, - memberid:window.mid, - liveid:wiondow.liveid, - length:window.mytime - }, success(){ - $.ajax({ - url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, - headers: "Bearer " + localStorage.getItem("token"), - success(){ - window.parent.location.href="/regime/live"; - } - }) + window.parent.location.href="/regime/live"; } }) diff --git a/public/zhibo.html b/public/zhibo.html index ad3fca8..d623df0 100644 --- a/public/zhibo.html +++ b/public/zhibo.html @@ -411,7 +411,7 @@ const urldata = GetRequest('roomid') window.roomid = urldata.roomid window.mid = urldata.memberid - window.lvieid = urldata.liveid + window.liveid = urldata.liveid window.uname = urldata.name @@ -438,10 +438,23 @@ diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index 58d3256..d6977ec 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -275,7 +275,7 @@ export default defineComponent({ } if(index == 2){ - window.location.href="https://api.weibo.com/oauth2/authorize?client_id=2754574056&response_type=code&redirect_uri=https://beelink.theluyuan.com/" + window.location.href="https://api.weibo.com/oauth2/authorize?client_id=2754574056&response_type=code&redirect_uri=https://beelink.theluyuan.com/wblogin" } } diff --git a/src/views/regime/Liveing.vue b/src/views/regime/Liveing.vue index 9c126cf..8e7422f 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)}$liveid=${res.liveid}` + url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}` }) }