Merge pull request 'xbx' (#174) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/174
This commit was merged in pull request #174.
This commit is contained in:
2020-11-30 13:47:18 +08:00
2 changed files with 14 additions and 4 deletions

9
dist/js/common.js vendored
View File

@@ -163,12 +163,17 @@ function setBtnClickFuc() {
leave();
$('#room-root').hide();
$('#login-root').show();
let promise = tim.dismissGroup(window.roomid);
promise.then(function(imResponse) { // 解散成功
console.log(imResponse.data.groupID); // 被解散的群组 ID
}).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/live";
window.parent.location.href="/regime/livedetail?id=" + window.liveid;
}
})

View File

@@ -163,12 +163,17 @@ function setBtnClickFuc() {
leave();
$('#room-root').hide();
$('#login-root').show();
let promise = tim.dismissGroup(window.roomid);
promise.then(function(imResponse) { // 解散成功
console.log(imResponse.data.groupID); // 被解散的群组 ID
}).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/live";
window.parent.location.href="/regime/livedetail?id=" + window.liveid;
}
})