xbx #196

Manually merged
theluyuan merged 5 commits from xbx into master 2020-11-30 09:22:13 +00:00
Showing only changes of commit bde66631fc - Show all commits

View File

@ -191,15 +191,15 @@ function setBtnClickFuc() {
}
})
})
const jieshuh = new Promise((res)=>{
$.ajax({
url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid,
headers: { "Authorization": "Bearer " + localStorage.getItem("token")},
success(){
res(1)
}
})
})
// const jieshuh = new Promise((res)=>{
// $.ajax({
// url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid,
// headers: { "Authorization": "Bearer " + localStorage.getItem("token")},
// success(){
// res(1)
// }
// })
// })
Promise.allSettled([promise,jiekou,jieshu,jieshuh]).then(()=>{
window.parent.location.href="/regime/livedetail?id=" + window.liveid;
})