From 48e4426ece275953b35ec9b975e13e3d73e032e1 Mon Sep 17 00:00:00 2001
From: xicheny <771832800@qq.com>
Date: Sat, 6 Jun 2020 23:04:35 +0800
Subject: [PATCH] firsttime combine

---
 WebContent/manager/04return.jsp    | 15 ++++++---------
 WebContent/manager/05returnSus.jsp | 25 +++++++------------------
 WebContent/reader/index.jsp        |  4 ++--
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/WebContent/manager/04return.jsp b/WebContent/manager/04return.jsp
index 5474d66..aee639a 100644
--- a/WebContent/manager/04return.jsp
+++ b/WebContent/manager/04return.jsp
@@ -55,13 +55,13 @@
 			<div class="layui-form-item">
 				<label class="layui-form-label">管理员编号</label>
 				<div class="layui-input-inline">
-					<input type="text" name="managerid" lay-verify="required"
-						placeholder="请输入您的编号" autocomplete="off" class="layui-input"><br>
+					<input type="text" name="managerid" readonly="readonly"
+						  class="layui-input" value="<%=session.getAttribute("manager")%>"><br>
 				</div>
 			</div>
 			
 			<div class="layui-form-item" align="center">
-				<button class="layui-btn" lay-submit="" lay-filter="demo2">归还</button>
+				<button class="layui-btn layui-btn-warm" lay-submit="" lay-filter="demo2">归还</button>
 			</div>
 		</form>
 
@@ -77,14 +77,11 @@
 									elem : '#date1',
 									type : 'datetime',
 									format : 'yyyy-M-d H:m:s',
+									min:0,
+									max:0,
 									value: new Date()
 								});
-								laydate.render({
-									elem : '#date2',
-									type : 'datetime',
-									format : 'yyyy-M-d H:m:s'
-								});
-
+								
 								//创建一个编辑器
 								var editIndex = layedit
 										.build('LAY_demo_editor');
diff --git a/WebContent/manager/05returnSus.jsp b/WebContent/manager/05returnSus.jsp
index 3ccf374..a52fcbe 100644
--- a/WebContent/manager/05returnSus.jsp
+++ b/WebContent/manager/05returnSus.jsp
@@ -33,27 +33,16 @@
 						try {
 							int i = ret.executeUpdate(sql);
 							if (i == 1) {
-								String sql4="select * from manager where ID="+managerid;
-								ResultSet rs3=ret.executeQuery(sql4);
-								if(rs3.next()){
-								%>
-									<script>
-										alert('归还成功！');
-										window.location.href = "04return.jsp";
-									</script>
 								
-									<%
 										String sql3="update books set STATUS=1 where ID="+book;
 										ret.executeUpdate(sql3);
-								}else{
-									%>
-									<script>
-										alert('该管理员不存在！');
-										window.location.href = "04return.jsp";
-									</script>
-								
-									<%
-								}
+										%>
+										<script>
+											alert('归还成功！');
+											window.location.href = "04return.jsp";
+										</script>
+									
+										<%
 								
 							} else {
 								%>
diff --git a/WebContent/reader/index.jsp b/WebContent/reader/index.jsp
index 45e66ec..19eca98 100644
--- a/WebContent/reader/index.jsp
+++ b/WebContent/reader/index.jsp
@@ -81,7 +81,7 @@
 		</h1>
 		</header>
 	
-		<div class="main clearfix" style="font-size:10px;margin-top:3%;font-family:YouYuan;">
+		<div class="main clearfix" style="font-size:10px;margin-top:5%;font-family:YouYuan;">
 			<div class="column">
 <%
 		try{
@@ -92,7 +92,7 @@
 %>
 <% int id = rs.getInt(1);%>
 				<p><span class="glyphicon glyphicon-tags">&nbsp;借阅证编号：<%=rs.getString("ID")%></span></p><br>
-				<p><span class="glyphicon glyphicon-pencil">&nbsp;密码：<%=rs.getString("PASSWORD")%></span></p><br>
+				
 				<p><span class="glyphicon glyphicon-user">&nbsp;借阅证姓名：<%=rs.getString("READER")%></span></p><br>
 				<p><span class="glyphicon glyphicon-tag">&nbsp;规则编号：<%=rs.getString("RULE_ID")%></span></p><br>
 				<p><span class="glyphicon glyphicon-star-empty">&nbsp;状态：