Skip to content

X
xiaomai-cloud-class-web
Commit 0acddad6 by guomingpang
Options

feat:外部课程相关模块提交

parent fc15d202
Showing with 22 additions and 67 deletions
src/modules/course-manage/video-course/components/VideoCourseList.jsx
<<<<<<< HEAD
=======
/*
* @Author: 吴文洁
* @Date: 2020-08-05 10:12:45
* @LastEditors: fusanqiasng
* @LastEditTime: 2021-05-28 13:32:59
* @Description: 视频课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
>>>>>>> 4399d60 (fix:修复外部课程相关模块bug)
import React from 'react' import React from 'react'
import { Table, Modal, message, Tooltip, Switch, Dropdown } from 'antd' import { Table, Modal, message, Tooltip, Switch, Dropdown } from 'antd'
import _ from 'underscore' import _ from 'underscore'
...@@ -35,14 +24,6 @@ class VideoCourseList extends React.Component { ...@@ -35,14 +24,6 @@ class VideoCourseList extends React.Component {
// dataSource: [], // dataSource: [],
} }
} }
// static getDerivedStateFromProps(props, state) {
// const { dataSource: propsDataSource } = props,{dataSource:stateDataSource} =state
// const istrue = _.isEqual(propsDataSource, stateDataSource)
// if (!istrue) {
// state.dataSource = propsDataSource
// }
// console.log(istrue, 'istrue')
// }
componentDidMount() { componentDidMount() {
const videoCourseItem = localStorage.getItem('videoCourseItem') const videoCourseItem = localStorage.getItem('videoCourseItem')
...@@ -177,12 +158,7 @@ class VideoCourseList extends React.Component { ...@@ -177,12 +158,7 @@ class VideoCourseList extends React.Component {
width: 120, width: 120,
key: 'shelfState', key: 'shelfState',
dataIndex: 'shelfState', dataIndex: 'shelfState',
// shouldCellUpdate: (record, prevRecord) => {
// // console.log(record.shelfState, prevRecord.shelfState)
// return true
// },
render: (val, item, index) => { render: (val, item, index) => {
console.log(val, item.shelfState === 'YES', 'aaa')
return ( return (
<Switch <Switch
loading={ShelfLoading} loading={ShelfLoading}
...@@ -191,13 +167,8 @@ class VideoCourseList extends React.Component { ...@@ -191,13 +167,8 @@ class VideoCourseList extends React.Component {
checked={item.shelfState === 'YES'} checked={item.shelfState === 'YES'}
defaultChecked={item.shelfState} defaultChecked={item.shelfState}
onClick={(checked) => { onClick={(checked) => {
console.log('checked', checked)
this.changeShelfState(checked, item, index) this.changeShelfState(checked, item, index)
}} }}
// onChange={() => {
// return false
// this.changeShelfState(item)
// }}
/> />
) )
}, },
......
src/modules/knowledge-base/modal/AddCourse.jsx
...@@ -4,10 +4,14 @@ ...@@ -4,10 +4,14 @@
* @Date: 2021-03-13 09:54:26 * @Date: 2021-03-13 09:54:26
* @LastEditors: fusanqiasng * @LastEditors: fusanqiasng
<<<<<<< HEAD <<<<<<< HEAD
* @LastEditTime: 2021-05-28 13:18:39 <<<<<<< HEAD
* @LastEditTime: 2021-05-28 13:44:46
======= =======
* @LastEditTime: 2021-05-25 21:48:22 * @LastEditTime: 2021-05-25 21:48:22
>>>>>>> beb2d0f (featru:外部课程冒烟测试bug修复) >>>>>>> beb2d0f (featru:外部课程冒烟测试bug修复)
=======
* @LastEditTime: 2021-05-27 19:08:41
>>>>>>> 9b82e1b (fix:修复外部课程相关模块bug)
* @Copyright: © 2020 杭州杰竞科技有限公司 版权所有 * @Copyright: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -29,7 +33,7 @@ const courseStateShow = { ...@@ -29,7 +33,7 @@ const courseStateShow = {
UN_START: { UN_START: {
code: 1, code: 1,
title: '待开课', title: '待开课',
color: '#FFB714', color: '#2966FF',
}, },
STARTING: { STARTING: {
code: 2, code: 2,
...@@ -389,6 +393,7 @@ class AddCourse extends React.Component { ...@@ -389,6 +393,7 @@ class AddCourse extends React.Component {
} }
videoColumns = () => { videoColumns = () => {
const { videoCourseDivision } = this.state
const columns = [ const columns = [
{ {
title: ( title: (
...@@ -639,6 +644,15 @@ class AddCourse extends React.Component { ...@@ -639,6 +644,15 @@ class AddCourse extends React.Component {
createId: User.getStoreUserId(), createId: User.getStoreUserId(),
}) })
} }
if (selectVideo.internal.length) {
batchAddList.push({
categoryId: this.props.categoryId,
refIds: _.pluck(selectVideo.internal, 'id'),
storeId: User.getStoreId(),
type: 'VOICE',
createId: User.getStoreUserId(),
})
}
if (selectLive.length) { if (selectLive.length) {
batchAddList.push({ batchAddList.push({
categoryId: this.props.categoryId, categoryId: this.props.categoryId,
...@@ -758,7 +772,6 @@ class AddCourse extends React.Component { ...@@ -758,7 +772,6 @@ class AddCourse extends React.Component {
selectedRowKeys: _.pluck(selectPicture, 'id'), selectedRowKeys: _.pluck(selectPicture, 'id'),
onSelect: this.selectPictureList, onSelect: this.selectPictureList,
onSelectAll: (selected, _selectedRows, changeRows) => { onSelectAll: (selected, _selectedRows, changeRows) => {
console.log(changeRows)
let _list = [] let _list = []
if (selected) { if (selected) {
_list = _.uniq(selectPicture.concat(changeRows), false, (item) => item.id) _list = _.uniq(selectPicture.concat(changeRows), false, (item) => item.id)
...@@ -849,6 +862,8 @@ class AddCourse extends React.Component { ...@@ -849,6 +862,8 @@ class AddCourse extends React.Component {
...videoQuery, ...videoQuery,
[videoCourseDivision]: _query, [videoCourseDivision]: _query,
}, },
liveQuery: _query,
}, },
() => { () => {
this.handleFetchVideoList() this.handleFetchVideoList()
...@@ -926,6 +941,10 @@ class AddCourse extends React.Component { ...@@ -926,6 +941,10 @@ class AddCourse extends React.Component {
this.setState( this.setState(
{ {
liveQuery: _query, liveQuery: _query,
videoQuery: {
...videoQuery,
[videoCourseDivision]: _query,
},
}, },
() => { () => {
this.handleFetchLiveList() this.handleFetchLiveList()
......
src/modules/root/WechatLogin.less
...@@ -39,42 +39,7 @@ ...@@ -39,42 +39,7 @@
color: rgba(82, 137, 250, 1); color: rgba(82, 137, 250, 1);
} }
} }
<<<<<<< HEAD
.rwm{
position: relative;
width: 160px;
height: 160px;
text-align: center;
display: inline-block;
margin-top: 24px;
.error{
position: absolute;
width: 170px;
height: 170px;
background: rgba(255, 255, 255, 0.95);
display: flex;
align-items:center;
justify-content:center;
left:-5px;
top:-5px;
div{
margin: 0 10px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #333333;
line-height: 20px;
}
.ope{
cursor: pointer;
color:rgba(82, 137, 250, 1);
}
}
}
=======
} }
>>>>>>> 4ed93ca (feat:新增视频课外部视频模块相关功能,准备开始冒烟测试)
.ant-tabs-tab-active { .ant-tabs-tab-active {
.ant-tabs-tab-btn { .ant-tabs-tab-btn {
......
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