From 3ccda10c549a39dd18537a8d125267ea58c20807 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Sat, 27 Nov 2021 20:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=8E=E5=8F=B0=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=85=BC=E5=AE=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/exchangecode/commodity/commodity.js |  7 ++++++-
 src/pages/exchangepage/main/main.js           |  6 +++++-
 src/pages/plan/list/list.js                   | 11 ++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/pages/exchangecode/commodity/commodity.js b/src/pages/exchangecode/commodity/commodity.js
index f67506b0..de714480 100644
--- a/src/pages/exchangecode/commodity/commodity.js
+++ b/src/pages/exchangecode/commodity/commodity.js
@@ -71,7 +71,8 @@ export default class commoditylist extends React.Component{
       tabList:[{title:"商品范围列表"}],
 	  distdata:[],
       selectiondata:[],
-	  limit:10,
+    limit:10,
+    tableHeight:500,
       filterList:[{id:0,label:"商品类型",menuList:[{id:2,name:"卡密"},{id:1,name:"直充"}]},
 			],
       menuList:[{id:0,name:"商品类型",check:false}],
@@ -227,6 +228,9 @@ export default class commoditylist extends React.Component{
       limit:this.state.limit
       }
       this.getTableList(data);//更新列表
+  }
+  componentWillMount(){
+    this.setState({tableHeight:window.innerHeight-430});
   }
    //状态筛选
    selectedId(e){
@@ -273,6 +277,7 @@ export default class commoditylist extends React.Component{
         Column={Column}
         countbarVisible={false}
         isSwitch={false}
+        maxheight={this.state.tableHeight}
 			pageChange={(e)=>{
 			 	this.onPageChange(e)
 			}}
diff --git a/src/pages/exchangepage/main/main.js b/src/pages/exchangepage/main/main.js
index 169422c8..43af0cca 100644
--- a/src/pages/exchangepage/main/main.js
+++ b/src/pages/exchangepage/main/main.js
@@ -118,6 +118,7 @@ export default class acclist extends React.Component {
 				title: "已结束"
 			}],
 			distdata: [],
+			tableHeight:500,
 			filterList: [{
 				id: 0,
 				label: "分销商状态",
@@ -287,7 +288,9 @@ export default class acclist extends React.Component {
 	    this.sureFn();
 	  }
 	}
-	
+	componentWillMount(){
+    this.setState({tableHeight:window.innerHeight-430});
+  }
 	render() {
 		const {
 			current,
@@ -356,6 +359,7 @@ export default class acclist extends React.Component {
 			spliteColor = {
 				'#fff'
 			}
+			maxheight={this.state.tableHeight}
 			tableData = {
 				this.state.distdata
 			}
diff --git a/src/pages/plan/list/list.js b/src/pages/plan/list/list.js
index bd75c052..d02082c4 100644
--- a/src/pages/plan/list/list.js
+++ b/src/pages/plan/list/list.js
@@ -25,7 +25,8 @@ export default class acclist extends React.Component{
       tabList:[{title:"营销计划列表"}],
       distdata:[{title:'士大夫大师傅'}],
       filterList:[{id:0,label:"状态",menuList:[{id:0,name:"草稿"},{id:2,name:"审核中"},{id:4,name:"生效中"},{id:5,name:"暂停中"},{id:1,name:"创建中"},{id:3,name:"待生效"},{id:6,name:"已失效"}]},
-    ],
+		],
+		tableHeight:500,
     menuList:[{id:0,name:"状态",check:false}],
 	email:0,
 	phone:0,
@@ -115,7 +116,10 @@ export default class acclist extends React.Component{
 	  }
 	  this.getPlanList(data);
   }
-  
+	componentWillMount(){
+    this.setState({tableHeight:window.innerHeight-430});
+  }
+
   getPlanList(data){
 	  
 	  let queryParams = _.omitBy(data, (value) => {
@@ -601,7 +605,8 @@ export default class acclist extends React.Component{
         spliteColor={'#fff'}
         tableData={this.state.distdata}
         Column={Column}
-        countbarVisible={false}
+				countbarVisible={false}
+				maxheight={this.state.tableHeight}
         isSwitch={false}
 		dataCount={this.state.dataCount}
 			pageChange={(e)=>{