diff --git a/.idea/marketing-system.iml b/.idea/marketing-system.iml
new file mode 100644
index 00000000..0c8867d7
--- /dev/null
+++ b/.idea/marketing-system.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..c64ec0fe
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/marketing-system.iml" filepath="$PROJECT_DIR$/.idea/marketing-system.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/components/filterSelect/main.js b/src/components/filterSelect/main.js
index c4eed4fa..6c5b8bb7 100644
--- a/src/components/filterSelect/main.js
+++ b/src/components/filterSelect/main.js
@@ -59,11 +59,8 @@ import Menu from "../menu/main.js"
 					   multiple={false}
 					   visible={this.state.menuShow}
 					   onClose = {()=>{this.onMenuHide()}}
-					   
-					   
 		    >
 		</Menu>):null
-		
 		}
 		
 		</div>
diff --git a/src/components/gird/main.js b/src/components/gird/main.js
index 444a83c2..94c60f3f 100644
--- a/src/components/gird/main.js
+++ b/src/components/gird/main.js
@@ -12,6 +12,9 @@ import _ from "lodash";
 import Pagination from "../pagination/main.js"
 import GridEdit from "../gridEdit/main.js"
 import Input from "../input/main.js"
+import GridCheckBar from "../gridCheckBar/main.js"
+
+
 
 //tabbar组件机构{title:"",index:""}
 //props {}
@@ -473,8 +476,10 @@ export default class menu extends React.Component {
 			ComponentHandler
 		} = this.props;
 		var column_width = 0;
-		return ( <
-			div className = "gird" >
+		return ( <div className = "gird" >
+			<GridCheckBar>
+			</GridCheckBar>
+
 			<div className = "th-head" > {
 				this.props.isMultiple ? ( < div className = "th-td"
 					style = {
@@ -736,12 +741,7 @@ export default class menu extends React.Component {
 				 }
 			 }>
 			</Pagination>
-			
-			
-			
-			
-			
-			
+
 			</div>
 			
 			</div >
diff --git a/src/components/gridCheckBar/main.css b/src/components/gridCheckBar/main.css
new file mode 100644
index 00000000..e6fdff8a
--- /dev/null
+++ b/src/components/gridCheckBar/main.css
@@ -0,0 +1,7 @@
+.gridCheckBar{
+width: 100%;
+/* background-color: #296bef;	 */
+height:66px;
+position: absolute;
+/* top: 230px; */
+}
\ No newline at end of file
diff --git a/src/components/gridCheckBar/main.js b/src/components/gridCheckBar/main.js
new file mode 100644
index 00000000..1bf38c55
--- /dev/null
+++ b/src/components/gridCheckBar/main.js
@@ -0,0 +1,30 @@
+
+import React from 'react'
+import "./main.css"
+import { Icon ,Menu} from 'zent';
+import _ from "lodash";
+
+
+ 
+ export default class gridCheckBar extends React.Component {
+ 	constructor(props) {
+ 		super(props);
+		this.state = {
+		   
+		}
+ 	}
+	
+ 	render() {
+
+	return(
+ 		<div className="gridCheckBar">
+		
+		</div>
+ 		)
+ 	}
+ }
+ 
+ 
+ 
+ 
+ 
diff --git a/src/components/gridEdit/main.js b/src/components/gridEdit/main.js
index e45a273d..b922d134 100644
--- a/src/components/gridEdit/main.js
+++ b/src/components/gridEdit/main.js
@@ -31,13 +31,23 @@ import BorderInput from "../inputborder/main.js"
 		let row = this.state.row;
 		row[this.props.column] = e;
 	     this.setState({row:row})
-		
 	}
  	render() {
 		
 	const  {pos}= this.props;
+
+	//调整位置算法
+	if(pos.y +  156> window.innerHeight )
+	{
+		pos.y = pos.y - 156;
+	}
+	if(pos.x + 412 > window.innerWidth)
+	{
+		pos.x = pos.x - 412;
+	}
+	
 	return(
- 			<div className="gridEdit"  style={{"position":"absolute","top":pos.y + 10,"left":pos.x + 10}}  >,
+ 	  <div className="gridEdit" id="gridEdit" style={{"position":"absolute","top":pos.y + 10,"left":pos.x + 10}}  >,
 		<div className="gridEdit-title">修改{this.props.title}</div>
 		<div className="gridEdit-content">
 		  <BorderInput text={this.state.text}  onChange={(e)=>{this.textChange(e)}} />
diff --git a/src/components/pagination/main.js b/src/components/pagination/main.js
index d2ee4e06..267979df 100644
--- a/src/components/pagination/main.js
+++ b/src/components/pagination/main.js
@@ -94,7 +94,7 @@ import _ from "lodash";
 		
 		 <span> 共 {data.count} 条记录,每页显示 </span>
 		  <span>
-		  <Dropdown position={DropdownPosition.TopCenter  } 
+		  <Dropdown position={DropdownPosition.AutoTopCenter  } 
 			   visible={this.state.visible}
 			        onVisibleChange={v => this.setState({ visible: v })}
 		  >