diff --git a/dist/js/common.js b/dist/js/common.js index 8ea80ef..b4c196a 100644 --- a/dist/js/common.js +++ b/dist/js/common.js @@ -169,14 +169,31 @@ function setBtnClickFuc() { }).catch(function(imError) { console.warn('dismissGroup error:', imError); // 解散群组失败的相关信息 }); - $.ajax({ - url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, - headers: "Bearer " + localStorage.getItem("token"), - success(){ - window.parent.location.href="/regime/livedetail?id=" + window.liveid; - } + const jiekou = new Promise((res)=>{ + $.ajax({ + url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, + headers: "Bearer " + localStorage.getItem("token"), + success(){ + res(1) + } + }) + }) + const jieshu = new Promise((res)=>{ + $.ajax({ + url: window.url + 'live?liveid=' + window.liveid, + headers: "Bearer " + localStorage.getItem("token"), + method:"POST", + data:{ + status: 2 + }, + success(){ + res(1) + } + }) + }) + Promise.allSettled([promise,jiekou,jieshu]).then(()=>{ + window.parent.location.href="/regime/livedetail?id=" + window.liveid; }) - } else{ diff --git a/public/js/common.js b/public/js/common.js index 8ea80ef..b4c196a 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -169,14 +169,31 @@ function setBtnClickFuc() { }).catch(function(imError) { console.warn('dismissGroup error:', imError); // 解散群组失败的相关信息 }); - $.ajax({ - url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, - headers: "Bearer " + localStorage.getItem("token"), - success(){ - window.parent.location.href="/regime/livedetail?id=" + window.liveid; - } + const jiekou = new Promise((res)=>{ + $.ajax({ + url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, + headers: "Bearer " + localStorage.getItem("token"), + success(){ + res(1) + } + }) + }) + const jieshu = new Promise((res)=>{ + $.ajax({ + url: window.url + 'live?liveid=' + window.liveid, + headers: "Bearer " + localStorage.getItem("token"), + method:"POST", + data:{ + status: 2 + }, + success(){ + res(1) + } + }) + }) + Promise.allSettled([promise,jiekou,jieshu]).then(()=>{ + window.parent.location.href="/regime/livedetail?id=" + window.liveid; }) - } else{