解决冲突

2021-11-17 14:56:16 +08:00 · 2021-11-17 14:56:16 +08:00 · 6ccc1544c8
parent ea59a18c5d
commit 6ccc1544c8
3 changed files with 14 additions and 7 deletions
--- a/src/components/gird/main.js
+++ b/src/components/gird/main.js
@ -143,6 +143,7 @@ export default class menu extends React.Component {
 			allChecked: false,
 			tableData: props.tableData,
 			Column: props.Column,
+			dataTotal:props.dataTotal,
 			indeterminate: false,
 			pageNum:0,
 			pageCount:props.dataCount,
@ -559,7 +560,7 @@ export default class menu extends React.Component {
 			<div className={this.state.pageLoading ? "pagebar hide":"pagebar"}  >
 			 <Pagination   data = {
 				{
-					count: 25
+					count: this.state.dataTotal
 				}
 			}
 			onPrevClick = {
--- a/src/pages/exchangecode/list/list.js
+++ b/src/pages/exchangecode/list/list.js