Skip to content

X
xiaomai-cloud-class-web
Commit 85fb7ad6 by chenshu
Options

fix:修复

parent 37661672
Showing with 19 additions and 19 deletions
src/core/function.js
...@@ -960,9 +960,7 @@ window.copyText = textContent => { ...@@ -960,9 +960,7 @@ window.copyText = textContent => {
window.downloadFile = (dataURL, fileName) => { window.downloadFile = (dataURL, fileName) => {
const blob = window.convertBase64ToBlob(dataURL) const blob = window.convertBase64ToBlob(dataURL)
const href = window.getObjectURL(blob) window.download(blob, fileName, 'image/png');
window.download(href, fileName, 'image/png');
} }
window.getCouponRule = record => { window.getCouponRule = record => {
......
src/modules/course-manage/modal/ShareLiveModal.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-07-20 19:12:49 * @Date: 2020-07-20 19:12:49
* @Last Modified by: chenshu * @Last Modified by: chenshu
* @Last Modified time: 2021-05-11 12:00:05 * @Last Modified time: 2021-05-25 16:11:25
* @Description: 大班直播分享弹窗 * @Description: 大班直播分享弹窗
*/ */
...@@ -105,7 +105,8 @@ class ShareLiveModal extends React.Component { ...@@ -105,7 +105,8 @@ class ShareLiveModal extends React.Component {
showImg:true, showImg:true,
time:new Date().valueOf() time:new Date().valueOf()
},()=>{ },()=>{
this.setState({time:new Date().valueOf()},()=>{ this.setState({ time: new Date().valueOf() }, () => {
setTimeout(() => {
let node = document.getElementById('poster'); let node = document.getElementById('poster');
domtoimage.toPng(node) domtoimage.toPng(node)
.then((imgData) => { .then((imgData) => {
...@@ -115,6 +116,7 @@ class ShareLiveModal extends React.Component { ...@@ -115,6 +116,7 @@ class ShareLiveModal extends React.Component {
$(download).attr('href', imgData).attr('download', `${courseName}.png`).get(0).click(); $(download).attr('href', imgData).attr('download', `${courseName}.png`).get(0).click();
// this.props.close() // this.props.close()
}) })
}, 1000)
}) })
}) })
...@@ -203,7 +205,7 @@ class ShareLiveModal extends React.Component { ...@@ -203,7 +205,7 @@ class ShareLiveModal extends React.Component {
<div className="sub-title">学员可通过微信识别二维码，报名观看{title}</div> <div className="sub-title">学员可通过微信识别二维码，报名观看{title}</div>
} }
<div className="content" onClick={this.handleDownloadPoster}>下载海报</div> <div className="content" onClick={_.debounce(this.handleDownloadPoster, 1000, true)}>下载海报</div>
</div> </div>
<div className="share-url right__item"> <div className="share-url right__item">
......
src/modules/course-manage/offline-course/AddOfflineCourse.jsx
...@@ -912,8 +912,8 @@ class AddOfflineCourse extends React.Component { ...@@ -912,8 +912,8 @@ class AddOfflineCourse extends React.Component {
</div> </div>
<div> <div>
<div className="desc"> <div className="desc">
<div>开启：允许未绑定手机号的用户观看</div> <div>开启：允许未绑定手机号的学员观看</div>
<div>关闭：仅限绑定了手机号的用户可以进入观看线下课</div> <div>关闭：仅限绑定了手机号的学员可以进入观看线下课</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -994,7 +994,7 @@ class AddOfflineCourse extends React.Component { ...@@ -994,7 +994,7 @@ class AddOfflineCourse extends React.Component {
/> />
</div> </div>
<div className="course-catalog"> <div className="course-catalog">
<span className="label"><span className="require">* </span>用户上课方式：</span> <span className="label"><span className="require">* </span>学员上课方式：</span>
<Radio.Group <Radio.Group
style={{ display: 'inline-block' }} style={{ display: 'inline-block' }}
value={offlineCourseType} value={offlineCourseType}
......
src/modules/course-manage/offline-course/OfflineCourseData.jsx
...@@ -92,7 +92,7 @@ export default class OfflineCourseData extends React.Component { ...@@ -92,7 +92,7 @@ export default class OfflineCourseData extends React.Component {
const { whetherSetSignIn, whetherSetSignOut, whetherSetApply } = this.state; const { whetherSetSignIn, whetherSetSignOut, whetherSetApply } = this.state;
const columns = [ const columns = [
{ {
title: '用户姓名', title: '学员姓名',
key: 'name', key: 'name',
dataIndex: 'name', dataIndex: 'name',
render: (val, record) => { render: (val, record) => {
...@@ -200,7 +200,7 @@ export default class OfflineCourseData extends React.Component { ...@@ -200,7 +200,7 @@ export default class OfflineCourseData extends React.Component {
<div className="offline-name">课程名称：{courseName}</div> <div className="offline-name">课程名称：{courseName}</div>
{whetherSetApply === 'YES' && <div className="offline-application">报名总人数：{totalJoin}</div>} {whetherSetApply === 'YES' && <div className="offline-application">报名总人数：{totalJoin}</div>}
{whetherSetSignInOut === 'YES' && <div className="offline-application"> {whetherSetSignInOut === 'YES' && <div className="offline-application">
完成考勤总人数<Tooltip title="根据上课日期，在规定时间内完成签到和签退的用户数"><span className="icon iconfont">&#xe7c4;</span></Tooltip>：{fullJoin} 完成考勤总人数<Tooltip title="根据上课日期，在规定时间内完成签到和签退的学员数"><span className="icon iconfont">&#xe7c4;</span></Tooltip>：{fullJoin}
</div>} </div>}
</div> </div>
<div className="box data-box"> <div className="box data-box">
...@@ -255,7 +255,7 @@ export default class OfflineCourseData extends React.Component { ...@@ -255,7 +255,7 @@ export default class OfflineCourseData extends React.Component {
{offlineCourseType !== 'ALL_DAY_OFFLINE' && whetherSetApply === 'YES' && <span className="icon iconfont">&#xe89f;</span>} {offlineCourseType !== 'ALL_DAY_OFFLINE' && whetherSetApply === 'YES' && <span className="icon iconfont">&#xe89f;</span>}
{offlineCourseType !== 'ALL_DAY_OFFLINE' && whetherSetApply === 'YES' && <span className="data-text">报名人数：{joinNum}</span>} {offlineCourseType !== 'ALL_DAY_OFFLINE' && whetherSetApply === 'YES' && <span className="data-text">报名人数：{joinNum}</span>}
{whetherSetSignInOut === 'YES' && <span className="icon iconfont">&#xe89e;</span>} {whetherSetSignInOut === 'YES' && <span className="icon iconfont">&#xe89e;</span>}
{whetherSetSignInOut === 'YES' && <span className="data-text">完成考勤数<Tooltip title="当日在规定时间内完成签到和签退的用户数"><span className="icon iconfont">&#xe7c4;</span></Tooltip>：{fullJoinNum}</span>} {whetherSetSignInOut === 'YES' && <span className="data-text">完成考勤数<Tooltip title="当日在规定时间内完成签到和签退的学员数"><span className="icon iconfont">&#xe7c4;</span></Tooltip>：{fullJoinNum}</span>}
{whetherSetSignIn === 'YES' && <span className="icon iconfont">&#xe8a0;</span>} {whetherSetSignIn === 'YES' && <span className="icon iconfont">&#xe8a0;</span>}
{whetherSetSignIn === 'YES' && <span className="data-text">签到人数：{joinInNum}</span>} {whetherSetSignIn === 'YES' && <span className="data-text">签到人数：{joinInNum}</span>}
{whetherSetSignOut === 'YES' && <span className="icon iconfont">&#xe89d;</span>} {whetherSetSignOut === 'YES' && <span className="icon iconfont">&#xe89d;</span>}
...@@ -264,7 +264,7 @@ export default class OfflineCourseData extends React.Component { ...@@ -264,7 +264,7 @@ export default class OfflineCourseData extends React.Component {
<div className="detail-filter"> <div className="detail-filter">
<Search <Search
className="search-input" className="search-input"
placeholder="搜索用户姓名/手机号" placeholder="搜索学员姓名/手机号"
style={{ width: 200, marginRight: 24 }} style={{ width: 200, marginRight: 24 }}
enterButton={<span className="icon iconfont">&#xe832;</span>} enterButton={<span className="icon iconfont">&#xe832;</span>}
onSearch={(value) => { onSearch={(value) => {
......
src/modules/course-manage/offline-course/components/AddGraphicsIntro.jsx
...@@ -118,8 +118,8 @@ class AddGraphicsIntro extends React.Component { ...@@ -118,8 +118,8 @@ class AddGraphicsIntro extends React.Component {
</div> </div>
<div> <div>
<div className="desc"> <div className="desc">
<div>开启：允许未绑定手机号的用户观看</div> <div>开启：允许未绑定手机号的学员观看</div>
<div>关闭：仅限绑定了手机号的用户可以进入观看图文课</div> <div>关闭：仅限绑定了手机号的学员可以进入观看图文课</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -133,8 +133,8 @@ class AddGraphicsIntro extends React.Component { ...@@ -133,8 +133,8 @@ class AddGraphicsIntro extends React.Component {
</Col> </Col>
<Col span={21}> <Col span={21}>
<div className="desc"> <div className="desc">
<div>开启：图文课将在用户学院图文课列表中展示</div> <div>开启：图文课将在学员学院图文课列表中展示</div>
<div>关闭：图文课将在用户学院图文课列表中隐藏</div> <div>关闭：图文课将在学员学院图文课列表中隐藏</div>
</div> </div>
</Col> </Col>
</Row> </Row>
......
src/modules/course-manage/offline-course/components/OfflineCourseList.jsx
...@@ -123,7 +123,7 @@ class OfflineCourseList extends React.Component { ...@@ -123,7 +123,7 @@ class OfflineCourseList extends React.Component {
{ {
title: <span> title: <span>
<span>学院展示</span> <span>学院展示</span>
<Tooltip title={<div>开启后，学员可在学院内查看到此课程。若课程“取消”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但用户仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip> <Tooltip title={<div>开启后，学员可在学院内查看到此课程。若课程“取消”，则系统会自动“关闭”学院展示。<br/>关闭后，学院内不再展示此课程，但学员仍可通过分享的海报/链接查看此课程。</div>}><i className="icon iconfont" style={{ marginLeft: '5px',cursor:'pointer',color:'#bfbfbf',fontSize:'14px'}}>&#xe61d;</i></Tooltip>
</span>, </span>,
width: 120, width: 120,
dataIndex: "courseware", dataIndex: "courseware",
...@@ -302,7 +302,7 @@ class OfflineCourseList extends React.Component { ...@@ -302,7 +302,7 @@ class OfflineCourseList extends React.Component {
if (isDelete) { if (isDelete) {
Modal.confirm({ Modal.confirm({
title: '删除课程', title: '删除课程',
content: '确定删除该课程吗？删除后用户数据和课程数据将无法恢复。', content: '确定删除该课程吗？删除后学员数据和课程数据将无法恢复。',
icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>, icon: <span className="icon iconfont default-confirm-icon">&#xe6f4;</span>,
okText: '确定', okText: '确定',
okType: 'danger', okType: 'danger',
......
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