Skip to content

X
xiaomai-cloud-class-web
Commit 0997c860 by maolipeng
Options

feat:企微直播。。。。

parent 61a5d6d2
Showing with 50 additions and 11 deletions
src/common/js/wechatApi.js
...@@ -155,4 +155,21 @@ export default class WechatApi { ...@@ -155,4 +155,21 @@ export default class WechatApi {
}); });
}); });
} }
//进入直播间
static enterLiveRoom(id) {
return new Promise((resolve, reject) => {
wx.ready(() => {
wx.invoke('startLiving', {
"livingId": id,
}, function(res) {
if (res.err_msg === "startLiving:ok") {
resolve(true)
} else {
reject(res.err_msg); //错误处理
}
});
});
})
}
} }
src/modules/course-manage/components/CreateWorkWXCourse.jsx
...@@ -400,8 +400,8 @@ function CreateWorkWXCourse() { ...@@ -400,8 +400,8 @@ function CreateWorkWXCourse() {
const previewLiveCourseModal = ( const previewLiveCourseModal = (
<PreviewCourseModal <PreviewCourseModal
courseBasicInfo={basicInfo} courseBasicInfo={basicInfo}
courseClassInfo={addLiveClassInfo} courseClassInfo={{...classInfo,endTime}}
courseIntroInfo={addLiveIntroInfo} courseIntroInfo={{introduce:introduce,categoryName:basicInfo.courseName}}
type={type} type={type}
courseState={courseState} courseState={courseState}
close={() => { close={() => {
......
src/modules/course-manage/components/LiveCourseList.jsx
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
*/ */
import User from '@/common/js/user'; import User from '@/common/js/user';
import WechatApi from '@/common/js/wechatApi';
import college from '@/common/lottie/college'; import college from '@/common/lottie/college';
import { PageControl, XMTable } from '@/components'; import { PageControl, XMTable } from '@/components';
import DownloadLiveModal from '@/components/DownloadLiveModal'; import DownloadLiveModal from '@/components/DownloadLiveModal';
import { isWorkWx } from '@/core/platform';
import BaseService from '@/domains/basic-domain/baseService'; import BaseService from '@/domains/basic-domain/baseService';
import { LIVE_SHARE } from '@/domains/course-domain/constants'; import { LIVE_SHARE } from '@/domains/course-domain/constants';
import CourseService from '@/domains/course-domain/CourseService'; import CourseService from '@/domains/course-domain/CourseService';
...@@ -734,6 +736,22 @@ class LiveCourseList extends React.Component { ...@@ -734,6 +736,22 @@ class LiveCourseList extends React.Component {
), ),
}); });
} else { } else {
if (item.thirdPartType === "WECHAT") {
//进入企微直播间
if (!isWorkWx()) {
Modal.warning({
title: '提示',
content: "请使用企业微信进入直播间"
})
return
}
WechatApi.enterLiveRoom(item.livingId).then((res)=> {
console.log(res)
}).catch((err)=> {
console.log(err)
})
return
}
CourseService.getLiveCloudCourseDetail({ CourseService.getLiveCloudCourseDetail({
liveCourseId: item.liveCourseId, liveCourseId: item.liveCourseId,
}).then((res) => { }).then((res) => {
......
src/modules/course-manage/components/LiveModeSelect.less
...@@ -47,17 +47,14 @@ ...@@ -47,17 +47,14 @@
box-shadow: 0px 2px 8px 3px rgba(41, 102, 255, 0.1); box-shadow: 0px 2px 8px 3px rgba(41, 102, 255, 0.1);
border-radius: 5px; border-radius: 5px;
text-align: center; text-align: center;
background-size: contain;
background-repeat: no-repeat;
.logo { .logo {
width: 80px; width: 80px;
height: 80px; height: 80px;
margin: 31px auto 0 auto; margin: 31px auto 0 auto;
} }
.xiaomai-logo {
background-image: url("https://image.xiaomaiketang.com/xm/ZxaYpAy8kB.png");
}
.qiwei-logo {
background-image: url("https://image.xiaomaiketang.com/xm/7Sjm26wAt8.png");
}
.item-title { .item-title {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
...@@ -83,6 +80,12 @@ ...@@ -83,6 +80,12 @@
cursor: pointer; cursor: pointer;
} }
} }
.xiaomai-logo {
background-image: url("https://image.xiaomaiketang.com/xm/rjwN8Yc7xa.png");
}
.qiwei-logo {
background-image: url("https://image.xiaomaiketang.com/xm/CzdyntSxha.png");
}
} }
} }
} }
......
src/modules/course-manage/components/LiveModeSelect.tsx
...@@ -30,13 +30,13 @@ export default function LiveModeSelect(props: LiveModeSelectProps) { ...@@ -30,13 +30,13 @@ export default function LiveModeSelect(props: LiveModeSelectProps) {
<span className="icon iconfont close" onClick={handleClose}>&#xe6ef;</span> <span className="icon iconfont close" onClick={handleClose}>&#xe6ef;</span>
</div> </div>
<div className="content"> <div className="content">
<div className="item"> <div className="item xiaomai-logo">
<div className="logo xiaomai-logo"></div> <div className="logo"></div>
<div className="item-title">小麦直播</div> <div className="item-title">小麦直播</div>
<div className="des">通过小麦企学院“PC客户<br/>端”进行直播</div> <div className="des">通过小麦企学院“PC客户<br/>端”进行直播</div>
<div className="button" onClick={handleSelect0}>立即创建</div> <div className="button" onClick={handleSelect0}>立即创建</div>
</div> </div>
<div className="item"> <div className="item qiwei-logo">
<div className="logo qiwei-logo"></div> <div className="logo qiwei-logo"></div>
<div className="item-title">企微直播</div> <div className="item-title">企微直播</div>
<div className="des">通过“企业微信APP”进行<br/>直播进行直播</div> <div className="des">通过“企业微信APP”进行<br/>直播进行直播</div>
......
src/modules/course-manage/modal/PreviewCourseModal.jsx
...@@ -48,6 +48,7 @@ class PreviewCourseModal extends React.Component { ...@@ -48,6 +48,7 @@ class PreviewCourseModal extends React.Component {
return hours + ":" + mins + ":" + seconds; return hours + ":" + mins + ":" + seconds;
}; };
dealWithTime = (startTime, endTime) => { dealWithTime = (startTime, endTime) => {
debugger
const startDate = new Date(Number(startTime)); const startDate = new Date(Number(startTime));
const endDate = new Date(Number(endTime)); const endDate = new Date(Number(endTime));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment