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

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

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/174
This commit is contained in:
luyuan 2020-11-30 13:47:18 +08:00
commit c8160a09d8
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/js/common.js vendored
View File

@ -163,12 +163,17 @@ function setBtnClickFuc() {
leave(); leave();
$('#room-root').hide(); $('#room-root').hide();
$('#login-root').show(); $('#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({ $.ajax({
url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid,
headers: "Bearer " + localStorage.getItem("token"), headers: "Bearer " + localStorage.getItem("token"),
success(){ success(){
window.parent.location.href="/regime/live"; window.parent.location.href="/regime/livedetail?id=" + window.liveid;
} }
}) })

9
public/js/common.js
View File

@ -163,12 +163,17 @@ function setBtnClickFuc() {
leave(); leave();
$('#room-root').hide(); $('#room-root').hide();
$('#login-root').show(); $('#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({ $.ajax({
url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid,
headers: "Bearer " + localStorage.getItem("token"), headers: "Bearer " + localStorage.getItem("token"),
success(){ success(){
window.parent.location.href="/regime/live"; window.parent.location.href="/regime/livedetail?id=" + window.liveid;
} }
}) })