HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

解决冲突

This commit is contained in:
red-deng-deng 2021-11-17 14:56:16 +08:00
parent ea59a18c5d
commit 6ccc1544c8
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/gird/main.js
View File

@ -143,6 +143,7 @@ export default class menu extends React.Component {
allChecked: false, allChecked: false,
tableData: props.tableData, tableData: props.tableData,
Column: props.Column, Column: props.Column,
dataTotal:props.dataTotal,
indeterminate: false, indeterminate: false,
pageNum:0, pageNum:0,
pageCount:props.dataCount, pageCount:props.dataCount,
@ -559,7 +560,7 @@ export default class menu extends React.Component {
<div className={this.state.pageLoading ? "pagebar hide":"pagebar"} > <div className={this.state.pageLoading ? "pagebar hide":"pagebar"} >
<Pagination data = { <Pagination data = {
{ {
count: 25 count: this.state.dataTotal
} }
} }
onPrevClick = { onPrevClick = {

14
src/pages/exchangecode/list/list.js
View File

File diff suppressed because one or more lines are too long