diff --git a/WebContent/admin/bookedit.jsp b/WebContent/admin/bookedit.jsp
index de19f07..4cd9cba 100644
--- a/WebContent/admin/bookedit.jsp
+++ b/WebContent/admin/bookedit.jsp
@@ -1,3 +1,6 @@
+<%@page import="javabean.JDBCBean"%>
+<%@page import="java.sql.ResultSet"%>
+<%@page import="javabean.Admin"%>
 <%@ page language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
 <!DOCTYPE html>
@@ -17,21 +20,51 @@
   </style>
 </head>
 <body>
+  
+  <%
+  	JDBCBean db = new JDBCBean();
+  	int id = Integer.parseInt(request.getParameter("id"));
+	ResultSet resultSet = null;
+	ResultSet librarySet = null;
+	ResultSet bookSortSet = null;
+	String sql = "select * from books where id=" +id ;
+ 	resultSet =  db.executeQuery(sql);
+ 	resultSet.next();
+  	String name = resultSet.getString("name");
+  	int library_id = resultSet.getInt("library_id");
+  	int sort_id = resultSet.getInt("sort_id");
+  	String position = resultSet.getString("position");
+  	int status = resultSet.getInt("status");
+  	String description = resultSet.getString("description");
+  	db.close();
+  	// 获取图书馆列表
+  	JDBCBean db2 = new JDBCBean();
+  	String librarySql = "select * from library";
+  	librarySet = db2.executeQuery( librarySql );
+  	
+  	
+  	// 获取书籍分类
+  	JDBCBean db3 = new JDBCBean();
+  	String bookSortSql = "select * from book_sort";
+  	bookSortSet = db3.executeQuery( bookSortSql );
+  	
+  %>
   <form class="layui-form   layui-form-pane" action="">
   <div class="layui-form-item">
     <label class="layui-form-label">书名</label>
     <div class="layui-input-block">
-      <input type="text" name="title" required  lay-verify="required" placeholder="请输入书名" autocomplete="off" class="layui-input">
+      <input type="text" name="name" value=<%=name %> required  lay-verify="required" placeholder="请输入书名" autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">
     <label class="layui-form-label">图书馆</label>
     <div class="layui-input-block">
       <select name="library_id" lay-verify="required">
-        <option value=""></option>
-        <option value="0">南图</option>
-        <option value="1">北图</option>
-        <option value="2">第三图书馆</option>
+      	<option value=""></option>
+      	<% while( librarySet.next() ){ %>
+      		<%-- 选中原来的 图书馆--%>
+        	<option value=<%=librarySet.getString("id") %> <%if(Integer.parseInt(librarySet.getString("id")) == library_id){ out.print("selected"); } %> ><%=librarySet.getString("name") %></option>
+        <%} %>
       </select>
     </div>
   </div>
@@ -40,23 +73,23 @@
     <div class="layui-input-block">
       <select name="sort_id" lay-verify="required">
         <option value=""></option>
-        <option value="1">幽默</option>
-        <option value="2">护理</option>
-        <option value="3">编程</option>
+        <% while(bookSortSet.next()){ %>
+        <option value=<%=bookSortSet.getInt("id") %> <% if(bookSortSet.getInt("id") == sort_id) out.print("selected"); %>><%=bookSortSet.getString("name") %></option>
+        <%} %>
       </select>
     </div>
   </div>
   <div class="layui-form-item">
     <label class="layui-form-label">位置</label>
     <div class="layui-input-block">
-      <input type="text" name="position" required  lay-verify="required" placeholder="请输入位置编号" autocomplete="off" class="layui-input">
+      <input type="text" name="position" value=<%=position %> required  lay-verify="required" placeholder="请输入位置编号" autocomplete="off" class="layui-input">
     </div>
   </div>
   <div class="layui-form-item">
     <label class="layui-form-label">状态</label>
     <div class="layui-input-block">
-      <input type="radio" name="status" value="1" title="可借" checked>
-      <input type="radio" name="status" value="0" title="不可借">
+      <input type="radio" name="status" value="1" title="可借" <%if(status==1) out.print("checked"); %>>
+      <input type="radio" name="status" value="0" title="不可借" <%if(status==0) out.print("checked"); %> >
     </div>
   </div>
   <!-- 
@@ -70,7 +103,7 @@
   <div class="layui-form-item layui-form-text">
     <label class="layui-form-label">书籍简介</label>
     <div class="layui-input-block">
-      <textarea class="layui-textarea layui-hide" name="content" lay-verify="content" id="LAY_demo_editor"></textarea>
+      <textarea class="layui-textarea layui-hide"  name="content" lay-verify="content" id="LAY_demo_editor"><%=description %></textarea>
     </div>
   </div>
   
@@ -84,6 +117,7 @@
 <script>
 
 layui.use(['form', 'layedit'], function(){
+  //layer.closeAll();
   var form = layui.form
   ,layer = layui.layer
   ,layedit = layui.layedit;
@@ -91,11 +125,21 @@ layui.use(['form', 'layedit'], function(){
   //监听提交
   form.on('submit(formDemo)', function(data){
     layer.msg(JSON.stringify(data.field));
-    return false;
+    var index = parent.layer.getFrameIndex(window.name);
+    parent.layer.msg('您将标记 [ sdf ] 成功传送给了父窗口');
+    parent.layer.close(index);
+    
+    //return false;
   });
 });
 
 </script>
-
+<%
+	// 关闭资源
+	bookSortSet.close();
+	librarySet.close();
+	resultSet.close();
+	db.close();
+%>
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/admin/booklist.jsp b/WebContent/admin/booklist.jsp
index 2c3363c..879a045 100644
--- a/WebContent/admin/booklist.jsp
+++ b/WebContent/admin/booklist.jsp
@@ -100,13 +100,18 @@
 		    } else if(layEvent === 'edit'){ //编辑
 		      //do something
 		     
+		      // 页面编辑
 		      layer.open({
 				  type: 2,
 				  title: "更改信息",
 				  area: ['800px', '600px'],
 				  maxmin: true, //开启最大化最小化按钮
 				  shadeClose: true,
-				  content: "bookedit.jsp?id="+ id
+				  content: "bookedit.jsp?id="+ id,
+				  end: function () {
+					  console.log("finish edit");
+					  //location.reload();
+				  }
 				});
 		      
 		      //同步更新缓存对应的值
diff --git a/build/classes/javabean/Admin.class b/build/classes/javabean/Admin.class
index 913dd15..4bc7df7 100644
Binary files a/build/classes/javabean/Admin.class and b/build/classes/javabean/Admin.class differ
diff --git a/build/classes/servlet/admin/AdminLogin.class b/build/classes/servlet/admin/AdminLogin.class
index d7d8859..6f05b03 100644
Binary files a/build/classes/servlet/admin/AdminLogin.class and b/build/classes/servlet/admin/AdminLogin.class differ
diff --git a/src/javabean/Admin.java b/src/javabean/Admin.java
index 96726e9..50df1af 100644
--- a/src/javabean/Admin.java
+++ b/src/javabean/Admin.java
@@ -149,6 +149,31 @@ public class Admin {
 		return result;
 	}
 	
+	/**
+	 * 根据id获取书籍信息
+	 * @param id
+	 * @return
+	 * @throws ClassNotFoundException
+	 * @throws SQLException
+	 */
+	public static ResultSet getBookInfo(int id) throws ClassNotFoundException, SQLException {
+		Connection connection = null;
+		PreparedStatement pstmt = null;
+		ResultSet resultSet = null;
+		String sql = "select * from books where id=? ";
+		connection = Base.getConnection();
+		pstmt = connection.prepareStatement(sql);
+		pstmt.setInt(1, id);
+		resultSet = pstmt.executeQuery();
+		//Base.closeResource(null, null, null);
+		connection.close();
+		if(resultSet.next()) {
+			return resultSet;
+		}
+		
+		return null;
+	}
+	
 	public static void main(String[] args) throws ClassNotFoundException, SQLException {
 		//Common common = new Common();
 		//System.out.println(common.getCount("books"));
diff --git a/src/javabean/JDBCBean.java b/src/javabean/JDBCBean.java
index 1fa37c5..62b864b 100644
--- a/src/javabean/JDBCBean.java
+++ b/src/javabean/JDBCBean.java
@@ -40,7 +40,7 @@ public class JDBCBean {
 		try {
 			rs = stmt.executeQuery(s);
 		} catch (Exception e) {
-			System.out.println("执行查询错误！");
+			System.out.println("执行查询错误！ "+e.getMessage());
 		}
 		return rs;
 	}
