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

src/pages/distributor/list/list.js

@@ -231,6 +231,13 @@ export default class acclist extends React.Component{
     }, 0);
     
   }
+
+  onFilterClose(){
+		console.log("关闭")
+		this.setState({status:null})
+	}
+  
+  
    //状态筛选
  selectedId(e){
   this.setState({status:e});
@@ -292,7 +299,7 @@ componentDidUpdate(prevProps,prevState){
         {/* <Button type="info">批量操作</Button> */}
         <Ipt  onClearItem={(e)=>{this.setState({key_word:''})}}	 wordSearch={this.sureFn.bind(this)} onChange={(e)=>this.setState({key_word:e})} value={this.state.key_word} icon="search" placeholder={"请输入分销商名称、登录账号、联系人、手机号进行搜索"}  countShow={false} height={'36px'} width={'260px'}   alignment={'left'}/>
     </p>
-        <Filterbar selectFn={(e)=>{this.selectedId(e)}} filterList={this.state.filterList} menuList={this.state.menuList}></Filterbar>
+        <Filterbar onClose={(e)=>{this.onFilterClose(e)  }} selectFn={(e)=>{this.selectedId(e)}} filterList={this.state.filterList} menuList={this.state.menuList}></Filterbar>
         <div>
         
         <Grid  

src/pages/order/list/list.js

@@ -397,6 +397,13 @@ export default class orderlist extends React.Component{
     sureFn(){
       this.getOrderFn();
     }
+
+    onFilterClose(){
+      console.log("关闭")
+      this.setState({status:null})
+    }
+ 
+    
  //获取订单列表
  getOrderFn(time={}){
    let  _self=this;
@@ -510,7 +517,7 @@ componentDidUpdate(prevProps,prevState){
         </div>
        
         </p>
-        <Filterbar selectFn={(e)=>{this.selectedId(e)}} filterList={this.state.filterList} menuList={this.state.menuList}></Filterbar>
+        <Filterbar onClose={(e)=>{this.onFilterClose(e)  }}   selectFn={(e)=>{this.selectedId(e)}} filterList={this.state.filterList} menuList={this.state.menuList}></Filterbar>
         <div>
         {this.state.selectiondata.length>0?(<Alert
       type="info"