Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend

src/pages/plan/list/list.js

@@ -41,14 +41,11 @@ export default class acclist extends React.Component{
   }
   //分页
   onPageChange(e){
-	  let data = {
-		  page:e,
-		  limit:this.state.limit,
-		  status:this.state.status,
-		  key_word:this.state.key_word
-	  }
+		this.setState({page:e});
+		setTimeout(()=>{
+			this.getpageFn();
+		},0);
 	
-	   this.getPlanList(data);
   }
   componentDidMount(e){
 	  
@@ -59,11 +56,6 @@ export default class acclist extends React.Component{
 	   })
 	   });
 
-	  
-	  
-	  
-	  
-	  
 	  let data = {
 		  page:1,
 		  limit:10
@@ -88,10 +80,15 @@ export default class acclist extends React.Component{
 	  })
   }
   onCountChange(e){
-	  this.setState({limit:e})
+		this.setState({page:1,limit:e})
+		setTimeout(()=>{
+			this.getpageFn();
+		},0);
+	}
+	getpageFn(){
 		let data = {
-	  	   page:1,
-	  	  limit:e,
+			page:this.state.page,
+			limit:this.state.limit,
 			status:this.state.status,
 			key_word:this.state.key_word
 		 }