Merge pull request 'luzhi' (#195) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/195
This commit is contained in:
luyuan 2020-11-30 16:31:32 +08:00
commit 11d06e1114
2 changed files with 20 additions and 2 deletions

11
dist/js/common.js vendored
View File

@ -191,7 +191,16 @@ function setBtnClickFuc() {
}
})
})
Promise.allSettled([promise,jiekou,jieshu]).then(()=>{
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;
})

View File

@ -191,7 +191,16 @@ function setBtnClickFuc() {
}
})
})
Promise.allSettled([promise,jiekou,jieshu]).then(()=>{
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;
})