提交 8403ed78 编写于 作者: yafei.li's avatar yafei.li

Merge branch 'feat/yf' into 'develop'

Feat/yf

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!111
...@@ -23,6 +23,7 @@ export const envConfig = { ...@@ -23,6 +23,7 @@ export const envConfig = {
}, },
dev: { dev: {
baseUrl: 'https://dev-sc.yunqueyi.com', baseUrl: 'https://dev-sc.yunqueyi.com',
// baseUrl: 'https://test1-sc.yunqueyi.com',
qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1", qiniuFileUrl: "https://dev-sc.yunqueyi.com/contents/admin/qiniu/token1",
qiniuResourceUrl: "https://test1-videos.yunqueyi.com", qiniuResourceUrl: "https://test1-videos.yunqueyi.com",
qiniuImgUrl: "https://test1-file.yunqueyi.com", qiniuImgUrl: "https://test1-file.yunqueyi.com",
......
...@@ -186,15 +186,18 @@ export default { ...@@ -186,15 +186,18 @@ export default {
setItem(data, item) { setItem(data, item) {
item.timeleft = 0; item.timeleft = 0;
}, },
// 主动呼叫 // 主动呼叫
drivingCall(data) { drivingCall(data) {
console.log("data-----------",data)
// /team/call/direct/{imAccId}呼叫 // /team/call/direct/{imAccId}呼叫
let url = `/im/team/call/direct/`; let url = `/im/team/call/direct/`;
let params = { let params = {
imAccId: data.accId, imAccId: data.accId,
imTeamId: data.imTeamId, imTeamId: this.tid,
liveRoomId: this.roomId liveRoomId: this.roomId
}; };
console.log("-----------",params)
this.POST(url, params).then((res) => { this.POST(url, params).then((res) => {
if (res.code === "000000") { if (res.code === "000000") {
// this.tid = this.$route.query.tid || ""; // this.tid = this.$route.query.tid || "";
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册