HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
姜棚 2021-11-26 11:22:29 +08:00
parent d921066bef 0af44b5aef
commit 551fc1666e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/exchangepage/main/main.js
View File

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

6
src/pages/plan/key/list.js
View File

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