解决冲突

src/assets/api.js

@@ -2,7 +2,7 @@ export const baseurl = 'http://market.api.system.com'
 
 // 通用公用方法（get和post）
 const req = (method, url, params, responseType) => {
-	var obj=null;
+	var obj = null;
 	if (method == "get") {
 		if (params) {
 			let paramsArray = [];
@@ -24,7 +24,7 @@ const req = (method, url, params, responseType) => {
 			})
 		}
 	}
-	let http = fetch(url,obj).then(res => res.json());
+	let http = fetch(url, obj).then(res => res.json());
 	return http.then(response => response).catch(error => console.error('Error:', error));
 }
 

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 = {