theluyuan/beelink
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbx #196

Manually merged
theluyuan merged 5 commits from xbx into master 2020-11-30 09:22:13 +00:00
Conversation 0 Commits 5 Files Changed 69 +9 -9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bde66631fc - Show all commits

18
public/js/common.js
View File

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