Skip to content

X
xiaomai-cloud-class-web
Commit 96a8244a by zhangleyuan
Options

feat:处理没有数据时分页不用显示

parent d2356439
Showing with 61 additions and 37 deletions
src/modules/course-manage/DataList/CourseData.jsx
...@@ -226,6 +226,13 @@ class DataList extends React.Component { ...@@ -226,6 +226,13 @@ class DataList extends React.Component {
/> />
); );
}; };
onShowSizeChange = (current, size) => {
if (current == size) {
return;
}
this.setState({ size }, this.fetchUserData)
}
render() { render() {
const { const {
...@@ -325,16 +332,18 @@ class DataList extends React.Component { ...@@ -325,16 +332,18 @@ class DataList extends React.Component {
pagination={false} pagination={false}
style={{ margin: "16px 0" }} style={{ margin: "16px 0" }}
/> />
{ total > 0 &&
<PageControl <PageControl
size="small" size="small"
current={current - 1} current={current - 1}
pageSize={size} pageSize={size}
total={total} total={total}
toPage={(page) => { onShowSizeChange={this.onShowSizeChange}
this.fetchUserData(page + 1); toPage={(page) => {
}} this.fetchUserData(page + 1);
/> }}
/>
}
</div> </div>
</Spin> </Spin>
); );
......
src/modules/course-manage/components/AddLiveClass.jsx
...@@ -231,6 +231,10 @@ class AddLiveClass extends React.Component { ...@@ -231,6 +231,10 @@ class AddLiveClass extends React.Component {
onChange={(time) => { onChange={(time) => {
this.props.onChange('startTime', time); this.props.onChange('startTime', time);
}} }}
renderExtraFooter={()=>{
return null
}}
/>&nbsp;&nbsp;~&nbsp;&nbsp; />&nbsp;&nbsp;~&nbsp;&nbsp;
<TimePicker <TimePicker
format="HH:mm" format="HH:mm"
......
src/modules/course-manage/components/LiveCourseList.jsx
...@@ -176,15 +176,18 @@ class LiveCourseList extends React.Component { ...@@ -176,15 +176,18 @@ class LiveCourseList extends React.Component {
</div> </div>
<div> <div>
<span className="teacher">讲师：{record.teacherName}</span> <span className="teacher">讲师：{record.teacherName}</span>
<span className="split"> | </span>
<span className="assistant">助教： { record.admins.length >0 &&
{ record.admins.map((item,index)=>{ <>
return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span> <span className="split"> | </span>
}) <span className="assistant">助教：
{ record.admins.map((item,index)=>{
return <span>{item.adminName} { (index < record.admins.length-1)&&(<span> 、</span>)} </span>
})
}
</span>
</>
} }
</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -365,7 +368,7 @@ class LiveCourseList extends React.Component { ...@@ -365,7 +368,7 @@ class LiveCourseList extends React.Component {
this.props.onChange(this.props.query); this.props.onChange(this.props.query);
} }
//进入直播间 //进入直播间
handleEnterLiveRoom = (item) => { handleEnterLiveRoom = (item) => {
if (item.startTime - Date.now() > 1800000) { if (item.startTime - Date.now() > 1800000) {
Modal.warning({ Modal.warning({
title: "你来得太早了", title: "你来得太早了",
...@@ -402,7 +405,14 @@ class LiveCourseList extends React.Component { ...@@ -402,7 +405,14 @@ class LiveCourseList extends React.Component {
// }); // });
} }
} }
onShowSizeChange = (current, size) => {
if (current == size) {
return
}
let _query = this.props.query
_query.size = size;
this.props.onChange(_query)
}
render() { render() {
const { total, query, courseList, loading} = this.props; const { total, query, courseList, loading} = this.props;
...@@ -425,18 +435,20 @@ class LiveCourseList extends React.Component { ...@@ -425,18 +435,20 @@ class LiveCourseList extends React.Component {
dataSource={courseList} dataSource={courseList}
rowKey={(row) => row.liveCourseId} rowKey={(row) => row.liveCourseId}
/> />
{ total>0 &&
<div className="box-footer"> <div className="box-footer">
<PageControl <PageControl
current={current - 1} current={current - 1}
pageSize={size} pageSize={size}
total={parseInt(total)} total={parseInt(total)}
toPage={(page) => { toPage={(page) => {
const _query = {...query, current: page + 1}; const _query = {...query, current: page + 1};
this.props.onChange(_query) this.props.onChange(_query)
}} }}
/> onShowSizeChange={this.onShowSizeChange}
</div> />
</div>
}
{ this.state.shareLiveModal } { this.state.shareLiveModal }
{openCoursewareModal && ( {openCoursewareModal && (
<ManageCoursewareModal <ManageCoursewareModal
......
src/modules/course-manage/modal/PreviewCourseModal.jsx
/* /*
* @Author: 吴文洁 * @Author: 吴文洁
* @Date: 2020-07-23 14:54:16 * @Date: 2020-07-23 14:54:16
* @LastEditors: wufan * @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-22 20:31:31 * @LastEditTime: 2020-12-23 09:57:25
* @Description: 大班直播课预览弹窗 * @Description: 大班直播课预览弹窗
* @Copyright: 杭州杰竞科技有限公司 版权所有 * @Copyright: 杭州杰竞科技有限公司 版权所有
*/ */
import React from 'react'; import React from 'react';
import { Modal } from 'antd'; import { Modal } from 'antd';
import moment from 'moment';
import './PreviewCourseModal.less'; import './PreviewCourseModal.less';
class PreviewCourseModal extends React.Component { class PreviewCourseModal extends React.Component {
...@@ -50,7 +50,7 @@ class PreviewCourseModal extends React.Component { ...@@ -50,7 +50,7 @@ class PreviewCourseModal extends React.Component {
render() { render() {
const { courseBasinInfo, courseClassInfo = {}, courseIntroInfo, type } = this.props; const { courseBasinInfo, courseClassInfo = {}, courseIntroInfo, type } = this.props;
const { coverUrl, courseName, scheduleVideoUrl } = courseBasinInfo; const { coverUrl, courseName, scheduleVideoUrl } = courseBasinInfo;
const { liveDate, timeHorizonStart, timeHorizonEnd, nickname } = courseClassInfo; const { liveDate, timeHorizonStart, timeHorizonEnd, teacherName } = courseClassInfo;
const { liveCourseMediaRequests } = courseIntroInfo; const { liveCourseMediaRequests } = courseIntroInfo;
let liveDateStr, startTimeStr, endTimeStr; let liveDateStr, startTimeStr, endTimeStr;
...@@ -123,7 +123,7 @@ class PreviewCourseModal extends React.Component { ...@@ -123,7 +123,7 @@ class PreviewCourseModal extends React.Component {
</div> </div>
<div className="container__body__teacher"> <div className="container__body__teacher">
<span className="teacher__label">上课老师：</span> <span className="teacher__label">上课老师：</span>
<span className="teacher__value">{nickname}</span> <span className="teacher__value">{teacherName}</span>
</div> </div>
</div> </div>
} }
......
src/modules/store-manage/CourseCatalogPage.tsx
...@@ -203,7 +203,6 @@ function CourseCatalogPage() { ...@@ -203,7 +203,6 @@ function CourseCatalogPage() {
toPage={(page: any) => { toPage={(page: any) => {
const queryStates = _.clone(query); const queryStates = _.clone(query);
queryStates.current = page; queryStates.current = page;
console.log("queryStates",queryStates);
setQuery(queryStates); setQuery(queryStates);
}} }}
/> />
......
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