|
@@ -38,7 +38,17 @@ const dataHistoryColumns = [
|
|
|
];
|
|
|
|
|
|
const textbookHistoryColumns = [
|
|
|
- { title: '更新时间', key: 'createTime', width: 120 },
|
|
|
+ {
|
|
|
+ title: '更新时间',
|
|
|
+ key: 'createTime',
|
|
|
+ width: 120,
|
|
|
+ render: (text) => {
|
|
|
+ return <div className="sub">
|
|
|
+ <div className="t-2 t-s-12">{text.split(' ')[0]}</div>
|
|
|
+ <div className="t-6 t-s-12">{text.split(' ')[1]}</div>
|
|
|
+ </div>;
|
|
|
+ },
|
|
|
+ },
|
|
|
{ title: '版本', key: 'version', width: 120 },
|
|
|
{ title: '更新内容', key: 'content', width: 330 },
|
|
|
];
|
|
@@ -102,7 +112,7 @@ export default class extends Page {
|
|
|
result.day = parseInt((new Date().getTime() - new Date(result.latest.startDate).getTime()) / 86400000, 10);
|
|
|
|
|
|
result.expireDay =
|
|
|
- result.expireTime && parseInt((new Date().getTime() - new Date(result.expireTime).getTime()) / 86400000, 10);
|
|
|
+ result.expireTime && parseInt((new Date(result.expireTime).getTime() - new Date().getTime()) / 86400000, 10);
|
|
|
|
|
|
const list = [];
|
|
|
|
|
@@ -114,12 +124,13 @@ export default class extends Page {
|
|
|
}
|
|
|
|
|
|
textbookHistory({ page, size, subject }) {
|
|
|
- Textbook.listHistory({ subject }).then(result => {
|
|
|
+ Textbook.allHistory(subject).then(result => {
|
|
|
this.setState({
|
|
|
+ showUpdate: true,
|
|
|
updateList: result.map(row => {
|
|
|
row.version = row[`${subject}Version`];
|
|
|
row.content = row[`${subject}Content`];
|
|
|
- row.createTime = formatDate(row.createTime, 'YYYY-MM-DD\nHH:mm:ss');
|
|
|
+ row.createTime = formatDate(row.createTime, 'YYYY-MM-DD HH:mm:ss');
|
|
|
return row;
|
|
|
}),
|
|
|
// 不显示分页
|
|
@@ -151,7 +162,8 @@ export default class extends Page {
|
|
|
recordList({ page, size, service, isUse, isExpire }) {
|
|
|
Order.listRecord({ page, size, productType: 'service', service, isUse, isExpire }).then(result => {
|
|
|
this.setState({
|
|
|
- updateList: result.map(row => {
|
|
|
+ showUpdate: true,
|
|
|
+ updateList: result.list.map(row => {
|
|
|
row.title = ServiceKeyMap[service];
|
|
|
row.source = RecordSourceMap[row.source];
|
|
|
row.handler = (
|
|
@@ -166,7 +178,7 @@ export default class extends Page {
|
|
|
row.endTime = `${formatDate(row.endTime, 'YYYY-MM-DD')} 前`;
|
|
|
return row;
|
|
|
}),
|
|
|
- updateTotal: result.length,
|
|
|
+ updateTotal: result.list.length,
|
|
|
updatePage: page,
|
|
|
updateData: { page, size, service, isUse, columns: isUse ? [] : openColumns, type: 'record' },
|
|
|
});
|
|
@@ -230,6 +242,7 @@ export default class extends Page {
|
|
|
return row;
|
|
|
});
|
|
|
this.setState({
|
|
|
+ showUpdate: true,
|
|
|
// 不显示分页
|
|
|
updateTotal: 0,
|
|
|
maxHeight: 730,
|
|
@@ -588,7 +601,6 @@ export default class extends Page {
|
|
|
if (key === 'comment') {
|
|
|
this.setState({ showComment: true, comment: { channel: 'course_data', position: item.id } });
|
|
|
} else if (key === 'update') {
|
|
|
- this.setState({ showUpdate: true });
|
|
|
this.dataHistory({ dataId: item.id, page: 1, size: 10 });
|
|
|
} else if (key === 'feedback') {
|
|
|
this.setState({ showFeedbackError: true, feedbackError: { dataId: item.id, title: item.title, position: ['', '', ''] } });
|
|
@@ -624,13 +636,10 @@ export default class extends Page {
|
|
|
right={
|
|
|
!data.hasService &&
|
|
|
data.unUseRecord && (
|
|
|
- <div
|
|
|
- className="email"
|
|
|
- onClick={() => {
|
|
|
+ <div className="email" >
|
|
|
+ <span onClick={() => {
|
|
|
this.recordList({ page: 1, size: 10, service: 'textbook', isUse: false, isExpire: false });
|
|
|
- }}
|
|
|
- >
|
|
|
- 待开通
|
|
|
+ }} >待开通</span>
|
|
|
</div>
|
|
|
)
|
|
|
}
|
|
@@ -656,7 +665,6 @@ export default class extends Page {
|
|
|
if (key === 'comment') {
|
|
|
this.setState({ showComment: true, comment: { channel: 'library' } });
|
|
|
} else if (key === 'update') {
|
|
|
- this.setState({ showUpdate: true });
|
|
|
this.textbookHistory({ page: 1, size: 100, subject: item.subject });
|
|
|
} else if (key === 'feedback') {
|
|
|
this.setState({ showFeedback: true, feedback: { questionSubject: item.subject, target: TextbookFeedbackTarget[0].value } });
|
|
@@ -677,12 +685,12 @@ export default class extends Page {
|
|
|
</Button>
|
|
|
</div>
|
|
|
)}
|
|
|
- {data.hasService && (
|
|
|
+ {/* {data.hasService && (
|
|
|
<div className="tip-layout">
|
|
|
<div className="t1">使用中</div>
|
|
|
<div className="t2">距离到期还有 {data.expireDay} 天</div>
|
|
|
</div>
|
|
|
- )}
|
|
|
+ )} */}
|
|
|
{!data.hasService && data.unUseRecord && (
|
|
|
<div className="tip-layout">
|
|
|
<div className="t2">请于{formatDate(data.unUseRecord.endTime, 'YYYY-MM-DD')}前开通</div>
|