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 {
数据加载中,请耐心等待
-
{ +
{ 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{
-
营销计划
+
+
营销计划
- + - +
+ +
) } 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;