diff --git a/WebContent/default/index.jsp b/WebContent/default/index.jsp
index c19fa32..3cd0578 100644
--- a/WebContent/default/index.jsp
+++ b/WebContent/default/index.jsp
@@ -39,13 +39,20 @@ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 //获取String类型的时间
 String todaydate = sdf.format(date);
 
-//也可以用这个  
-// String datetime = tempDate.format(new Date(System.currentTimeMillis()));
-	//String todaydate="2019-12-01";
-	//注意原本的设定是每天的机票都是不同的，因此数据库中要有每天不同的机票，这里为了方便，就设置了一个固定的时间
 %> 
-
-
+<!-- 日期选择器导入外部库 -->
+<link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css">
+  <script src="//code.jquery.com/jquery-1.9.1.js"></script>
+  <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
+  <link rel="stylesheet" href="http://jqueryui.com/resources/demos/style.css">
+  <script>
+  $(function() {  
+	    $( "#datepicker" ).datepicker({  
+	        dateFormat: 'yy-mm-dd'  
+	    });  
+	});
+ </script>
+<!-- 日期选择器导入结束 -->
 </head>
 <body class="bg-body">
 	<!-- header -->
@@ -70,7 +77,7 @@ String todaydate = sdf.format(date);
 							String sql="select * from p_inf where p_tel='"+session.getAttribute("user_id")+"'";
 							ResultSet res=conn.executeQuery(sql);
 							if(res.next())
-							  user_name=res.getString(2);
+							  user_name=res.getString(1);
 						%>
 							<a href="javacript:none" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
 								您好，<%= user_name %>
@@ -121,39 +128,49 @@ String todaydate = sdf.format(date);
 	</nav>
 	<!-- header end -->
 	<!-- 搜索 -->
+	
+<!-- 日期选择框的样式信息 -->
+<style>
+.ui-datepicker {  
+    background-color: #f0f0f0; /* 示例背景颜色 */  
+}  
+ 
+.ui-datepicker th {  
+    background-color: #414582; /* 示例表头背景颜色 */  
+    color: white; /* 示例表头文字颜色 */  
+}  
+ 
+.ui-datepicker td a {  
+    background-color: #ffffff; /* 示例日期单元格背景颜色（未选中时） */  
+    color: #000000; /* 示例日期单元格文字颜色（未选中时） */  
+}  
+ 
+.ui-datepicker td a.ui-state-active {  
+    background-color: #4CAF50; /* 示例选中日期的背景颜色 */  
+    color: red; /* 示例选中日期的文字颜色 */  
+}
+</style>
+
 	<div class="index-wall white " style="">
 		<div class="container"
-			style="position: relative; margin-left: 650px; width: auto;">
+			style="position: relative; margin-left: 25%; width: auto;">
 			<form class="form-inline" action="/air_ticket_book/search" method="post">
-				<div class="form-group" style="left:0%"><!--  mar-left-10 -->
-					<label for="" >出发城市</label>
-					 <input name="departure" type="text" class="form-control"
-						style="width: 85px;"  value="" placeholder="出发城市">
+				<div class="form-group"><!--  mar-left-10 -->
+					<label for="" >出发城市</label>					
+						<input type="text" class="form-control" style="width: 95px;" value="" size="15" id="getcity_name" name="departure" mod="address|notice" mod_address_source="hotel" mod_address_suggest="@Beijing|北京|53@Shanghai|上海|321@Shenzhen|深圳|91@Guangzhou|广州|80@Qingdao|青岛|292@Chengdu|成都|324@Hangzhou|杭州|383@Wuhan|武汉|192@Tianjin|天津|343@Dalian|大连|248@Xiamen|厦门|61@Chongqing|重庆|394@" mod_address_reference="getcityid" mod_notice_tip="中文/拼音" />
+						<input id="getcityid" name="getcityid" type="hidden" value="{$getcityid}" />				 
 				</div>
 				<div class="form-group" style="margin-left:2%">
-					<label for="">  &nbsp;&nbsp;&nbsp;&nbsp;到达城市</label> <input name="destination" type="text" class="form-control"
-						style="width: 85px;"  value="" placeholder="到达城市">
+					<label for="">  &nbsp;&nbsp;&nbsp;&nbsp;到达城市</label> 
+						<input type="text" class="form-control" style="width: 95px;" value="" size="15" id="homecity_name" name="destination" mod="address|notice" mod_address_source="hotel" mod_address_suggest="@Beijing|北京|53@Shanghai|上海|321@Shenzhen|深圳|91@Guangzhou|广州|80@Qingdao|青岛|292@Chengdu|成都|324@Hangzhou|杭州|383@Wuhan|武汉|192@Tianjin|天津|343@Dalian|大连|248@Xiamen|厦门|61@Chongqing|重庆|394@" mod_address_reference="cityid" mod_notice_tip="中文/拼音" />
+						<input id="cityid" name="cityid" type="hidden" value="{$cityid}" />
 				</div>
 				<div class="form-group" style="margin-left:2%">
-					<label for="">  &nbsp;&nbsp;&nbsp;&nbsp;出发日期</label> 
-					<div class="input-group">
-						<input name="departureYear" type="text" class="form-control"
-							style="width: 70px;"  value="">
-						<span class="input-group-addon">年</span>
-					</div>
-					<div class="input-group">
-						<input name="departureMonth" type="text" class="form-control"
-							style="width: 60px;"  value="">
-						<span class="input-group-addon">月</span>
-					</div>
-					<div class="input-group">
-						<input name="departureDay" type="text" class="form-control"
-							style="width: 60px;"  value="">
-						<span class="input-group-addon">日</span>
-					</div>
-				</div>
+					<label for="">  &nbsp;&nbsp;&nbsp;&nbsp;出发日期</label> <input name="date" type="text" class="form-control" id="datepicker"
+						style="width: 140px;"  value="<%=todaydate %>" placeholder="出发日期">								
+				</div>	
 				<button type="submit" class="btn btn-warning mar-left-10" 
-				style= "font-size:18px; border:#FFFFFF; color:#414582; background-color:#FFFFFF;margin-left: 5%">搜索</button>
+				style= "font-size:18px; border:#FFFFFF; color:#414582; background-color:#FFFFFF;margin-left: 2%;">搜索</button>
 					</form>
 			</div>
 		</div>
@@ -182,29 +199,14 @@ String todaydate = sdf.format(date);
 							String f_delay=res.getString(10);
 							String f_food=res.getString(11);
 							String f_wide=res.getString(12);
-							
+							/*
 							String sql2="select sum(t_b) from ticket where f_n='"+f_i+"' and t_d='"+todaydate+"'";
 							
 							db_conn conn2=new db_conn();
 							ResultSet res2=conn2.executeQuery(sql2);
 							if(res2.next())   seat=res2.getString(1);
 							if(seat=="null")  seat="0";
-					
-					%>
-			
-					<!-- 表头 -->
-					<ul class="list-inline bor-bottom-solid-1  ">
-						<li class="w-percentage-25" style="font-size:26px;color:#414582;"> <strong><%=f_i %></strong></li>
-						<li class="w20 time " ><strong><%=s_p %></strong> </li>
-						<li class="text-right" style= "color:#414582;"><%=s_a %></li>
-						<li class="">—</li>
-						<li class="w20 time " ><strong><%=a_p %></strong> </li>
-						<li class="w150" style= "color:#414582;"><%=a_a %></li>				
-						<li class="time w100"><strong><%=s_t %></strong></li>
-						<li class="">—</li>
-						<li class="time w80"><strong><%=a_t %></strong></li>
-						<!-- order.jsp?flight_id=<%=f_i %> -->
-						<%
+							*/					
 						db_conn conn3=new db_conn();
 						String a_code="";//出发地机场三字码
 						String d_code="";//到达地机场三字码
@@ -217,6 +219,17 @@ String todaydate = sdf.format(date);
 						String Domainname="https://flights.ctrip.com/";
 						Domainname+="online/list/oneway-"+d_code+"-"+a_code+"?_=1&depdate="+f_d+"&containstax=1";	
 						%>
+					<!-- 表头 -->
+					<ul class="list-inline bor-bottom-solid-1  ">
+						<li class="w-percentage-25" style="font-size:26px;color:#414582;"> <strong><%=f_i %></strong></li>
+						<li class="w20 time " ><strong><%=s_p %></strong> </li>
+						<li class="text-right" style= "color:#414582;"><%=s_a %></li>
+						<li class="">—</li>
+						<li class="w20 time " ><strong><%=a_p %></strong> </li>
+						<li class="w150" style= "color:#414582;"><%=a_a %></li>				
+						<li class="time w100"><strong><%=s_t %></strong></li>
+						<li class="">—</li>
+						<li class="time w80"><strong><%=a_t %></strong></li>
 						<%if(session.getAttribute("user_id")!=null){ %>
 						<li class="pull-right "><button type="button" style= "border:#000000;color:#FFFFFF;background-color:#414582;"
 						class="btn btn-danger btn-sm"  onClick="window.location.href ='<%= Domainname%>';">订票</button></li><%} 
@@ -229,13 +242,12 @@ String todaydate = sdf.format(date);
 					<!-- 表BODY -->		
 					<div class="collapse" id="collapseExample" style="display: block;">
 						<div class="hangbanlist-body " style="background-color: #f4f6f7;">
-							<ul class="list-inline">
-															
-								<!-- <li class="w-percentage-25">今日剩余座位数：<%=seat %></li> -->
+							<ul class="list-inline">															
 								<li class="w-percentage-15">价格：<span class="rmb">￥<%=f_p %></span></li>
 								<li class="w-percentage-15">延误率：<span class=""><%=f_delay %></span></li>
 								<li class="w-percentage-15">餐食：<span class=""><%=f_food %></span></li>
 								<li class="w-percentage-15">座位宽度：<span class=""><%=f_wide %></span></li>
+								<li class="w-percentage-5">出发日期：<span class=""><%=f_d %></span></li>
 							</ul>
 						</div>
 					</div>
@@ -251,18 +263,27 @@ String todaydate = sdf.format(date);
 				<div class="clearfix"></div>
 			</div>
 		</div>
-
-			    <div class="chat-container">
+<!-- AI聊天框 -->
+		<div class="chat-container">
         <div id="chat-history"></div>
         <div class="input-area">
             <input type="text" id="user-input" placeholder="输入您的问题...">
             <button id="send-btn">发送</button>
         </div>
         </div>
+<!-- AI聊天框结束 -->
+
+<!-- 城市选择框触发 -->
+<div id="jsContainer" class="jsContainer" style="height:0">
+    <div id="tuna_alert" style="display:none;position:absolute;z-index:999;overflow:hidden;"></div>
+    <div id="tuna_jmpinfo" style="visibility:hidden;position:absolute;z-index:120;"></div>
+</div>
 
-    
-    <script src="js/script.js"></script>
 
+<!-- 导入AI聊天框和城市选择框对应JS -->
+<script src="js/script.js"></script>
+<script type="text/javascript" src="js/fixdiv.js"></script>
+<script type="text/javascript" src="js/address.js"></script>
 
 
 </body>
diff --git a/WebContent/default/search.jsp b/WebContent/default/search.jsp
index 271e39d..d15acb4 100644
--- a/WebContent/default/search.jsp
+++ b/WebContent/default/search.jsp
@@ -15,6 +15,7 @@
 <link href="/air_ticket_book/default/css/corptravel.css" rel="stylesheet">
 <link href="/air_ticket_book/default/css/enterprise.css" rel="stylesheet">
 <link href="/air_ticket_book/default/css/iconfont.css" rel="stylesheet">
+<link href="/air_ticket_book/default/css/style.css" rel="stylesheet">
 <script type="/air_ticket_book/default/text/javascript" src="js/jquery-1.9.1.min.js"></script>
 <script src="/air_ticket_book/default/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="js/jquery-1.9.1.min.js"></script>
@@ -29,6 +30,19 @@
   String todaydate = sdf.format(date);
 	
 %>
+
+<link rel="stylesheet" href="//code.jquery.com/ui/1.10.4/themes/smoothness/jquery-ui.css">
+  <script src="//code.jquery.com/jquery-1.9.1.js"></script>
+  <script src="//code.jquery.com/ui/1.10.4/jquery-ui.js"></script>
+  <link rel="stylesheet" href="http://jqueryui.com/resources/demos/style.css">
+  <script>
+  $(function() {  
+	    $( "#datepicker" ).datepicker({  
+	        dateFormat: 'yy-mm-dd'  
+	    });  
+	});
+  </script>
+  
 </head>
 <body class="bg-body">
 	<!-- header -->
@@ -54,7 +68,7 @@
 							String sql2="select * from p_inf where p_tel='"+session.getAttribute("user_id")+"'";
 							ResultSet res2=conn2.executeQuery(sql2);
 							if(res2.next())
-							  user_name=res2.getString(2);
+							  user_name=res2.getString(1);
 						
 					%>
 							<a href="javacript:none" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
@@ -106,34 +120,98 @@
 
 		</div>
 	</nav>
+		
+<!-- 日期选择框的样式信息 -->
+<style>
+.ui-datepicker {  
+    background-color: #f0f0f0; /* 示例背景颜色 */  
+}  
+ 
+.ui-datepicker th {  
+    background-color: #414582; /* 示例表头背景颜色 */  
+    color: white; /* 示例表头文字颜色 */  
+}  
+ 
+.ui-datepicker td a {  
+    background-color: #ffffff; /* 示例日期单元格背景颜色（未选中时） */  
+    color: #000000; /* 示例日期单元格文字颜色（未选中时） */  
+}  
+ 
+.ui-datepicker td a.ui-state-active {  
+    background-color: #4CAF50; /* 示例选中日期的背景颜色 */  
+    color: red; /* 示例选中日期的文字颜色 */  
+}
+</style>
 	<!-- header end -->
 	<!-- 搜索 -->
-	<div class="index-wall white " style="">
+	<%
+		String odate=(String)request.getAttribute("date");
+		String odep=(String)request.getAttribute("departure");
+		String odst=(String)request.getAttribute("destination");
+	
+	%>
+		<div class="index-wall white " style="">
 		<div class="container"
-			style="position: relative; margin-left: 650px; width: auto;">
+			style="position: relative; margin-left: 25%; width: auto;">
 			<form class="form-inline" action="/air_ticket_book/search" method="post">
-				<div class="form-group mar-left-1410" >
-					<label for="" >今日日期：<%=todaydate%></label>
+				<div class="form-group"><!--  mar-left-10 -->
+					<label for="" >出发城市</label>					
+						<input type="text" class="form-control" style="width: 95px;" value="<%=odep %>" size="15" id="getcity_name" name="departure" mod="address|notice" mod_address_source="hotel" mod_address_suggest="@Beijing|北京|53@Shanghai|上海|321@Shenzhen|深圳|91@Guangzhou|广州|80@Qingdao|青岛|292@Chengdu|成都|324@Hangzhou|杭州|383@Wuhan|武汉|192@Tianjin|天津|343@Dalian|大连|248@Xiamen|厦门|61@Chongqing|重庆|394@" mod_address_reference="getcityid" mod_notice_tip="中文/拼音" />
+						<input id="getcityid" name="getcityid" type="hidden" value="{$getcityid}" />				 
 				</div>
-				<div class="form-group mar-left-10" >
-					<label for="" >出发城市</label> <input name="departure" type="text" class="form-control"
-						style="width: 85px;" id="" value="" placeholder="出发城市">
+				<div class="form-group" style="margin-left:2%">
+					<label for="">  &nbsp;&nbsp;&nbsp;&nbsp;到达城市</label> 
+						<input type="text" class="form-control" style="width: 95px;" value="<%=odst %>" size="15" id="homecity_name" name="destination" mod="address|notice" mod_address_source="hotel" mod_address_suggest="@Beijing|北京|53@Shanghai|上海|321@Shenzhen|深圳|91@Guangzhou|广州|80@Qingdao|青岛|292@Chengdu|成都|324@Hangzhou|杭州|383@Wuhan|武汉|192@Tianjin|天津|343@Dalian|大连|248@Xiamen|厦门|61@Chongqing|重庆|394@" mod_address_reference="cityid" mod_notice_tip="中文/拼音" />
+						<input id="cityid" name="cityid" type="hidden" value="{$cityid}" />
 				</div>
-				<div class="form-group">
-					<label for="">到达城市</label> <input name="destination" type="text" class="form-control"
-						style="width: 85px;" id="" value="" placeholder="到达城市">
+				<!-- 
+				
+				<input name="destination" type="text" class="form-control" 
+						style="width: 85px;"  value="" placeholder="到达城市">
+				
+				<input name="departure" type="text" class="form-control"
+						style="width: 85px;"  value="" placeholder="出发城市">	
+				
+				
+				 -->
+				<div class="form-group" style="margin-left:2%">
+					<label for="">  &nbsp;&nbsp;&nbsp;&nbsp;出发日期</label> <input name="date" type="text" class="form-control" id="datepicker"
+						style="width: 140px;"  value="<%=odate %>" placeholder="出发日期">								
+				</div>	
+				
+			<!-- 
+			<div class="form-group" style="margin-left:2%">
+					<label for="">  &nbsp;&nbsp;&nbsp;&nbsp;出发日期</label> 
+					<div class="input-group">
+						<input name="departureYear" type="text" class="form-control"
+							style="width: 70px;"  value="">
+						<span class="input-group-addon">年</span>
+					</div>
+					<div class="input-group">
+						<input name="departureMonth" type="text" class="form-control"
+							style="width: 60px;"  value="">
+						<span class="input-group-addon">月</span>
+					</div>
+					<div class="input-group">
+						<input name="departureDay" type="text" class="form-control"
+							style="width: 60px;"  value="">
+						<span class="input-group-addon">日</span>
+					</div>
 				</div>
+			
+			 -->
+				
 				<button type="submit" class="btn btn-warning mar-left-10" 
-				style= "font-size:18px; border:#FFFFFF; color:#414582; background-color:#FFFFFF;">搜索</button>
-			</form>
+				style= "font-size:18px; border:#FFFFFF; color:#414582; background-color:#FFFFFF;margin-left: 2%;">搜索</button>
+					</form>
+			</div>
 		</div>
-	</div>
-	<!-- 搜索结束 -->
+		<!-- 搜索结束 -->
 
 
 
 	<!-- 列表开始 -->
-	<div class="container mar-bottom-30 ">
+	<div class="container mar-bottom-30 " style="margin-left: 0%;width:65%">
 		<div class="hangbanlist">
 			<div>
 			
@@ -208,6 +286,23 @@
 			<div class="clearfix"></div>
 		</div>
 	</div>
+	
+	<div class="chat-container">
+        <div id="chat-history"></div>
+        <div class="input-area">
+            <input type="text" id="user-input" placeholder="输入您的问题...">
+            <button id="send-btn">发送</button>
+        </div>
+        </div>
+
+<div id="jsContainer" class="jsContainer" style="height:0">
+    <div id="tuna_alert" style="display:none;position:absolute;z-index:999;overflow:hidden;"></div>
+    <div id="tuna_jmpinfo" style="visibility:hidden;position:absolute;z-index:120;"></div>
+</div>    
+
+<script src="/air_ticket_book/default/js/script.js"></script>
+<script type="text/javascript" src="/air_ticket_book/default/js/fixdiv.js"></script>
+<script type="text/javascript" src="/air_ticket_book/default/js/address.js"></script>
 
 </body>
 </html>
\ No newline at end of file
