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

This commit is contained in:
姜棚 2021-11-26 11:22:29 +08:00
commit 551fc1666e
2 changed files with 4 additions and 3 deletions

View File

@ -379,6 +379,7 @@ export default class acclist extends React.Component {
this.countChange(e)
}
}
page={this.state.page}
pageChange = {
(e) => {
this.pageChange(e)

View File

@ -127,15 +127,15 @@ export default class acclist extends React.Component{
getKeyList(time={}){
let _self=this;
let {page,limit,key_word,product_type}=_self.state;
let {page,limit,key_word,activepage}=_self.state;
let data={page,limit}
data.plan_id=sessionStorage.getItem("key_plan_id");
if(this.state.combinedValue&&this.state.combinedValue[0]){
data.begin_time=this.state.combinedValue[0];
data.end_time=this.state.combinedValue[1];
}
if(product_type){
data.product_type=product_type;
if(activepage){
data.status=activepage;
}
if(key_word){
data.key_word=key_word;