Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend
This commit is contained in:
commit
551fc1666e
|
@ -379,6 +379,7 @@ export default class acclist extends React.Component {
|
|||
this.countChange(e)
|
||||
}
|
||||
}
|
||||
page={this.state.page}
|
||||
pageChange = {
|
||||
(e) => {
|
||||
this.pageChange(e)
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue