From 69b938fc29b7c8fdaddd66c72fec43fe358c4d12 Mon Sep 17 00:00:00 2001 From: unknown <1162963624@qq.com> Date: Mon, 30 Nov 2020 17:13:37 +0800 Subject: [PATCH] xiufu --- public/js/common.js | 22 +++++++++++----------- src/api/index.ts | 4 ++-- src/views/regime/Liveing.vue | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/public/js/common.js b/public/js/common.js index 8b9c255..42d4031 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -169,22 +169,22 @@ function setBtnClickFuc() { }).catch(function(imError) { console.warn('dismissGroup error:', imError); // 解散群组失败的相关信息 }); - const jiekou = new Promise((res)=>{ - $.ajax({ - url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, - headers: { "Authorization": "Bearer " + localStorage.getItem("token")}, - success(){ - res(1) - } - }) - }) + // const jiekou = new Promise((res)=>{ + // $.ajax({ + // url: window.url + 'StopMCUMixTranscode?roomid=' + window.roomid, + // headers: { "Authorization": "Bearer " + localStorage.getItem("token")}, + // success(){ + // res(1) + // } + // }) + // }) const jieshu = new Promise((res)=>{ $.ajax({ url: window.url + 'live/' + window.liveid, headers: { "Authorization": "Bearer " + localStorage.getItem("token")}, method:"PUT", data:{ - livestatus: 2 + status: 2 }, success(){ res(1) @@ -200,7 +200,7 @@ function setBtnClickFuc() { // } // }) // }) - Promise.allSettled([promise,jiekou,jieshu,jieshuh]).then(()=>{ + Promise.allSettled([promise,jieshu]).then(()=>{ window.parent.location.href="/regime/livedetail?id=" + window.liveid; }) diff --git a/src/api/index.ts b/src/api/index.ts index 84241b6..c1abdf8 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -1032,8 +1032,8 @@ export async function livestop(id: string, roomid: string) { }else{ message.error(res.msg) } - const luzhi = await get('StopMCUMixTranscode', {roomid}); - console.log(luzhi) + // const luzhi = await get('StopMCUMixTranscode', {roomid}); + // console.log(luzhi) } export async function luzhi(roomid: string){ const res = await get('StartMCUMixTranscode', {roomid}); diff --git a/src/views/regime/Liveing.vue b/src/views/regime/Liveing.vue index 8e7422f..1b6878d 100644 --- a/src/views/regime/Liveing.vue +++ b/src/views/regime/Liveing.vue @@ -17,7 +17,7 @@ export default defineComponent({ const url = ref() if(id && typeof id == 'string'){ getliveinfo(parseInt(id)).then((res: any)=>{ - luzhi(res.roomid) + // luzhi(res.roomid) url.value = `/zhibo.html?roomid=${res.roomid}&memberid=${res.memberid}&name=${escape(store.state.userinfo.name)}&liveid=${res.liveid}` })