diff --git a/.classpath b/.classpath index 582d261..9e4c6d7 100644 --- a/.classpath +++ b/.classpath @@ -6,23 +6,18 @@ - - - - - - - - - - - + + + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..2cd8e91 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding//src/servlet/search_fly.java=UTF-8 diff --git a/WebContent/default/css/style.css b/WebContent/default/css/style.css index 2fc0662..b7316b4 100644 --- a/WebContent/default/css/style.css +++ b/WebContent/default/css/style.css @@ -12,7 +12,7 @@ body { */ /* 调整聊天框的样式 */ -.chat-container { +/*.chat-container { position: fixed; bottom: 220px; right: 20px; @@ -24,11 +24,31 @@ body { background-color: white; z-index: 1000; box-shadow: 0 0 10px rgba(0,0,0,0.1); + + .chat-container #chat-history { + height: 340px; + overflow-y: auto; + padding: 10px; +} +}*/ +.chat-container { + position: fixed; + top: 20%; + bottom: 10%; + right: 3%; + width: 30%; + height: 75%; + border: 1px solid #ccc; + border-radius: 5px; + overflow: hidden; + background-color: white; + + box-shadow: 0 0 10px rgba(0,0,0,0.1); } /* 其他样式保持不变 */ .chat-container #chat-history { - height: 340px; + height: 90%; overflow-y: auto; padding: 10px; } diff --git a/WebContent/default/images/newlogo11.png b/WebContent/default/images/newlogo11.png new file mode 100644 index 0000000..e30f131 Binary files /dev/null and b/WebContent/default/images/newlogo11.png differ diff --git a/WebContent/default/search.jsp b/WebContent/default/search.jsp index e1c9207..271e39d 100644 --- a/WebContent/default/search.jsp +++ b/WebContent/default/search.jsp @@ -1,13 +1,15 @@ <%@page import="javabean.flight"%> <%@page import="java.util.ArrayList"%> <%@page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@page contentType="text/html; charset=UTF-8" import="java.util.Date"%> +<%@page contentType="text/html; charset=UTF-8" import="java.text.SimpleDateFormat"%> <%@page import="javabean.db_conn"%> <%@page import="java.sql.ResultSet"%> -机票预订系统 +机票推荐系统 @@ -20,7 +22,13 @@ <%! db_conn conn2=new db_conn(); String seat; String user_name; - String todaydate="2019-12-01";%> + Date date = new Date(); + //设置要获取到什么样的时间 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + //获取String类型的时间 + String todaydate = sdf.format(date); + +%> @@ -40,8 +48,7 @@