From 78d99885e4077dab34413732e0b4320fcb794d4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8C=97=E6=B5=B7=E4=B8=80=E5=88=80?= <849005670@qq.com>
Date: Mon, 8 Nov 2021 19:59:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/gird/main.css |  3 ++-
 src/components/gird/main.js  |  3 ++-
 src/pages/plan/add/add.js    | 10 +++++++---
 src/pages/plan/add/add.less  | 14 +++++++++++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/components/gird/main.css b/src/components/gird/main.css
index 57e95047..663eedf0 100644
--- a/src/components/gird/main.css
+++ b/src/components/gird/main.css
@@ -2,6 +2,7 @@
 	height: auto;
 	max-height: 400px;
 	max-width: 100%;
+	overflow-y: hidden;
 	overflow-x: auto;
 }
 
@@ -24,7 +25,7 @@
 .th-body {
 	/* 	width: 100%; */
 	min-width: 100%;
-	max-height: 400px;
+
 	overflow-y: auto;
 	border-bottom: 1px solid #dfe1e6;
 	border-top: none;
diff --git a/src/components/gird/main.js b/src/components/gird/main.js
index 33c067ba..06123f0e 100644
--- a/src/components/gird/main.js
+++ b/src/components/gird/main.js
@@ -30,6 +30,7 @@ export default class menu extends React.Component {
 		headBackgroud: "",
 		spliteColor: "#f9fafc",
 		countbarVisible:true,
+		maxheight:400,
 		Column: [{
 				title: "推广计划名称",
 				prop: "name",
@@ -373,7 +374,7 @@ export default class menu extends React.Component {
 			<div className="loading-bar"></div>
 			<div className="loading-txt">数据加载中,请耐心等待</div>
 			</div>	
-			<div  className={this.state.pageLoading ? "th-body hide" : "th-body"} > {
+			<div  className={this.state.pageLoading ? "th-body hide" : "th-body"}   style={{"max-height":this.props.maxheight+"px"}}    > {
 				this.state.tableData.length == 0 ? ( < div className = "empty-text" > {
 						this.state.emptyText
 					} < /div>): (
diff --git a/src/pages/plan/add/add.js b/src/pages/plan/add/add.js
index 74bf1962..9c8a1e3a 100644
--- a/src/pages/plan/add/add.js
+++ b/src/pages/plan/add/add.js
@@ -8,6 +8,7 @@ export default class add extends React.Component{
   constructor(props){
     super(props)
     this.state={
+		step1_pagetitle:"新建计划",
         menuList:[
 			{id:1,title:"推广计划",child:[{step:1,title:"新建计划"}]},
 			{id:2,title:"key",child:[{step:1,title:"生产key"},{step:2,title:"绑定卡券"}]},
@@ -43,13 +44,16 @@ export default class add extends React.Component{
 		
 		</div>
 		<div className="plan-right">
-		  <div className="plan-title">营销计划</div>
+		 <div className="action-panel">
+		<div className="plan-title">营销计划</div>
 		<div id="step1" className="step1">
-				  <Card style={{ width:'100%' }} title={this.state.pagetitle}>
+		 <Card style={{ width:'100%' }} title={this.state.step1_pagetitle}>
 				
-				</Card>
+		</Card>
 		</div>
 		</div>
+		
+		</div>
       </div>
     )
   }
diff --git a/src/pages/plan/add/add.less b/src/pages/plan/add/add.less
index 799a7cbb..7758ebea 100644
--- a/src/pages/plan/add/add.less
+++ b/src/pages/plan/add/add.less
@@ -18,10 +18,18 @@
     overflow: auto;
 }
 .plan-right{
-	width:1172px;
-	margin-left: 250px;
-	
+	width:1744px;
+	margin-left: 176px;
 }
+.action-panel{
+	width: 80%;
+	margin: 0 auto;
+}
+.step1{
+	margin-top: 20px;
+}
+
+
 .plan-title{
 	font-size: 18px;
 	margin-top: 20px;