diff --git a/Cart.java b/Cart.java
deleted file mode 100644
index 259eea4..0000000
--- a/Cart.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.itbaizhan.util;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import com.itbaizhan.orm.Tgoods;
-import com.itbaizhan.orm.TorderItem;
-
-public class Cart {
-
-	// 购物车属性
-	// 使用一个 Map 存储购物项，Map 的 key 是商品的 id，value 是购物项 TorderItem
-	protected Map<String, TorderItem> items;
-
-	/**
-	 * 构造函数，初始化购物车。
-	 * 如果购物车的 items 为 null，创建一个新的 HashMap 实例。
-	 */
-	public Cart() {
-		if (items == null) {
-			items = new HashMap<String, TorderItem>(); // 初始化购物车，使用 HashMap 存储购物项
-		}
-	}
-
-	/**
-	 * 将商品添加到购物车中。
-	 * 如果购物车中已经存在该商品，则增加该商品的数量；如果不存在，则新建购物项并添加。
-	 *
-	 * @param goodsId 商品的 ID
-	 * @param orderItem 购物项，即商品的详细信息，包括数量等
-	 */
-	public void addGoods(String goodsId, TorderItem orderItem) {
-		// 判断购物车中是否已经存在该商品
-		if (items.containsKey(goodsId)) { // 如果购物车中已存在该商品
-			// 获取原有的购物项，更新商品的数量
-			TorderItem _orderItem = items.get(goodsId); // 获取购物车中原有的购物项
-			_orderItem.setGoods_quantity(_orderItem.getGoods_quantity() + orderItem.getGoods_quantity()); // 更新数量
-			items.put(goodsId, _orderItem); // 更新购物车中的该商品项
-		} else { // 如果购物车中没有该商品
-			items.put(goodsId, orderItem); // 将新的购物项添加到购物车
-		}
-	}
-
-	/**
-	 * 从购物车中删除指定商品。
-	 * 根据商品的 ID 删除对应的购物项。
-	 *
-	 * @param goodsId 商品的 ID
-	 */
-	public void delGoods(String goodsId) {
-		items.remove(goodsId); // 从购物车中删除指定商品
-	}
-
-	/**
-	 * 更新购物车中某个商品的数量。
-	 *
-	 * @param goodsId 商品的 ID
-	 * @param quantity 新的商品数量
-	 */
-	public void updateCart(String goodsId, int quantity) {
-		// 获取购物车中的购物项，并更新数量
-		TorderItem orderItem = items.get(goodsId);
-		orderItem.setGoods_quantity(quantity); // 更新数量
-		items.put(goodsId, orderItem); // 更新购物车中的该商品项
-	}
-
-	/**
-	 * 获取购物车中所有商品的总价。
-	 * 遍历购物车中的所有商品，根据每个商品的特价和数量计算总价。
-	 *
-	 * @return 购物车中所有商品的总价
-	 */
-	public int getTotalPrice() {
-		int totalPrice = 0; // 初始化总价为 0
-		// 遍历购物车中的所有商品
-		for (Iterator it = items.values().iterator(); it.hasNext();) {
-			TorderItem orderItem = (TorderItem) it.next(); // 获取当前购物项
-			Tgoods goods = orderItem.getGoods(); // 获取商品信息
-			int quantity = orderItem.getGoods_quantity(); // 获取商品数量
-			totalPrice += goods.getTejia() * quantity; // 计算该商品的总价并累加到总价
-		}
-		return totalPrice; // 返回购物车中商品的总价
-	}
-
-	/**
-	 * 获取购物车中的所有商品。
-	 * 返回一个 Map，其中 key 是商品 ID，value 是购物项。
-	 *
-	 * @return 购物车中的所有商品
-	 */
-	public Map<String, TorderItem> getItems() {
-		return items; // 返回购物车中的所有商品
-	}
-}
diff --git a/EncodingFilter.java b/EncodingFilter.java
deleted file mode 100644
index cdaf09e..0000000
--- a/EncodingFilter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.itbaizhan.util;
-
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-public class EncodingFilter implements Filter {
-
-	// 用于存储编码格式
-	protected String encoding = null;
-
-	// 用于存储 Filter 的配置信息
-	protected FilterConfig filterConfig = null;
-
-	/**
-	 * 销毁方法。过滤器销毁时调用。清理资源。
-	 */
-	public void destroy() {
-		this.encoding = null; // 清空编码设置
-		this.filterConfig = null; // 清空过滤器配置
-	}
-
-	/**
-	 * 过滤请求和响应。
-	 * 在这个方法中，进行请求和响应的编码设置。
-	 *
-	 * @param request 请求对象，允许访问客户端请求的内容。
-	 * @param response 响应对象，允许设置响应的内容。
-	 * @param chain FilterChain 对象，允许将请求和响应传递到下一个过滤器或目标资源（例如 Servlet）。
-	 * @throws IOException IO 异常
-	 * @throws ServletException Servlet 异常
-	 */
-	public void doFilter(ServletRequest request, ServletResponse response,
-						 FilterChain chain) throws IOException, ServletException {
-
-		// 获取请求的编码格式
-		String encoding = selectEncoding(request);
-
-		// 如果编码格式不为空，则设置请求和响应的编码格式
-		if (encoding != null) {
-			request.setCharacterEncoding(encoding);  // 设置请求的编码
-			response.setCharacterEncoding(encoding); // 设置响应的编码
-		}
-
-		// 将请求和响应传递给下一个过滤器或目标资源
-		chain.doFilter(request, response);
-	}
-
-	/**
-	 * 初始化方法。用于初始化过滤器配置。
-	 * 在过滤器启动时调用，通常用于读取 web.xml 中的配置参数。
-	 *
-	 * @param filterConfig 过滤器的配置信息对象
-	 * @throws ServletException 初始化时发生异常
-	 */
-	public void init(FilterConfig filterConfig) throws ServletException {
-		this.filterConfig = filterConfig;
-
-		// 获取 web.xml 中配置的编码格式参数
-		this.encoding = filterConfig.getInitParameter("encoding");
-	}
-
-	/**
-	 * 根据请求选择字符编码。
-	 * 该方法可以进行扩展，以支持不同的编码选择机制。
-	 *
-	 * @param request 请求对象
-	 * @return 选择的字符编码
-	 */
-	protected String selectEncoding(ServletRequest request) {
-		// 返回初始化时配置的编码格式
-		return (this.encoding);
-	}
-}
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..254272e
--- /dev/null
+++ b/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/buy_servlet.java b/buy_servlet.java
deleted file mode 100644
index 3e2def7..0000000
--- a/buy_servlet.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.itbaizhan.action;
-
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Iterator;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import com.itbaizhan.orm.Tgoods;
-import com.itbaizhan.orm.Torder;
-import com.itbaizhan.orm.TorderItem;
-import com.itbaizhan.orm.Tuser;
-import com.itbaizhan.service.liuService;
-import com.itbaizhan.util.Cart;
-
-// 继承自HttpServlet类，这是一个典型的Servlet类，用于处理客户端请求
-public class buy_servlet extends HttpServlet {
-
-	// service方法处理所有客户端请求
-	// req: HttpServletRequest请求对象，res: HttpServletResponse响应对象
-	public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String type = req.getParameter("type");  // 获取URL传来的type参数，决定执行的操作
-
-		// 判断type的值，调用不同的操作方法
-		if (type.endsWith("addToCart")) {
-			addToCart(req, res);  // 如果操作是添加到购物车
-		}
-		if (type.endsWith("orderSubmit")) {
-			orderSubmit(req, res);  // 如果操作是提交订单
-		}
-		if (type.endsWith("myorder")) {
-			myorder(req, res);  // 如果操作是查看我的订单
-		}
-		if (type.endsWith("orderDetail")) {
-			orderDetail(req, res);  // 如果操作是查看订单明细
-		}
-	}
-
-	// 添加商品到购物车
-	public void addToCart(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String goods_id = req.getParameter("goods_id");  // 获取商品ID
-		int quantity = Integer.parseInt(req.getParameter("quantity"));  // 获取商品数量
-
-		// 根据商品ID获取商品详情
-		Tgoods goods = liuService.getGoods(goods_id);
-
-		// 创建订单项对象，设置商品和商品数量
-		TorderItem orderItem = new TorderItem();
-		orderItem.setGoods(goods);
-		orderItem.setGoods_quantity(quantity);
-
-		// 获取session中的购物车对象
-		HttpSession session = req.getSession();
-		Cart cart = (Cart) session.getAttribute("cart");
-
-		// 将商品添加到购物车
-		cart.addGoods(goods_id, orderItem);
-
-		// 更新session中的购物车
-		session.setAttribute("cart", cart);
-
-		// 设置成功信息和跳转路径
-		req.setAttribute("message", "操作成功");
-		req.setAttribute("path", "site/cart/mycart.jsp");  // 跳转到购物车页面
-
-		// 跳转到成功页面
-		String targetURL = "/common/success.jsp";
-		dispatch(targetURL, req, res);  // 跳转到目标页面
-	}
-
-	// 提交订单
-	public void orderSubmit(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String songhuodizhi = req.getParameter("songhuodizhi");  // 获取送货地址
-		String fukuanfangshi = req.getParameter("fukuanfangshi");  // 获取付款方式
-
-		// 从session中获取购物车对象和当前用户信息
-		HttpSession session = req.getSession();
-		Cart cart = (Cart) session.getAttribute("cart");
-		Tuser user = (Tuser) session.getAttribute("user");
-
-		// 创建订单对象并设置相关属性
-		Torder order = new Torder();
-		order.setId(String.valueOf(new Date().getTime()));  // 设置订单ID（使用当前时间戳）
-		order.setBianhao(new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()));  // 设置订单编号
-		order.setShijian(new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date()));  // 设置下单时间
-		order.setZhuangtai("no");  // 订单状态，默认是“未支付”
-		order.setHuifu("");  // 订单回复信息
-		order.setSonghuodizhi(songhuodizhi);  // 送货地址
-		order.setFukuanfangshi(fukuanfangshi);  // 付款方式
-		order.setJine(cart.getTotalPrice());  // 总金额
-		order.setUser_id(user.getId());  // 用户ID
-
-		// 保存订单到数据库
-		liuService.saveOrder(order);
-
-		// 遍历购物车中的商品项，保存订单项信息
-		for (Iterator it = cart.getItems().values().iterator(); it.hasNext();) {
-			TorderItem orderItem = (TorderItem) it.next();  // 获取购物车中的每一项商品
-			String id = String.valueOf(new Date().getTime());  // 创建一个新的订单项ID
-			String order_id = order.getId();  // 获取订单ID
-			String goods_id = orderItem.getGoods().getId();  // 获取商品ID
-			int goods_quantity = orderItem.getGoods_quantity();  // 获取商品数量
-
-			// 保存订单项信息
-			liuService.saveOrderItem(id, order_id, goods_id, goods_quantity);
-		}
-
-		// 清空购物车
-		cart.getItems().clear();
-		session.setAttribute("cart", cart);
-
-		// 将订单信息传递到页面
-		req.setAttribute("order", order);
-		req.getRequestDispatcher("site/order/orderSubmit.jsp").forward(req, res);  // 跳转到订单提交页面
-	}
-
-	// 查看我的订单
-	public void myorder(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		HttpSession session = req.getSession();
-		Tuser user = (Tuser) session.getAttribute("user");
-
-		// 从数据库获取当前用户的所有订单
-		req.setAttribute("orderList", liuService.orderList(user.getId()));
-		req.getRequestDispatcher("site/order/myorder.jsp").forward(req, res);  // 跳转到我的订单页面
-	}
-
-	// 查看订单明细
-	public void orderDetail(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String order_id = req.getParameter("order_id");  // 获取订单ID
-
-		// 打印订单ID，调试用
-		System.out.println(order_id + "DD");
-
-		// 从数据库获取订单项信息
-		req.setAttribute("orderItemList", liuService.orderItemList(order_id));
-		req.getRequestDispatcher("site/order/orderDetail.jsp").forward(req, res);  // 跳转到订单明细页面
-	}
-
-	// 跳转到目标页面
-	public void dispatch(String targetURI, HttpServletRequest request, HttpServletResponse response) {
-		RequestDispatcher dispatch = getServletContext().getRequestDispatcher(targetURI);
-		try {
-			dispatch.forward(request, response);  // 转发请求到目标页面
-		} catch (ServletException | IOException e) {
-			e.printStackTrace();  // 异常处理
-		}
-	}
-
-	// 初始化Servlet配置
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config);
-	}
-
-	// 销毁Servlet，通常用来释放资源
-	public void destroy() {
-	}
-}
diff --git a/cartService.java b/cartService.java
deleted file mode 100644
index 3c1d666..0000000
--- a/cartService.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package com.itbaizhan.service;
-
-import javax.servlet.http.HttpSession;
-import org.directwebremoting.WebContext;
-import org.directwebremoting.WebContextFactory;
-import com.itbaizhan.util.Cart;
-
-/**
- * 购物车服务类 (cartService)
- *
- * 该类提供了对购物车的操作方法，包括修改商品数量、删除购物车中的商品以及清空购物车等功能。
- * 它通过使用 session 来保存和管理用户的购物车信息。
- */
-public class cartService {
-
-	/**
-	 * 修改购物车中商品的数量
-	 *
-	 * @param goodsId  商品ID
-	 * @param quantity 新的商品数量
-	 * @return 操作结果的字符串 ("yes" 表示成功)
-	 */
-	public String modiNum(String goodsId, int quantity) {
-		String result = "";  // 初始化操作结果为空
-
-		// 获取 WebContext 上下文
-		WebContext ctx = WebContextFactory.get();  // 通过 DWR (Direct Web Remoting) 获取 WebContext
-		HttpSession session = ctx.getSession();    // 获取当前会话对象
-
-		// 获取购物车对象
-		Cart cart = (Cart) session.getAttribute("cart");
-
-		// 更新购物车中的商品数量
-		cart.updateCart(goodsId, quantity);
-
-		// 更新 session 中的购物车对象
-		session.setAttribute("cart", cart);
-
-		// 设置操作结果为 "yes" 表示成功
-		result = "yes";
-		return result;
-	}
-
-	/**
-	 * 从购物车中删除指定商品
-	 *
-	 * @param goodsId 商品ID
-	 * @return 操作结果的字符串 ("yes" 表示成功)
-	 */
-	public String delGoodsFromCart(String goodsId) {
-		// 获取 WebContext 上下文
-		WebContext ctx = WebContextFactory.get();  // 通过 DWR 获取 WebContext
-		HttpSession session = ctx.getSession();    // 获取当前会话对象
-
-		// 获取购物车对象
-		Cart cart = (Cart) session.getAttribute("cart");
-
-		// 从购物车中删除指定商品
-		cart.delGoods(goodsId);
-
-		// 更新 session 中的购物车对象
-		session.setAttribute("cart", cart);
-
-		return "yes";  // 返回成功标志
-	}
-
-	/**
-	 * 清空购物车中的所有商品
-	 *
-	 * @return 操作结果的字符串 ("yes" 表示成功)
-	 */
-	public String clearCart() {
-		// 获取 WebContext 上下文
-		WebContext ctx = WebContextFactory.get();  // 通过 DWR 获取 WebContext
-		HttpSession session = ctx.getSession();    // 获取当前会话对象
-
-		// 获取购物车对象
-		Cart cart = (Cart) session.getAttribute("cart");
-
-		// 清空购物车中的所有商品
-		cart.getItems().clear();
-
-		// 更新 session 中的购物车对象
-		session.setAttribute("cart", cart);
-
-		return "yes";  // 返回成功标志
-	}
-}
diff --git a/catelogAdd.jsp b/catelogAdd.jsp
deleted file mode 100644
index 70dc4d2..0000000
--- a/catelogAdd.jsp
+++ /dev/null
@@ -1,61 +0,0 @@
- <%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false" %> 
-
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-        
-        <link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-        
-        <script language="javascript">
-            function c()//鍒ゆ柇鏄惁鏈夎彍鍝佺被鍒俊鎭緭鍏�
-            {
-                if(document.formAdd.name.value=="")
-                {
-                    alert("璇疯緭鍏ョ被鍒悕绉�");
-                    return false;
-                }
-                
-                document.formAdd.submit();//杈撳叆鑿滃搧绫诲埆淇℃伅锛屾彁浜�
-            }
-        </script>
-	</head>
-
-	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'>
-			<form action="<%=path %>/catelog?type=catelogAdd" name="formAdd" method="post">
-				     <table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-						<tr bgcolor="#E7E7E7">
-							<td height="14" colspan="4" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						         绫诲埆鍚嶇О锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="name" size="40"/>
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						        &nbsp;
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						       <input type="button" value="鎻愪氦" onclick="c()"/>&nbsp; 
-						       <input type="reset" value="閲嶇疆"/>&nbsp;
-						    </td>
-						</tr>
-					 </table>
-			</form>
-   </body>
-</html>
diff --git a/catelogMana.jsp b/catelogMana.jsp
deleted file mode 100644
index ff2528b..0000000
--- a/catelogMana.jsp
+++ /dev/null
@@ -1,70 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false" %> 
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-
-		<link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-		
-        <script language="javascript">
-           function catelogDel(id)//纭畾鍒犻櫎锛燂紝纭畾鍚庤烦杞晫闈紝鍒犻櫎鑿滃搧绫诲埆鐨刬d
-           {
-               if(confirm('鎮ㄧ‘瀹氬垹闄ゅ悧锛�'))
-               {
-                   window.location.href="<%=path %>/catelog?type=catelogDel&id="+id;
-               }
-           }
-           
-           function catelogAdd()//鑿滃搧绫诲埆娣诲姞
-           {
-                 var url="<%=path %>/admin/catelog/catelogAdd.jsp";
-				 window.location.href=url;
-           }
-       </script>
-	</head>
-
-	<body leftmargin="2" topmargin="2" background='<%=path %>/img/allbg.gif'>
-			<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-				<tr bgcolor="#E7E7E7">
-					<td height="14" colspan="4" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-				</tr>
-				<tr align="center" bgcolor="#FAFAF1" height="22">
-				    <td width="10%">搴忓彿</td>
-					<td width="80%">绫诲埆鍚嶇О</td>
-					<td width="10%">鎿嶄綔</td>
-		        </tr>	
-				<c:forEach items="${requestScope.catelogList}" var="catelog" varStatus="sta"><!-- 渚濇璇诲彇鑿滃搧淇℃伅 -->
-				<tr align='center' bgcolor="#FFFFFF" height="22">
-					<td bgcolor="#FFFFFF" align="center">
-						${sta.index+1}
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						${catelog.name}
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						<input type="button" value="鍒犻櫎" onclick="catelogDel(${catelog.id})"/>
-					</td>
-				</tr>
-				</c:forEach>
-			</table>
-			
-			<table width='98%'  border='0'style="margin-top:8px;margin-left: 8px;">
-			  <tr>
-			    <td>
-			      <input type="button" value="娣诲姞鑿滃搧绫诲埆" style="width: 120px;" onclick="catelogAdd()" />
-			    </td>
-			  </tr>
-		    </table>
-	</body>
-</html>
diff --git a/catelog_servlet.java b/catelog_servlet.java
deleted file mode 100644
index 7d85fe0..0000000
--- a/catelog_servlet.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package com.itbaizhan.action;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.itbaizhan.dao.DB;
-import com.itbaizhan.orm.Tcatelog;
-
-// 继承HttpServlet类，处理关于菜品类别的增删改查操作
-public class catelog_servlet extends HttpServlet {
-
-	// service方法是Servlet的核心方法，接收请求并分发到不同的功能方法
-	public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String type = req.getParameter("type");  // 获取请求的type参数，判断要执行的操作类型
-
-		// 根据type值决定执行相应的功能
-		if (type.endsWith("catelogAdd")) {
-			catelogAdd(req, res);  // 添加菜品类别
-		}
-		if (type.endsWith("catelogMana")) {
-			catelogMana(req, res);  // 菜品类别管理
-		}
-		if (type.endsWith("catelogDel")) {
-			catelogDel(req, res);  // 删除菜品类别
-		}
-	}
-
-	// 添加菜品类别
-	public void catelogAdd(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		// 获取请求参数，并设置类别的ID（使用当前时间戳）
-		String id = String.valueOf(new Date().getTime());
-		String name = req.getParameter("name").trim();  // 获取类别名称并去除空格
-		String del = "no";  // 设置删除标记，默认为“no”表示未删除
-
-		// 编写SQL插入语句，将菜品类别信息插入到数据库中
-		String sql = "insert into t_catelog(id,name,del) values(?,?,?)";
-		Object[] params = { id, name, del };  // 参数化SQL查询，防止SQL注入
-
-		// 创建DB对象并执行SQL语句
-		DB mydb = new DB();
-		mydb.doPstm(sql, params);  // 执行SQL语句
-		mydb.closed();  // 关闭数据库连接
-
-		// 设置操作成功消息
-		req.setAttribute("msg", "操作成功");
-		String targetURL = "/common/msg.jsp";  // 跳转页面路径
-		dispatch(targetURL, req, res);  // 跳转到成功提示页面
-	}
-
-	// 菜品类别管理，展示所有未删除的类别
-	public void catelogMana(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		List catelogList = new ArrayList();  // 存储所有菜品类别的列表
-
-		// 查询所有未删除的菜品类别
-		String sql = "select * from t_catelog where del='no'";
-		Object[] params = {};  // 查询没有参数
-		DB mydb = new DB();  // 创建DB对象用于执行查询操作
-
-		try {
-			mydb.doPstm(sql, params);  // 执行SQL查询
-			ResultSet rs = mydb.getRs();  // 获取查询结果集
-
-			// 循环处理查询结果
-			while (rs.next()) {  // 如果有更多数据，继续处理
-				Tcatelog catelog = new Tcatelog();  // 创建Tcatelog对象，用于存储每个类别的信息
-				catelog.setId(rs.getString("id"));  // 设置类别ID
-				catelog.setName(rs.getString("name"));  // 设置类别名称
-				catelogList.add(catelog);  // 将类别对象添加到列表中
-			}
-			rs.close();  // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace();  // 处理异常
-		}
-		mydb.closed();  // 关闭数据库连接
-
-		// 将类别列表传递到前端页面
-		req.setAttribute("catelogList", catelogList);
-		req.getRequestDispatcher("admin/catelog/catelogMana.jsp").forward(req, res);  // 跳转到类别管理页面
-	}
-
-	// 删除菜品类别（将del字段设置为“yes”表示删除）
-	public void catelogDel(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		// 获取请求中传递的类别ID，并执行SQL更新语句
-		String sql = "update t_catelog set del='yes' where id=" + req.getParameter("id");
-		Object[] params = {};  // 删除操作没有额外的参数
-		DB mydb = new DB();  // 创建DB对象
-
-		mydb.doPstm(sql, params);  // 执行更新操作
-		mydb.closed();  // 关闭数据库连接
-
-		// 设置操作成功消息
-		req.setAttribute("msg", "操作成功");
-		String targetURL = "/common/msg.jsp";  // 跳转页面路径
-		dispatch(targetURL, req, res);  // 跳转到成功提示页面
-	}
-
-	// 跳转到指定页面
-	public void dispatch(String targetURI, HttpServletRequest request, HttpServletResponse response) {
-		RequestDispatcher dispatch = getServletContext().getRequestDispatcher(targetURI);  // 获取RequestDispatcher对象
-		try {
-			dispatch.forward(request, response);  // 将请求转发到目标页面
-		} catch (ServletException | IOException e) {
-			e.printStackTrace();  // 处理异常
-		}
-	}
-
-	// 初始化Servlet配置
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config);  // 调用父类的初始化方法
-	}
-
-	// 销毁Servlet，通常用来释放资源
-	public void destroy() {
-		// 可以进行资源释放的操作（此处为空）
-	}
-}
diff --git a/goodsAdd.jsp b/goodsAdd.jsp
deleted file mode 100644
index 041d55c..0000000
--- a/goodsAdd.jsp
+++ /dev/null
@@ -1,157 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false" %> 
-<%@ taglib uri="http://java.fckeditor.net" prefix="FCK"%>
-
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-        
-        <link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-        <script type="text/javascript" src="<%=path %>/js/popup.js"></script>
-        <script type='text/javascript' src='<%=path %>/dwr/interface/loginService.js'></script>
-        <script type='text/javascript' src='<%=path %>/dwr/engine.js'></script>
-        <script type='text/javascript' src='<%=path %>/dwr/util.js'></script>
-        <script language="javascript">
-           var i=0;
-           function catelogAll()//鑾峰緱鎵�鏈夎彍鍝佺被鍒嚱鏁�
-           {
-               if(i==0)
-               {
-                   document.getElementById("indicator").style.display="block";
-                   loginService.catelogAll(callback);
-                   i=1;
-               }             
-           }
-           function callback(data)
-           {
-               document.getElementById("indicator").style.display="none";
-               DWRUtil.addOptions("catelog_id",data,"id","name");
-           }
-           
-           
-           function up() //涓婁紶鍥剧墖鍑芥暟 閫氳繃Popup.js鎵撳紑瀵硅瘽妗�
-	       {
-		        var pop=new Popup({ contentType:1,isReloadOnClose:false,width:400,height:200});//pop绫诲瀷涓�1锛屽唴宓宨frame锛屽叧闂悗涓嶉噸鏂板姞杞介〉闈�
-	            pop.setContent("contentUrl","<%=path %>/upload/upload.jsp");//璺宠浆鍒颁笂浼犵晫闈�
-	            pop.setContent("title","鏂囦欢涓婁紶");
-	            pop.build();
-	            pop.show();
-	       }
-           
-           function check()//妫�鏌ヤ俊鎭槸鍚﹁緭鍏ュ畬鏁�
-           {
-               if(document.formAdd.catelog_id.value==0)
-               { 
-                   alert("璇烽�夋嫨绫诲埆");
-                   return false;
-               }
-               
-               if(document.formAdd.bianhao.value=="")
-               { 
-                   alert("璇疯緭鍏ョ紪鍙�");
-                   return false;
-               }
-               if(document.formAdd.mingcheng.value=="")
-               { 
-                   alert("璇疯緭鍏ュ悕绉�");
-                   return false;
-               }
-               return true;
-           }
-        </script>
-	</head>
-
-	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'>
-			<form action="<%=path %>/goods?type=goodsAdd" name="formAdd" method="post">
-				     <table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-						<tr bgcolor="#E7E7E7">
-							<td height="14" colspan="4" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						         绫诲埆锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <table border="0">
-							           <tr> 
-							               <td>  
-							                  <select name="catelog_id" id="catelog_id" style="width: 250px;" onclick="catelogAll()">
-									              <option value="0">璇烽�夋嫨绫诲埆</option>
-									          </select>
-							               </td>
-							               <td>
-							                  <img id="indicator" src="<%=path %>/images/loading.gif" style="display:none"/> 
-							                  <!-- 鎻掑叆杞藉叆鍔ㄧ敾 -->
-							               </td>
-							           </tr>
-							    </table>
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						         缂栧彿锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="bianhao" style="width: 250px;"/>
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						               鍚嶇О锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="mingcheng" style="width: 250px;"/>
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						         浠嬬粛锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <FCK:editor instanceName="jieshao"  basePath="/fckeditor" width="550" height="200" value="" toolbarSet="Basic">
-	                            </FCK:editor> <!-- 娣诲姞fck缂栬緫鍣紝鍚嶅瓧鍙粙缁嶏紝鍩轰簬璺緞/fckeditor锛屽锛岄珮锛屽垵鍊间负绌猴紝鍩虹褰㈠紡 -->
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						        鍥剧墖锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="fujian" id="fujian" style="width: 250px;" readonly="readonly"/>
-						        <input type="button" value="涓婁紶" onclick="up()"/> <!-- 涓婁紶瑙﹀彂up锛堬級鍑芥暟 -->
-						        <input type="hidden" name="fujian" id="fujian"/> 
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						              浠锋牸锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="shichangjia" value="100" style="width: 250px;" onpropertychange="onchange1(this.value)" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"/>
-						    	<!--鎻掑叆鑿滃搧鐨勪环鏍兼锛宱npropertychange褰撹緭鍏ユ灞炴�у彉鍖栨椂锛岃Е鍙憃nchange1灞炴�э紝淇敼鏁版嵁搴撹彍鍝佷环鏍� 涓嬩竴鍙ヤ负鎸夐敭涔嬪悗瑙﹀彂灏嗚緭鍏ュ�间负闈炴暟瀛楃殑瀛楃鏇挎崲涓虹┖锛岀矘璐翠箣鍚庤Е鍙戝皢杈撳叆鍊间负闈炴暟瀛楃殑瀛楃鏇挎崲涓虹┖-->
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						        &nbsp;
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						       <input type="submit" value="鎻愪氦" onclick="return check()"/>&nbsp; 
-						       <input type="reset" value="閲嶇疆"/>&nbsp;
-						    </td>
-						</tr>
-					 </table>
-			</form>
-   </body>
-</html>
diff --git a/goodsDetailHou.jsp b/goodsDetailHou.jsp
deleted file mode 100644
index f405c49..0000000
--- a/goodsDetailHou.jsp
+++ /dev/null
@@ -1,24 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="This is my page">
-  </head>
-  
-  <body>
-        <table align="center">
-          <tr>
-             <td>
-                  <c:out value="${requestScope.goods.jieshao}" escapeXml="false"></c:out>  <!--杈撳嚭鑿滃搧鐨勪粙缁嶄俊鎭紝灏嗗叾涓殑xml鏂囨。瑙ｆ瀽鍑烘潵 -->
-             </td>
-          </tr>
-      </table>
-  </body>
-</html>
diff --git a/goodsMana.jsp b/goodsMana.jsp
deleted file mode 100644
index 90dd123..0000000
--- a/goodsMana.jsp
+++ /dev/null
@@ -1,118 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false" %> 
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-
-		<link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-		<script type="text/javascript" src="<%=path %>/js/popup.js"></script>
-		<script language="JavaScript" src="<%=path %>/js/public.js" type="text/javascript"></script>
-        <script language="javascript">
-           function goodsDel(id)//鍒犻櫎涔嬪悗锛岃烦杞埌鍒犻櫎鎴愬姛鐣岄潰锛屽苟鍒犻櫎鑿滃搧鐨刬d锛屼紶鍏ヨ彍鍝佸垹闄ょ殑鐣岄潰
-           {
-               if(confirm('鎮ㄧ‘瀹氬垹闄ゅ悧锛�'))
-               {
-                   window.location.href="<%=path %>/goods?type=goodsDel&id="+id;
-               }
-           }
-           
-           function goodsPre(id)//娣诲姞鑿滃搧淇℃伅鍑芥暟
-           {
-                   window.location.href="<%=path %>/goods?type=goodsPre&id="+id;
-           }
-           
-           function goodsAdd()//璺宠浆鍒癵oodsAdd.jsp,瀹屾垚鑿滃搧鐨勬坊鍔�
-           {
-                 var url="<%=path %>/admin/goods/goodsAdd.jsp";
-				 window.location.href=url;
-           }
-           function over(picPath)//榧犳爣绉诲埌鍥剧墖浜屽瓧鏃舵樉绀哄浘鐗囩殑鍑芥暟锛屽苟瀹氫箟浜嗗浘鐗囩殑鏄剧ず鏍煎紡
-	       {
-			  if (picPath=="")picPath="/img/default.jpg";
-			  x = event.clientX;
-			  y = event.clientY;      
-			  document.all.tip.style.display = "block";
-			  document.all.tip.style.top = y;
-			  document.all.tip.style.left = x+10;
-			  document.all.photo.src = ".."+picPath; 
-		   }
-		   function out()//榧犳爣绉诲紑鍥剧墖浜屽瓧鐨勬椂鍊欎粈涔堜篃涓嶆樉绀�
-	       {
-			  document.all.tip.style.display = "none";
-		   }
-		   
-		   function goodsDetailHou(id)//鍟嗗搧鍏蜂綋鐨勬弿杩颁俊鎭�
-           {
-                 var url="<%=path %>/goods?type=goodsDetailHou&id="+id;
-                 var n="";
-                 var w="480px";
-                 var h="500px";
-                 var s="resizable:no;help:no;status:no;scroll:yes"; //涓嶅彲鏀瑰彉澶у皬锛屾棤甯姪鏍忥紝鏃犵姸鎬佹爮锛屾湁婊氬姩鏉�
-				 openWin(url,n,w,h,s);//鎵撳紑涓�涓繖鏍风殑绐楀彛 楂�500锛屽480锛屼笉鍙敼鍙樺ぇ灏忥紝鏃犲府鍔╂爮锛屾棤鐘舵�佹爮锛屾湁婊氬姩鏉�
-           }
-       </script>
-	</head>
-
-	<body leftmargin="2" topmargin="2" background='<%=path %>/img/allbg.gif'>
-			<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-				<tr bgcolor="#E7E7E7">
-					<td height="14" colspan="42" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-				</tr>
-				<tr align="center" bgcolor="#FAFAF1" height="22">
-					<td width="5%">搴忓彿</td>
-					<td width="7%">缂栧彿</td>
-					<td width="15%">鍚嶇О</td>
-					<td width="7%">浠嬬粛</td>
-					
-					<td width="7%">鍥剧墖</td>
-					<td width="7%">浠锋牸</td>
-					<td width="7%">鎿嶄綔</td>
-		        </tr>	
-				<c:forEach items="${requestScope.goodsList}" var="goods" varStatus="sta">
-				<tr align='center' bgcolor="#FFFFFF">
-					<td bgcolor="#FFFFFF" align="center">${sta.index+1}</td>
-					<td bgcolor="#FFFFFF" align="center">${goods.bianhao}</td>
-					<td bgcolor="#FFFFFF" align="center">${goods.mingcheng}</td>
-					<td bgcolor="#FFFFFF" align="center"><a href="#" onclick="goodsDetailHou(${goods.id})" class="pn-loperator">鍟嗗搧鎻忚堪</a></td>
-					<!--a href="#"琛ㄧず鑱旀帴鍒板綋鍓嶉〉闈�-->
-					<td bgcolor="#FFFFFF" align="center"><div onmouseover = "over('<%=path %>/${goods.fujian}')" onmouseout = "out()" style="cursor:hand;">鍥剧墖</div></td>
-					<!-- 褰撻紶鏍囩Щ涓婂幓鏄剧ず鑿滃搧鐨勫浘鐗囷紝榧犳爣绉诲紑鏃朵粈涔堜篃涓嶆樉绀� -->
-					<td bgcolor="#FFFFFF" align="center">${goods.shichangjia}</td> <!--甯傚満浠凤紝鍗宠彍鍝佺殑浠锋牸  -->
-					<td bgcolor="#FFFFFF" align="center">
-						<input type="button" value="鍒犻櫎" onclick="goodsDel(${goods.id})"/>
-						<input type="button" value="缂栬緫" onclick="goodsPre(${goods.id})"/>
-					</td>
-				</tr>
-				</c:forEach>
-			</table>
-		    
-		    
-		    <table width='98%'  border='0'style="margin-top:8px;margin-left: 8px;">
-			  <tr>
-			    <td>
-			      <input type="button" value="娣诲姞鑿滃搧淇℃伅" style="width: 120px;" onclick="goodsAdd()" />
-			    </td>
-			  </tr>
-		    </table>
-		    
-		    <div id="tip" style="position:absolute;display:none;border:0px;width:80px; height:80px;">
-		    <!-- 閫氳繃缁濆瀹氫綅鏉ュ鍥剧墖瀹氫綅锛屼笅闈㈣繘涓�姝ュ畾涔夊浘鐗囩殑鏄剧ず鏍煎紡 -->
-				<TABLE id="tipTable" border="0" bgcolor="#ffffee">
-					<TR align="center">
-						<TD><img id="photo" src="" height="150" width="150"></TD>
-					</TR>
-				</TABLE>
-			</div>
-	</body>
-</html>
diff --git a/goodsPre.jsp b/goodsPre.jsp
deleted file mode 100644
index 986c10a..0000000
--- a/goodsPre.jsp
+++ /dev/null
@@ -1,159 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false" %> 
-<%@ taglib uri="http://java.fckeditor.net" prefix="FCK"%>
-
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-        
-        <link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-        <script type="text/javascript" src="<%=path %>/js/popup.js"></script>
-        <script type='text/javascript' src='<%=path %>/dwr/interface/loginService.js'></script>
-        <script type='text/javascript' src='<%=path %>/dwr/engine.js'></script>
-        <script type='text/javascript' src='<%=path %>/dwr/util.js'></script>
-        <script language="javascript">
-           var i=0;//鑾峰彇鑿滃搧鐨勬墍鏈夌被鍒�
-           function catelogAll()
-           {
-               if(i==0)
-               {
-                   document.getElementById("indicator").style.display="block";
-                   loginService.catelogAll(callback);
-                   i=1;
-               }
-               
-           }
-           function callback(data)
-           {
-               document.getElementById("indicator").style.display="none";
-               DWRUtil.addOptions("catelog_id",data,"id","name");//鍒涘缓涓�绯诲垪灞炴�� 鏌ヨ鍑烘潵鐨勬暟鎹垎鍒～鍏� 鑿滃搧绫诲埆id锛岃彍鍝佺殑id锛岃彍鍝佺殑鍚嶅瓧
-           }
-           
-           
-           function up() //涓婁紶鍥剧墖鍑芥暟 閫氳繃Popup.js鎵撳紑瀵硅瘽妗�
-	       {
-		        var pop=new Popup({ contentType:1,isReloadOnClose:false,width:400,height:200}); //pop绫诲瀷涓�1锛屽唴宓宨frame锛屽叧闂悗涓嶉噸鏂板姞杞介〉闈�
-	            pop.setContent("contentUrl","<%=path %>/upload/upload.jsp");
-	            pop.setContent("title","鏂囦欢涓婁紶"); //璺宠浆鍒颁笂浼犵晫闈�
-	            pop.build();
-	            pop.show();
-	       }
-           
-           function check() //妫�鏌ヤ俊鎭槸鍚﹁緭鍏ュ畬鏁�
-           {
-               if(document.formAdd.catelog_id.value==0)
-               { 
-                   alert("璇烽�夋嫨绫诲埆");
-                   return false;
-               }
-               
-               if(document.formAdd.bianhao.value=="")
-               { 
-                   alert("璇疯緭鍏ョ紪鍙�");
-                   return false;
-               }
-               if(document.formAdd.mingcheng.value=="")
-               { 
-                   alert("璇疯緭鍏ュ悕绉�");
-                   return false;
-               }
-               return true;
-           }
-        </script>
-	</head>
-
-	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'>
-			<form action="<%=path %>/goods?type=goodsEdit" name="formAdd" method="post">
-				     <table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-						<tr bgcolor="#E7E7E7">
-							<td height="14" colspan="4" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						         绫诲埆锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <table border="0">
-							           <tr> 
-							               <td>  
-							                  <select name="catelog_id" id="catelog_id" style="width: 250px;" onclick="catelogAll()">
-									              <option value="0">璇烽�夋嫨绫诲埆</option>  <!--涓嬫媺鑿滃崟 -->
-									          </select>
-							               </td>
-							               <td>
-							                  <img id="indicator" src="<%=path %>/images/loading.gif" style="display:none"/> <!--鎻掑叆杞藉叆鍔ㄧ敾 -->
-							               </td>
-							           </tr>
-							    </table>
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						         缂栧彿锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="bianhao" style="width: 250px;" value="${requestScope.goods.bianhao }"/> <!--鑾峰彇鑿滃搧鐨勭紪鍙�-->
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						               鍚嶇О锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="mingcheng" style="width: 250px;" value="${requestScope.goods.mingcheng }"/>
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						         浠嬬粛锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <FCK:editor instanceName="jieshao"  basePath="/fckeditor" 
-						        width="550" height="200" value="${requestScope.goods.jieshao }" toolbarSet="Basic">
-	                            </FCK:editor> <!-- 鎻掑叆fck鍩烘湰鏍煎紡鐨勭紪杈戝櫒 -->
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						        鍥剧墖锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="fujian" id="fujian" value="${requestScope.goods.fujian }" style="width: 250px;" readonly="readonly"/><!--瑙勫畾鍥剧墖涓哄彧璇诲睘鎬�-->
-						        <input type="button" value="涓婁紶" onclick="up()"/>
-						        <input type="hidden" name="fujian" id="fujian"/>
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						              浠锋牸锛�
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="shichangjia" value="${requestScope.goods.shichangjia }" style="width: 250px;" onpropertychange="onchange1(this.value)" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"/>
-						        <!--鎻掑叆鑿滃搧鐨勪环鏍兼锛宱npropertychange褰撹緭鍏ユ灞炴�у彉鍖栨椂锛岃Е鍙憃nchange1灞炴�э紝淇敼鏁版嵁搴撹彍鍝佷环鏍� 涓嬩竴鍙ヤ负鎸夐敭涔嬪悗瑙﹀彂灏嗚緭鍏ュ�间负闈炴暟瀛楃殑瀛楃鏇挎崲涓虹┖锛岀矘璐翠箣鍚庤Е鍙戝皢杈撳叆鍊间负闈炴暟瀛楃殑瀛楃鏇挎崲涓虹┖ -->
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						        &nbsp;
-						    </td>
-						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						       <input type="hidden" name="id" value="${requestScope.goods.id }"/>
-						       <input type="submit" value="鎻愪氦" onclick="return check()"/>&nbsp; 
-						       <input type="reset" value="閲嶇疆"/>&nbsp;
-						    </td>
-						</tr>
-					 </table>
-			</form>
-   </body>
-</html>
diff --git a/goods_servlet.java b/goods_servlet.java
deleted file mode 100644
index d5f165b..0000000
--- a/goods_servlet.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package com.itbaizhan.action;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.itbaizhan.dao.DB;
-import com.itbaizhan.orm.Tgoods;
-import com.itbaizhan.service.liuService;
-
-public class goods_servlet extends HttpServlet {
-	// 处理所有的请求，根据type来区分不同的操作
-	public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String type = req.getParameter("type");
-
-		// 判断type并调用相应的方法进行处理
-		if (type.endsWith("goodsAdd")) {
-			goodsAdd(req, res);  // 添加商品
-		}
-		if (type.endsWith("goodsMana")) {
-			goodsMana(req, res); // 商品管理
-		}
-		if (type.endsWith("goodsDel")) {
-			goodsDel(req, res);  // 删除商品
-		}
-		if (type.endsWith("goodsDetailHou")) {
-			goodsDetailHou(req, res); // 后台查看商品详细信息
-		}
-		if (type.endsWith("goodsPre")) {
-			goodsPre(req, res); // 商品信息添加前的准备工作
-		}
-		if (type.endsWith("goodsEdit")) {
-			goodsEdit(req, res); // 编辑商品信息
-		}
-		if (type.endsWith("goodsNew")) {
-			goodsNew(req, res);  // 获取最新商品
-		}
-		if (type.endsWith("goodsByCatelog")) {
-			goodsByCatelog(req, res); // 按商品类别查看商品
-		}
-		if (type.endsWith("goodsDetailQian")) {
-			goodsDetailQian(req, res); // 前台查看商品详细信息
-		}
-		if (type.endsWith("goodsRes")) {
-			goodsRes(req, res); // 根据商品名称搜索商品
-		}
-	}
-
-	// 添加商品
-	public void goodsAdd(HttpServletRequest req, HttpServletResponse res) {
-		String id = String.valueOf(new Date().getTime()); // 使用当前时间戳作为商品 ID
-		String catelog_id = req.getParameter("catelog_id");
-		String bianhao = req.getParameter("bianhao");
-		String mingcheng = req.getParameter("mingcheng");
-		String jieshao = req.getParameter("jieshao");
-		String fujian = req.getParameter("fujian");
-		int shichangjia = Integer.parseInt(req.getParameter("shichangjia"));
-		int tejia = Integer.parseInt(req.getParameter("shichangjia"));  // 可能是设置的特价，暂时设置为与市场价一样
-
-		String del = "no"; // 标记商品未删除
-
-		// SQL语句插入商品数据
-		String sql = "insert into t_goods(id, catelog_id, bianhao, mingcheng, jieshao, fujian, shichangjia, tejia, del) values(?,?,?,?,?,?,?,?,?)";
-		Object[] params = {id, catelog_id, bianhao, mingcheng, jieshao, fujian, shichangjia, tejia, del};
-
-		// 使用数据库操作类执行插入操作
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行SQL插入
-		mydb.closed(); // 关闭数据库连接
-
-		// 返回操作成功信息并跳转至指定页面
-		req.setAttribute("msg", "操作成功");
-		String targetURL = "/common/msg.jsp";
-		dispatch(targetURL, req, res); // 转发到操作成功页面
-	}
-
-	// 商品管理，查看所有商品
-	public void goodsMana(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		List goodsList = new ArrayList();
-		String sql = "select * from t_goods where del='no'"; // 查询所有未删除的商品
-		Object[] params = {};
-
-		DB mydb = new DB();
-		try {
-			mydb.doPstm(sql, params); // 执行查询操作
-			ResultSet rs = mydb.getRs();
-			while (rs.next()) {
-				Tgoods goods = new Tgoods(); // 创建Tgoods对象并填充数据
-				goods.setId(rs.getString("id"));
-				goods.setCatelog_id(rs.getString("catelog_id"));
-				goods.setBianhao(rs.getString("bianhao"));
-				goods.setMingcheng(rs.getString("mingcheng"));
-				goods.setJieshao(rs.getString("jieshao"));
-				goods.setFujian(rs.getString("fujian"));
-				goods.setShichangjia(rs.getInt("shichangjia"));
-				goods.setTejia(rs.getInt("tejia"));
-				goods.setDel(rs.getString("del"));
-				goodsList.add(goods); // 将商品添加到列表中
-			}
-			rs.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-
-		// 将商品列表传递到前端页面
-		req.setAttribute("goodsList", goodsList);
-		req.getRequestDispatcher("admin/goods/goodsMana.jsp").forward(req, res);
-	}
-
-	// 删除商品
-	public void goodsDel(HttpServletRequest req, HttpServletResponse res) {
-		String id = req.getParameter("id");
-		String sql = "update t_goods set del='yes' where id=" + id; // 更新商品的del字段为'yes'表示删除
-		Object[] params = {};
-
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行删除操作
-		mydb.closed();
-
-		req.setAttribute("msg", "操作成功");
-		String targetURL = "/common/msg.jsp";
-		dispatch(targetURL, req, res); // 转发到操作成功页面
-	}
-
-	// 后台查看商品详细信息
-	public void goodsDetailHou(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String id = req.getParameter("id");
-
-		req.setAttribute("goods", liuService.getGoods(id)); // 从服务层获取商品详细信息
-		req.getRequestDispatcher("admin/goods/goodsDetailHou.jsp").forward(req, res);
-	}
-
-	// 商品信息添加前的准备工作
-	public void goodsPre(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		Tgoods goods = new Tgoods();
-		String sql = "select * from t_goods where id=?";
-		Object[] params = {req.getParameter("id")};
-
-		DB mydb = new DB();
-		try {
-			mydb.doPstm(sql, params); // 执行查询操作
-			ResultSet rs = mydb.getRs();
-			while (rs.next()) {
-				goods.setId(rs.getString("id"));
-				goods.setCatelog_id(rs.getString("catelog_id"));
-				goods.setBianhao(rs.getString("bianhao"));
-				goods.setMingcheng(rs.getString("mingcheng"));
-				goods.setJieshao(rs.getString("jieshao"));
-				goods.setFujian(rs.getString("fujian"));
-				goods.setShichangjia(rs.getInt("shichangjia"));
-				goods.setTejia(rs.getInt("tejia"));
-				goods.setDel(rs.getString("del"));
-			}
-			rs.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed();
-
-		req.setAttribute("goods", goods); // 将商品信息传递到前端页面
-		req.getRequestDispatcher("admin/goods/goodsPre.jsp").forward(req, res);
-	}
-
-	// 编辑商品信息
-	public void goodsEdit(HttpServletRequest req, HttpServletResponse res) {
-		String id = req.getParameter("id");
-		String catelog_id = req.getParameter("catelog_id");
-		String bianhao = req.getParameter("bianhao");
-		String mingcheng = req.getParameter("mingcheng");
-		String jieshao = req.getParameter("jieshao");
-		String fujian = req.getParameter("fujian");
-		int shichangjia = Integer.parseInt(req.getParameter("shichangjia"));
-		int tejia = Integer.parseInt(req.getParameter("shichangjia"));
-
-		// 更新商品信息
-		String sql = "update t_goods set catelog_id=?, bianhao=?, mingcheng=?, jieshao=?, fujian=?, shichangjia=?, tejia=? where id=?";
-		Object[] params = {catelog_id, bianhao, mingcheng, jieshao, fujian, shichangjia, tejia, id};
-
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行更新操作
-		mydb.closed();
-
-		req.setAttribute("msg", "操作成功");
-		String targetURL = "/common/msg.jsp";
-		dispatch(targetURL, req, res); // 转发到操作成功页面
-	}
-
-	// 获取最新商品
-	public void goodsNew(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		List goodsList = new ArrayList();
-		String sql = "select * from t_goods where del='no' order by id desc"; // 按商品ID降序排列，查询所有未删除的商品
-		Object[] params = {};
-
-		DB mydb = new DB();
-		try {
-			mydb.doPstm(sql, params); // 执行查询操作
-			ResultSet rs = mydb.getRs();
-			while (rs.next()) {
-				Tgoods goods = new Tgoods(); // 创建Tgoods对象并填充数据
-				goods.setId(rs.getString("id"));
-				goods.setCatelog_id(rs.getString("catelog_id"));
-				goods.setBianhao(rs.getString("bianhao"));
-				goods.setMingcheng(rs.getString("mingcheng"));
-				goods.setJieshao(rs.getString("jieshao"));
-				goods.setFujian(rs.getString("fujian"));
-				goods.setShichangjia(rs.getInt("shichangjia"));
-				goods.setTejia(rs.getInt("tejia"));
-				goods.setDel(rs.getString("del"));
-				goodsList.add(goods); // 将商品添加到列表中
-			}
-			rs.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-
-		// 限制最新商品显示数量最多为4个
-		if (goodsList.size() > 4) {
-			goodsList = goodsList.subList(0, 4); // 截取前4个商品
-		}
-
-		// 将商品列表传递到前端页面
-		req.setAttribute("goodsList", goodsList);
-		req.getRequestDispatcher("site/goods/goodsNew.jsp").forward(req, res); // 转发到前端页面显示最新商品
-	}
-
-	// 根据商品类别查看商品
-	public void goodsByCatelog(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String catelog_id = req.getParameter("catelog_id");
-
-		// 从服务层获取指定类别的商品列表
-		req.setAttribute("goodsList", liuService.goodsByCatelog(catelog_id));
-		req.getRequestDispatcher("site/goods/goodsByCatelog.jsp").forward(req, res); // 转发到前端页面显示商品类别
-	}
-
-	// 前台查看商品详细信息
-	public void goodsDetailQian(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String id = req.getParameter("id");
-
-		// 从服务层获取商品的详细信息
-		req.setAttribute("goods", liuService.getGoods(id));
-		req.getRequestDispatcher("site/goods/goodsDetailQian.jsp").forward(req, res); // 转发到前端页面显示商品详细信息
-	}
-
-	// 根据商品名称搜索商品
-	public void goodsRes(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String mingcheng = req.getParameter("mingcheng");
-
-		List goodsList = new ArrayList();
-		String sql = "select * from t_goods where del='no' and mingcheng like '%" + mingcheng.trim() + "%'"; // 根据商品名称进行模糊查询
-		Object[] params = {};
-
-		DB mydb = new DB();
-		try {
-			mydb.doPstm(sql, params); // 执行查询操作
-			ResultSet rs = mydb.getRs();
-			while (rs.next()) {
-				Tgoods goods = new Tgoods(); // 创建Tgoods对象并填充数据
-				goods.setId(rs.getString("id"));
-				goods.setCatelog_id(rs.getString("catelog_id"));
-				goods.setBianhao(rs.getString("bianhao"));
-				goods.setMingcheng(rs.getString("mingcheng"));
-				goods.setJieshao(rs.getString("jieshao"));
-				goods.setFujian(rs.getString("fujian"));
-				goods.setShichangjia(rs.getInt("shichangjia"));
-				goods.setTejia(rs.getInt("tejia"));
-				goods.setDel(rs.getString("del"));
-				goodsList.add(goods); // 将商品添加到列表中
-			}
-			rs.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-
-		// 将商品列表传递到前端页面
-		req.setAttribute("goodsList", goodsList);
-		req.getRequestDispatcher("site/goods/goodsRes.jsp").forward(req, res); // 转发到前端页面显示搜索结果
-	}
-
-	// 转发请求到指定页面
-	public void dispatch(String targetURI, HttpServletRequest request, HttpServletResponse response) {
-		RequestDispatcher dispatch = getServletContext().getRequestDispatcher(targetURI);
-		try {
-			dispatch.forward(request, response); // 转发请求到目标页面
-		} catch (ServletException e) {
-			e.printStackTrace(); // 捕获并打印异常
-		} catch (IOException e) {
-			e.printStackTrace(); // 捕获并打印异常
-		}
-	}
-
-	// 初始化方法，初始化Servlet时调用
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config); // 调用父类的init()方法进行初始化
-	}
-
-	// 销毁方法，在Servlet销毁时调用
-	public void destroy() {
-		// 在Servlet销毁时执行清理工作，如果有的话
-	}
-}
diff --git a/index_servlet.java b/index_servlet.java
deleted file mode 100644
index 1daeb81..0000000
--- a/index_servlet.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.itbaizhan.action;
-
-import java.io.IOException;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.itbaizhan.service.liuService;
-
-public class index_servlet extends HttpServlet
-// 导航页面服务端小程序
-{
-	/**
-	 * service方法是处理请求的核心方法
-	 * 这个方法会接收客户端的请求，并做出响应。
-	 * 1. 从服务层获取商品分类数据
-	 * 2. 将数据保存到session中，以便前端页面使用
-	 * 3. 转发请求到首页（index.jsp）
-	 */
-	public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
-	{
-		// 从liuService类中获取商品分类数据，并将其保存到session中
-		req.getSession().setAttribute("catelogList", liuService.catelogList());
-
-		// 转发请求到首页index.jsp页面，这个页面会使用“catelogList”来展示商品分类
-		req.getRequestDispatcher("site/index.jsp").forward(req, res);
-	}
-
-	/**
-	 * dispatch方法用于请求的转发
-	 * 用于将请求转发到指定的目标URI。
-	 * 这里传入的目标URI通常是JSP页面，用于显示数据。
-	 */
-	public void dispatch(String targetURI, HttpServletRequest request, HttpServletResponse response)
-	{
-		RequestDispatcher dispatch = getServletContext().getRequestDispatcher(targetURI); // 获取请求转发器
-
-		try
-		{
-			// 转发请求到目标页面
-			dispatch.forward(request, response);
-			return;
-		}
-		catch (ServletException e)
-		{
-			e.printStackTrace(); // 捕获并打印ServletException
-		}
-		catch (IOException e)
-		{
-			e.printStackTrace(); // 捕获并打印IOException
-		}
-	}
-
-	/**
-	 * init方法用于Servlet初始化时的设置
-	 * 在Servlet创建时调用，用于做一些必要的初始化工作。
-	 * 这里调用了父类的init()方法，但没有额外的初始化逻辑。
-	 */
-	public void init(ServletConfig config) throws ServletException
-	{
-		super.init(config); // 调用父类的init()方法进行初始化
-	}
-
-	/**
-	 * destroy方法在Servlet销毁时调用
-	 * 可以用来释放资源，如关闭数据库连接、清理内存等。
-	 * 这里没有特别的销毁逻辑，留作将来扩展使用。
-	 */
-	public void destroy()
-	{
-		// 销毁时执行清理工作，如果需要
-	}
-}
diff --git a/js/popup.js b/js/popup.js
new file mode 100644
index 0000000..908b32f
--- /dev/null
+++ b/js/popup.js
@@ -0,0 +1,188 @@
+锘縱ar tcolor={
+    cColor:"#EEEEEE", //钂欑毊棰滆壊
+    bColor:"#FFFFFF", //鑳屾櫙棰滆壊
+    tColor:"#9C9E9C", //鏍囬鑳屾櫙棰滆壊锛岃竟妗嗛鑹�
+    wColor:"#FFFFFF" //鏍囬鏂囧瓧棰滆壊
+   };
+
+function popclose()
+{
+var a = parent.document.getElementById("dialogBoxClose");
+a.click();
+}
+
+if(!Array.prototype.push){
+Array.prototype.push=function(){
+   var startLength=this.length;
+   for(var i=0;i<arguments.length;i++)
+    this[startLength+i]=arguments[i];
+   return this.length;
+}
+};
+function G(){
+  //alert("aa");
+   var elements=new Array();
+   for(var i=0;i<arguments.length;i++){
+    var element=arguments[i];
+    if(typeof element=='string')
+     element=document.getElementById(element);
+    if(arguments.length==1)
+     return element;elements.push(element)
+   };
+   return elements
+};
+Function.prototype.bind=function(object){
+var __method=this;
+return function(){__method.apply(object,arguments)}
+};
+Function.prototype.bindAsEventListener=function(object){
+var __method=this;
+return function(event){__method.call(object,event||window.event)}
+};
+Object.extend=function(destination,source){
+for(property in source){destination[property]=source[property]};return destination
+};
+if(!window.Event){var Event=new Object()};
+Object.extend(Event,{observers:false,element:function(event){return event.target||event.srcElement},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)))},pointerX:function(event){return event.pageX||(event.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft))},pointerY:function(event){return event.pageY||(event.clientY+(document.documentElement.scrollTop||document.body.scrollTop))},stop:function(event){if(event.preventDefault){event.preventDefault();event.stopPropagation()}else{event.returnValue=false;event.cancelBubble=true}},findElement:function(event,tagName){var element=Event.element(event);while(element.parentNode&&(!element.tagName||(element.tagName.toUpperCase()!=tagName.toUpperCase())))element=element.parentNode;return element},_observeAndCache:function(element,name,observer,useCapture){if(!this.observers)this.observers=[];if(element.addEventListener){this.observers.push([element,name,observer,useCapture]);element.addEventListener(name,observer,useCapture)}else if(element.attachEvent){this.observers.push([element,name,observer,useCapture]);element.attachEvent('on'+name,observer)}},unloadCache:function(){if(!Event.observers)return;for(var i=0;i<Event.observers.length;i++){Event.stopObserving.apply(this,Event.observers[i]);Event.observers[i][0]=null};Event.observers=false},observe:function(element,name,observer,useCapture){var element=G(element);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.attachEvent))name='keydown';this._observeAndCache(element,name,observer,useCapture)},stopObserving:function(element,name,observer,useCapture){var element=G(element);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.detachEvent))name='keydown';if(element.removeEventListener){element.removeEventListener(name,observer,useCapture)}else if(element.detachEvent){element.detachEvent('on'+name,observer)}}});
+Event.observe(window,'unload',Event.unloadCache,false);
+var Class=function(){
+var _class=function(){
+   this.initialize.apply(this,arguments)
+};
+for(i=0;i<arguments.length;i++){
+   superClass=arguments[i];for(member in superClass.prototype){_class.prototype[member]=superClass.prototype[member]}
+};
+_class.child=function(){return new Class(this)};
+_class.extend=function(f){for(property in f){_class.prototype[property]=f[property]}};
+return _class
+};
+function space(flag){
+if(flag=="begin"){
+   var ele=document.getElementById("ft");
+   if(typeof(ele)!="undefined"&&ele!=null)
+    ele.id="ft_popup";
+   ele=document.getElementById("usrbar");
+   if(typeof(ele)!="undefined"&&ele!=null)
+    ele.id="usrbar_popup"
+}
+else if(flag=="end"){
+   var ele=document.getElementById("ft_popup");
+   if(typeof(ele)!="undefined"&&ele!=null)ele.id="ft";
+   ele=document.getElementById("usrbar_popup");
+   if(typeof(ele)!="undefined"&&ele!=null)ele.id="usrbar"}
+};
+// Popup Class begin....
+var Popup=new Class();
+Popup.prototype={
+iframeIdName:'ifr_popup', //iframe鐨勫悕瀛�
+initialize:function(config){
+   this.config=Object.extend({ //灞炴�ц缃�
+    contentType:1, //pop绫诲瀷 1. 鍐呭祵iframe锛�2. 鏄剧ず缁欏畾鐨刪tml 3. confirm妗� 4. alert妗�
+    isHaveTitle:true, //鏄惁鏈夋爣棰樻爮
+    scrollType:'yes', //鍐呭祵iframe鏄惁鍙互婊氬姩
+    isBackgroundCanClick:false, //鑳屾櫙鏄惁鍙互鐐瑰嚮
+    isSupportDraging:true, //鏄惁鏀寔鎷栧姩
+    isShowShadow:true, //鏄惁鏄剧ず闃村奖
+    isReloadOnClose:true, //鍏抽棴鍚庢槸鍚﹂噸鏂板姞杞介〉闈�
+    width:400, //瀹藉害
+    height:300 //楂樺害
+   },config||{});
+   this.info={ //鍙傛暟
+    shadowWidth:0, //闃村奖瀹藉害
+    title:"", //鏍囬
+    contentUrl:"", //iframe鐨剈rl
+    contentHtml:"", //鍐呭鐨刪tml
+    callBack:null, //鍥炶皟鍑芥暟
+    parameter:null, //璋冪敤鐨勫弬鏁� 濡� {id:"divCall",str:"鐐瑰嚮纭畾鍚庢樉绀虹殑瀛楃涓�",obj:pop}
+    confirmCon:"", //confirm鐨勫唴瀹�
+    alertCon:"", //alert鐨勫唴瀹�
+    someHiddenTag:"select,object,embed", //鑷姩闅愯棌鐨勯〉闈㈠厓绱�
+    someDisabledBtn:"", //绂佺敤鐨刡tn
+    someHiddenEle:"", //闅愯棌鐨勫寑閫�
+    overlay:0, //瑕嗙洊
+    coverOpacity:0 //钂欑毊涓嶉�忔槑搴�
+   };
+    this.color=tcolor;
+    this.dropClass=null;
+    this.someToHidden=[];
+    this.someToDisabled=[];
+    if(!this.config.isHaveTitle)
+     this.config.isSupportDraging=false;
+    this.iniBuild()
+},
+setContent:function(arrt,val){ //璁剧疆鍐呭锛屽嵆 this.info 鐨勫弬鏁板唴瀹�
+   if(val!=''){
+    switch(arrt){
+     case 'width':this.config.width=val;break;
+     case 'height':this.config.height=val;break;
+     case 'title':this.info.title=val;break;
+     case 'contentUrl':this.info.contentUrl=val;break;
+     case 'contentHtml':this.info.contentHtml=val;break;
+     case 'callBack':this.info.callBack=val;break;
+     case 'parameter':this.info.parameter=val;break;
+     case 'confirmCon':this.info.confirmCon=val;break;
+     case 'alertCon':this.info.alertCon=val;break;
+     case 'someHiddenTag':this.info.someHiddenTag=val;break;
+     case 'someHiddenEle':this.info.someHiddenEle=val;break;
+     case 'someDisabledBtn':this.info.someDisabledBtn=val;break;
+     case 'overlay':this.info.overlay=val}
+   }
+},
+iniBuild:function(){
+   G('dialogCase')?G('dialogCase').parentNode.removeChild(G('dialogCase')):function(){};
+   var oDiv=document.createElement('span');oDiv.id='dialogCase';document.body.appendChild(oDiv)
+},
+build:function(){
+   var baseZIndex=10001+this.info.overlay*10;
+   var showZIndex=baseZIndex+2;this.iframeIdName='ifr_popup'+this.info.overlay;
+   //鍏抽棴鎸夐挳
+   //var path="http://img.baidu.com/hi/img/";
+   //var close='<input type="image" id="dialogBoxClose" src="'+path+'dialogclose.gif" border="0" width="16" height="16" align="absmiddle" title="鍏抽棴"/>';
+   var close='<img id="dialogBoxClose" title="鍏抽棴" src=/dingcan/images/dialogclose.gif  />';
+   var cB='filter: alpha(opacity='+this.info.coverOpacity+');opacity:'+this.info.coverOpacity/100+';';
+   var cover='<div id="dialogBoxBG" style="position:absolute;top:0px;left:0px;width:100%;height:100%;z-index:'+baseZIndex+';'+cB+'background-color:'+this.color.cColor+';display:none;"></div>';
+   var mainBox='<div id="dialogBox" style="border:1px solid '+this.color.tColor+';display:none;z-index:'+showZIndex+';position:relative;width:'+this.config.width+'px;"><table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="'+this.color.bColor+'">';if(this.config.isHaveTitle){mainBox+='<tr height="24" bgcolor="'+this.color.tColor+'"><td><table style="-moz-user-select:none;height:24px;" width="100%" border="0" cellpadding="0" cellspacing="0" ><tr>'+'<td width="6" height="24"></td><td id="dialogBoxTitle" style="color:'+this.color.wColor+';font-size:14px;font-weight:bold;">'+this.info.title+'&nbsp;</td>'+'<td id="dialogClose" width="20" align="right" valign="middle">'+close+'</td><td width="6"></td></tr></table></td></tr>'}
+   else{mainBox+='<tr height="10"><td align="right">'+close+'</td></tr>'};
+   mainBox+='<tr style="height:'+this.config.height+'px" valign="top"><td id="dialogBody" style="position:relative;"></td></tr></table></div>'+'<div id="dialogBoxShadow" style="display:none;z-index:'+baseZIndex+';"></div>';
+   if(!this.config.isBackgroundCanClick){G('dialogCase').innerHTML=cover+mainBox;G('dialogBoxBG').style.height=document.body.scrollHeight}
+   else G('dialogCase').innerHTML=mainBox;Event.observe(G('dialogBoxClose'),"click",this.reset.bindAsEventListener(this),false);
+   if(this.config.isSupportDraging){dropClass=new Dragdrop(this.config.width,this.config.height,this.info.shadowWidth,this.config.isSupportDraging,this.config.contentType);G("dialogBoxTitle").style.cursor="move"};this.lastBuild()},lastBuild:function(){var confirm='<div style="width:100%;height:100%;text-align:center;"><div style="margin:20px 20px 0 20px;font-size:14px;line-height:16px;color:#000000;">'+this.info.confirmCon+'</div><div style="margin:20px;"><input id="dialogOk" type="button" value=" 纭畾 "/>&nbsp;<input id="dialogCancel" type="button" value=" 鍙栨秷 "/></div></div>';
+   var alert='<div style="width:100%;height:100%;text-align:center;"><div style="margin:20px 20px 0 20px;font-size:14px;line-height:16px;color:#000000;">'+this.info.alertCon+'</div><div style="margin:20px;"><input id="dialogYES" type="button" value=" 纭畾 "/></div></div>';
+   var baseZIndex=10001+this.info.overlay*10;var coverIfZIndex=baseZIndex+4;
+   if(this.config.contentType==1){var openIframe="<iframe width='100%' style='height:"+this.config.height+"px' name='"+this.iframeIdName+"' id='"+this.iframeIdName+"' src='"+this.info.contentUrl+"' frameborder='0' scrolling='"+this.config.scrollType+"'></iframe>";
+   var coverIframe="<div id='iframeBG' style='position:absolute;top:0px;left:0px;width:1px;height:1px;z-index:"+coverIfZIndex+";filter: alpha(opacity=00);opacity:0.00;background-color:#ffffff;'><div>";G("dialogBody").innerHTML=openIframe+coverIframe}
+   else if(this.config.contentType==2){G("dialogBody").innerHTML=this.info.contentHtml}else if(this.config.contentType==3){G("dialogBody").innerHTML=confirm;Event.observe(G('dialogOk'),"click",this.forCallback.bindAsEventListener(this),false);
+   Event.observe(G('dialogCancel'),"click",this.close.bindAsEventListener(this),false)}else if(this.config.contentType==4){G("dialogBody").innerHTML=alert;Event.observe(G('dialogYES'),"click",this.close.bindAsEventListener(this),false)}},reBuild:function(){G('dialogBody').height=G('dialogBody').clientHeight;this.lastBuild()},show:function(){this.hiddenSome();this.middle();if(this.config.isShowShadow)this.shadow()},forCallback:function(){return this.info.callBack(this.info.parameter)},shadow:function(){var oShadow=G('dialogBoxShadow');var oDialog=G('dialogBox');oShadow['style']['position']="absolute";oShadow['style']['background']="#000";oShadow['style']['display']="";oShadow['style']['opacity']="0.2";oShadow['style']['filter']="alpha(opacity=20)";oShadow['style']['top']=oDialog.offsetTop+this.info.shadowWidth;oShadow['style']['left']=oDialog.offsetLeft+this.info.shadowWidth;oShadow['style']['width']=oDialog.offsetWidth;oShadow['style']['height']=oDialog.offsetHeight},middle:function(){if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display='';
+   var oDialog=G('dialogBox');
+   oDialog['style']['position']="absolute";
+   oDialog['style']['display']='';
+   //鍙栧緱椤甸潰鐨勫搴﹀拰楂樺害
+   var sClientWidth=document.body.clientWidth;
+   var sClientHeight=document.body.clientHeight;
+   var sScrollTop=document.body.scrollTop;
+   //
+   var sleft=(sClientWidth/2)-(oDialog.offsetWidth/2);
+   var iTop=-80+(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2);
+   var sTop=iTop>0?iTop:(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2);
+   if(sTop<1)sTop="20";if(sleft<1)sleft="20";
+   oDialog['style']['left']=sleft+"px"; //宸︿晶浣嶇疆
+   oDialog['style']['top']=220+"px"     //椤堕儴浣嶇疆
+   },
+   reset:function(){if(this.config.isReloadOnClose){top.location.reload()};this.close()},close:function(){G('dialogBox').style.display='none';
+   if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display='none';
+   if(this.config.isShowShadow)G('dialogBoxShadow').style.display='none';G('dialogBody').innerHTML='';
+   this.showSome()},hiddenSome:function(){var tag=this.info.someHiddenTag.split(",");
+   if(tag.length==1&&tag[0]=="")tag.length=0;
+   for(var i=0;i<tag.length;i++){this.hiddenTag(tag[i])};
+   var ids=this.info.someHiddenEle.split(",");
+   if(ids.length==1&&ids[0]=="")ids.length=0;
+   for(var i=0;i<ids.length;i++){this.hiddenEle(ids[i])};
+   var ids=this.info.someDisabledBtn.split(",");
+   if(ids.length==1&&ids[0]=="")ids.length=0;
+   for(var i=0;i<ids.length;i++){this.disabledBtn(ids[i])};
+   space("begin")},disabledBtn:function(id){var ele=document.getElementById(id);
+   if(typeof(ele)!="undefined"&&ele!=null&&ele.disabled==false){ele.disabled=true;this.someToDisabled.push(ele)}},hiddenTag:function(tagName){var ele=document.getElementsByTagName(tagName);
+   if(ele!=null){for(var i=0;i<ele.length;i++){if(ele[i].style.display!="none"&&ele[i].style.visibility!='hidden'){ele[i].style.visibility='hidden';this.someToHidden.push(ele[i])}}}},hiddenEle:function(id){var ele=document.getElementById(id);if(typeof(ele)!="undefined"&&ele!=null){ele.style.visibility='hidden';this.someToHidden.push(ele)}},showSome:function(){for(var i=0;i<this.someToHidden.length;i++){this.someToHidden[i].style.visibility='visible'};for(var i=0;i<this.someToDisabled.length;i++){this.someToDisabled[i].disabled=false};space("end")}};var Dragdrop=new Class();Dragdrop.prototype={initialize:function(width,height,shadowWidth,showShadow,contentType){this.dragData=null;this.dragDataIn=null;this.backData=null;this.width=width;this.height=height;this.shadowWidth=shadowWidth;this.showShadow=showShadow;this.contentType=contentType;this.IsDraging=false;this.oObj=G('dialogBox');Event.observe(G('dialogBoxTitle'),"mousedown",this.moveStart.bindAsEventListener(this),false)},moveStart:function(event){this.IsDraging=true;if(this.contentType==1){G("iframeBG").style.display="";G("iframeBG").style.width=this.width;G("iframeBG").style.height=this.height};Event.observe(document,"mousemove",this.mousemove.bindAsEventListener(this),false);Event.observe(document,"mouseup",this.mouseup.bindAsEventListener(this),false);Event.observe(document,"selectstart",this.returnFalse,false);this.dragData={x:Event.pointerX(event),y:Event.pointerY(event)};this.backData={x:parseInt(this.oObj.style.left),y:parseInt(this.oObj.style.top)}},mousemove:function(event){if(!this.IsDraging)return;var iLeft=Event.pointerX(event)-this.dragData["x"]+parseInt(this.oObj.style.left);var iTop=Event.pointerY(event)-this.dragData["y"]+parseInt(this.oObj.style.top);if(this.dragData["y"]<parseInt(this.oObj.style.top))iTop=iTop-12;else if(this.dragData["y"]>parseInt(this.oObj.style.top)+25)iTop=iTop+12;this.oObj.style.left=iLeft;this.oObj.style.top=iTop;if(this.showShadow){G('dialogBoxShadow').style.left=iLeft+this.shadowWidth;G('dialogBoxShadow').style.top=iTop+this.shadowWidth};this.dragData={x:Event.pointerX(event),y:Event.pointerY(event)};document.body.style.cursor="move"},mouseup:function(event){if(!this.IsDraging)return;if(this.contentType==1)G("iframeBG").style.display="none";document.onmousemove=null;document.onmouseup=null;var mousX=Event.pointerX(event)-(document.documentElement.scrollLeft||document.body.scrollLeft);var mousY=Event.pointerY(event)-(document.documentElement.scrollTop||document.body.scrollTop);if(mousX<1||mousY<1||mousX>document.body.clientWidth||mousY>document.body.clientHeight){this.oObj.style.left=this.backData["x"];this.oObj.style.top=this.backData["y"];if(this.showShadow){G('dialogBoxShadow').style.left=this.backData.x+this.shadowWidth;G('dialogBoxShadow').style.top=this.backData.y+this.shadowWidth}};this.IsDraging=false;document.body.style.cursor="";Event.stopObserving(document,"selectstart",this.returnFalse,false)},returnFalse:function(){return false}};
+
+
+
diff --git a/js/popup_shuaxin.js b/js/popup_shuaxin.js
new file mode 100644
index 0000000..c298f21
--- /dev/null
+++ b/js/popup_shuaxin.js
@@ -0,0 +1,188 @@
+锘縱ar tcolor={
+    cColor:"#EEEEEE", //钂欑毊棰滆壊
+    bColor:"#FFFFFF", //鑳屾櫙棰滆壊
+    tColor:"#9C9E9C", //鏍囬鑳屾櫙棰滆壊锛岃竟妗嗛鑹�
+    wColor:"#FFFFFF" //鏍囬鏂囧瓧棰滆壊
+   };
+
+function popclose()
+{
+var a = parent.document.getElementById("dialogBoxClose");
+a.click();
+}
+
+if(!Array.prototype.push){
+Array.prototype.push=function(){
+   var startLength=this.length;
+   for(var i=0;i<arguments.length;i++)
+    this[startLength+i]=arguments[i];
+   return this.length;
+}
+};
+function G(){
+  //alert("aa");
+   var elements=new Array();
+   for(var i=0;i<arguments.length;i++){
+    var element=arguments[i];
+    if(typeof element=='string')
+     element=document.getElementById(element);
+    if(arguments.length==1)
+     return element;elements.push(element)
+   };
+   return elements
+};
+Function.prototype.bind=function(object){
+var __method=this;
+return function(){__method.apply(object,arguments)}
+};
+Function.prototype.bindAsEventListener=function(object){
+var __method=this;
+return function(event){__method.call(object,event||window.event)}
+};
+Object.extend=function(destination,source){
+for(property in source){destination[property]=source[property]};return destination
+};
+if(!window.Event){var Event=new Object()};
+Object.extend(Event,{observers:false,element:function(event){return event.target||event.srcElement},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)))},pointerX:function(event){return event.pageX||(event.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft))},pointerY:function(event){return event.pageY||(event.clientY+(document.documentElement.scrollTop||document.body.scrollTop))},stop:function(event){if(event.preventDefault){event.preventDefault();event.stopPropagation()}else{event.returnValue=false;event.cancelBubble=true}},findElement:function(event,tagName){var element=Event.element(event);while(element.parentNode&&(!element.tagName||(element.tagName.toUpperCase()!=tagName.toUpperCase())))element=element.parentNode;return element},_observeAndCache:function(element,name,observer,useCapture){if(!this.observers)this.observers=[];if(element.addEventListener){this.observers.push([element,name,observer,useCapture]);element.addEventListener(name,observer,useCapture)}else if(element.attachEvent){this.observers.push([element,name,observer,useCapture]);element.attachEvent('on'+name,observer)}},unloadCache:function(){if(!Event.observers)return;for(var i=0;i<Event.observers.length;i++){Event.stopObserving.apply(this,Event.observers[i]);Event.observers[i][0]=null};Event.observers=false},observe:function(element,name,observer,useCapture){var element=G(element);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.attachEvent))name='keydown';this._observeAndCache(element,name,observer,useCapture)},stopObserving:function(element,name,observer,useCapture){var element=G(element);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.detachEvent))name='keydown';if(element.removeEventListener){element.removeEventListener(name,observer,useCapture)}else if(element.detachEvent){element.detachEvent('on'+name,observer)}}});
+Event.observe(window,'unload',Event.unloadCache,false);
+var Class=function(){
+var _class=function(){
+   this.initialize.apply(this,arguments)
+};
+for(i=0;i<arguments.length;i++){
+   superClass=arguments[i];for(member in superClass.prototype){_class.prototype[member]=superClass.prototype[member]}
+};
+_class.child=function(){return new Class(this)};
+_class.extend=function(f){for(property in f){_class.prototype[property]=f[property]}};
+return _class
+};
+function space(flag){
+if(flag=="begin"){
+   var ele=document.getElementById("ft");
+   if(typeof(ele)!="undefined"&&ele!=null)
+    ele.id="ft_popup";
+   ele=document.getElementById("usrbar");
+   if(typeof(ele)!="undefined"&&ele!=null)
+    ele.id="usrbar_popup"
+}
+else if(flag=="end"){
+   var ele=document.getElementById("ft_popup");
+   if(typeof(ele)!="undefined"&&ele!=null)ele.id="ft";
+   ele=document.getElementById("usrbar_popup");
+   if(typeof(ele)!="undefined"&&ele!=null)ele.id="usrbar"}
+};
+// Popup Class begin....
+var Popup=new Class();
+Popup.prototype={
+iframeIdName:'ifr_popup', //iframe鐨勫悕瀛�
+initialize:function(config){
+   this.config=Object.extend({ //灞炴�ц缃�
+    contentType:1, //pop绫诲瀷 1. 鍐呭祵iframe锛�2. 鏄剧ず缁欏畾鐨刪tml 3. confirm妗� 4. alert妗�
+    isHaveTitle:true, //鏄惁鏈夋爣棰樻爮
+    scrollType:'yes', //鍐呭祵iframe鏄惁鍙互婊氬姩
+    isBackgroundCanClick:false, //鑳屾櫙鏄惁鍙互鐐瑰嚮
+    isSupportDraging:true, //鏄惁鏀寔鎷栧姩
+    isShowShadow:true, //鏄惁鏄剧ず闃村奖
+    isReloadOnClose:true, //鍏抽棴鍚庢槸鍚﹂噸鏂板姞杞介〉闈�
+    width:400, //瀹藉害
+    height:300 //楂樺害
+   },config||{});
+   this.info={ //鍙傛暟
+    shadowWidth:0, //闃村奖瀹藉害
+    title:"", //鏍囬
+    contentUrl:"", //iframe鐨剈rl
+    contentHtml:"", //鍐呭鐨刪tml
+    callBack:null, //鍥炶皟鍑芥暟
+    parameter:null, //璋冪敤鐨勫弬鏁� 濡� {id:"divCall",str:"鐐瑰嚮纭畾鍚庢樉绀虹殑瀛楃涓�",obj:pop}
+    confirmCon:"", //confirm鐨勫唴瀹�
+    alertCon:"", //alert鐨勫唴瀹�
+    someHiddenTag:"select,object,embed", //鑷姩闅愯棌鐨勯〉闈㈠厓绱�
+    someDisabledBtn:"", //绂佺敤鐨刡tn
+    someHiddenEle:"", //闅愯棌鐨勫寑閫�
+    overlay:0, //瑕嗙洊
+    coverOpacity:0 //钂欑毊涓嶉�忔槑搴�
+   };
+    this.color=tcolor;
+    this.dropClass=null;
+    this.someToHidden=[];
+    this.someToDisabled=[];
+    if(!this.config.isHaveTitle)
+     this.config.isSupportDraging=false;
+    this.iniBuild()
+},
+setContent:function(arrt,val){ //璁剧疆鍐呭锛屽嵆 this.info 鐨勫弬鏁板唴瀹�
+   if(val!=''){
+    switch(arrt){
+     case 'width':this.config.width=val;break;
+     case 'height':this.config.height=val;break;
+     case 'title':this.info.title=val;break;
+     case 'contentUrl':this.info.contentUrl=val;break;
+     case 'contentHtml':this.info.contentHtml=val;break;
+     case 'callBack':this.info.callBack=val;break;
+     case 'parameter':this.info.parameter=val;break;
+     case 'confirmCon':this.info.confirmCon=val;break;
+     case 'alertCon':this.info.alertCon=val;break;
+     case 'someHiddenTag':this.info.someHiddenTag=val;break;
+     case 'someHiddenEle':this.info.someHiddenEle=val;break;
+     case 'someDisabledBtn':this.info.someDisabledBtn=val;break;
+     case 'overlay':this.info.overlay=val}
+   }
+},
+iniBuild:function(){
+   G('dialogCase')?G('dialogCase').parentNode.removeChild(G('dialogCase')):function(){};
+   var oDiv=document.createElement('span');oDiv.id='dialogCase';document.body.appendChild(oDiv)
+},
+build:function(){
+   var baseZIndex=10001+this.info.overlay*10;
+   var showZIndex=baseZIndex+2;this.iframeIdName='ifr_popup'+this.info.overlay;
+   //鍏抽棴鎸夐挳
+   //var path="http://img.baidu.com/hi/img/";
+   //var close='<input type="image" id="dialogBoxClose" src="'+path+'dialogclose.gif" border="0" width="16" height="16" align="absmiddle" title="鍏抽棴"/>';
+   var close='<img id="dialogBoxClose" title="鍏抽棴" src=/dingcan/images/dialogclose.gif  />';
+   var cB='filter: alpha(opacity='+this.info.coverOpacity+');opacity:'+this.info.coverOpacity/100+';';
+   var cover='<div id="dialogBoxBG" style="position:absolute;top:0px;left:0px;width:100%;height:100%;z-index:'+baseZIndex+';'+cB+'background-color:'+this.color.cColor+';display:none;"></div>';
+   var mainBox='<div id="dialogBox" style="border:1px solid '+this.color.tColor+';display:none;z-index:'+showZIndex+';position:relative;width:'+this.config.width+'px;"><table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="'+this.color.bColor+'">';if(this.config.isHaveTitle){mainBox+='<tr height="24" bgcolor="'+this.color.tColor+'"><td><table style="-moz-user-select:none;height:24px;" width="100%" border="0" cellpadding="0" cellspacing="0" ><tr>'+'<td width="6" height="24"></td><td id="dialogBoxTitle" style="color:'+this.color.wColor+';font-size:14px;font-weight:bold;">'+this.info.title+'&nbsp;</td>'+'<td id="dialogClose" width="20" align="right" valign="middle">'+close+'</td><td width="6"></td></tr></table></td></tr>'}
+   else{mainBox+='<tr height="10"><td align="right">'+close+'</td></tr>'};
+   mainBox+='<tr style="height:'+this.config.height+'px" valign="top"><td id="dialogBody" style="position:relative;"></td></tr></table></div>'+'<div id="dialogBoxShadow" style="display:none;z-index:'+baseZIndex+';"></div>';
+   if(!this.config.isBackgroundCanClick){G('dialogCase').innerHTML=cover+mainBox;G('dialogBoxBG').style.height=document.body.scrollHeight}
+   else G('dialogCase').innerHTML=mainBox;Event.observe(G('dialogBoxClose'),"click",this.reset.bindAsEventListener(this),false);
+   if(this.config.isSupportDraging){dropClass=new Dragdrop(this.config.width,this.config.height,this.info.shadowWidth,this.config.isSupportDraging,this.config.contentType);G("dialogBoxTitle").style.cursor="move"};this.lastBuild()},lastBuild:function(){var confirm='<div style="width:100%;height:100%;text-align:center;"><div style="margin:20px 20px 0 20px;font-size:14px;line-height:16px;color:#000000;">'+this.info.confirmCon+'</div><div style="margin:20px;"><input id="dialogOk" type="button" value=" 纭畾 "/>&nbsp;<input id="dialogCancel" type="button" value=" 鍙栨秷 "/></div></div>';
+   var alert='<div style="width:100%;height:100%;text-align:center;"><div style="margin:20px 20px 0 20px;font-size:14px;line-height:16px;color:#000000;">'+this.info.alertCon+'</div><div style="margin:20px;"><input id="dialogYES" type="button" value=" 纭畾 "/></div></div>';
+   var baseZIndex=10001+this.info.overlay*10;var coverIfZIndex=baseZIndex+4;
+   if(this.config.contentType==1){var openIframe="<iframe width='100%' style='height:"+this.config.height+"px' name='"+this.iframeIdName+"' id='"+this.iframeIdName+"' src='"+this.info.contentUrl+"' frameborder='0' scrolling='"+this.config.scrollType+"'></iframe>";
+   var coverIframe="<div id='iframeBG' style='position:absolute;top:0px;left:0px;width:1px;height:1px;z-index:"+coverIfZIndex+";filter: alpha(opacity=00);opacity:0.00;background-color:#ffffff;'><div>";G("dialogBody").innerHTML=openIframe+coverIframe}
+   else if(this.config.contentType==2){G("dialogBody").innerHTML=this.info.contentHtml}else if(this.config.contentType==3){G("dialogBody").innerHTML=confirm;Event.observe(G('dialogOk'),"click",this.forCallback.bindAsEventListener(this),false);
+   Event.observe(G('dialogCancel'),"click",this.close.bindAsEventListener(this),false)}else if(this.config.contentType==4){G("dialogBody").innerHTML=alert;Event.observe(G('dialogYES'),"click",this.close.bindAsEventListener(this),false)}},reBuild:function(){G('dialogBody').height=G('dialogBody').clientHeight;this.lastBuild()},show:function(){this.hiddenSome();this.middle();if(this.config.isShowShadow)this.shadow()},forCallback:function(){return this.info.callBack(this.info.parameter)},shadow:function(){var oShadow=G('dialogBoxShadow');var oDialog=G('dialogBox');oShadow['style']['position']="absolute";oShadow['style']['background']="#000";oShadow['style']['display']="";oShadow['style']['opacity']="0.2";oShadow['style']['filter']="alpha(opacity=20)";oShadow['style']['top']=oDialog.offsetTop+this.info.shadowWidth;oShadow['style']['left']=oDialog.offsetLeft+this.info.shadowWidth;oShadow['style']['width']=oDialog.offsetWidth;oShadow['style']['height']=oDialog.offsetHeight},middle:function(){if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display='';
+   var oDialog=G('dialogBox');
+   oDialog['style']['position']="absolute";
+   oDialog['style']['display']='';
+   //鍙栧緱椤甸潰鐨勫搴﹀拰楂樺害
+   var sClientWidth=document.body.clientWidth;
+   var sClientHeight=document.body.clientHeight;
+   var sScrollTop=document.body.scrollTop;
+   //
+   var sleft=(sClientWidth/2)-(oDialog.offsetWidth/2);
+   var iTop=-80+(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2);
+   var sTop=iTop>0?iTop:(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2);
+   if(sTop<1)sTop="20";if(sleft<1)sleft="20";
+   oDialog['style']['left']=sleft+"px"; //宸︿晶浣嶇疆
+   oDialog['style']['top']=220+"px"     //椤堕儴浣嶇疆
+   },
+   reset:function(){if(this.config.isReloadOnClose){top.location.reload()};this.close()},close:function(){G('dialogBox').style.display='none';window.location.reload();
+   if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display='none';
+   if(this.config.isShowShadow)G('dialogBoxShadow').style.display='none';G('dialogBody').innerHTML='';
+   this.showSome()},hiddenSome:function(){var tag=this.info.someHiddenTag.split(",");
+   if(tag.length==1&&tag[0]=="")tag.length=0;
+   for(var i=0;i<tag.length;i++){this.hiddenTag(tag[i])};
+   var ids=this.info.someHiddenEle.split(",");
+   if(ids.length==1&&ids[0]=="")ids.length=0;
+   for(var i=0;i<ids.length;i++){this.hiddenEle(ids[i])};
+   var ids=this.info.someDisabledBtn.split(",");
+   if(ids.length==1&&ids[0]=="")ids.length=0;
+   for(var i=0;i<ids.length;i++){this.disabledBtn(ids[i])};
+   space("begin")},disabledBtn:function(id){var ele=document.getElementById(id);
+   if(typeof(ele)!="undefined"&&ele!=null&&ele.disabled==false){ele.disabled=true;this.someToDisabled.push(ele)}},hiddenTag:function(tagName){var ele=document.getElementsByTagName(tagName);
+   if(ele!=null){for(var i=0;i<ele.length;i++){if(ele[i].style.display!="none"&&ele[i].style.visibility!='hidden'){ele[i].style.visibility='hidden';this.someToHidden.push(ele[i])}}}},hiddenEle:function(id){var ele=document.getElementById(id);if(typeof(ele)!="undefined"&&ele!=null){ele.style.visibility='hidden';this.someToHidden.push(ele)}},showSome:function(){for(var i=0;i<this.someToHidden.length;i++){this.someToHidden[i].style.visibility='visible'};for(var i=0;i<this.someToDisabled.length;i++){this.someToDisabled[i].disabled=false};space("end")}};var Dragdrop=new Class();Dragdrop.prototype={initialize:function(width,height,shadowWidth,showShadow,contentType){this.dragData=null;this.dragDataIn=null;this.backData=null;this.width=width;this.height=height;this.shadowWidth=shadowWidth;this.showShadow=showShadow;this.contentType=contentType;this.IsDraging=false;this.oObj=G('dialogBox');Event.observe(G('dialogBoxTitle'),"mousedown",this.moveStart.bindAsEventListener(this),false)},moveStart:function(event){this.IsDraging=true;if(this.contentType==1){G("iframeBG").style.display="";G("iframeBG").style.width=this.width;G("iframeBG").style.height=this.height};Event.observe(document,"mousemove",this.mousemove.bindAsEventListener(this),false);Event.observe(document,"mouseup",this.mouseup.bindAsEventListener(this),false);Event.observe(document,"selectstart",this.returnFalse,false);this.dragData={x:Event.pointerX(event),y:Event.pointerY(event)};this.backData={x:parseInt(this.oObj.style.left),y:parseInt(this.oObj.style.top)}},mousemove:function(event){if(!this.IsDraging)return;var iLeft=Event.pointerX(event)-this.dragData["x"]+parseInt(this.oObj.style.left);var iTop=Event.pointerY(event)-this.dragData["y"]+parseInt(this.oObj.style.top);if(this.dragData["y"]<parseInt(this.oObj.style.top))iTop=iTop-12;else if(this.dragData["y"]>parseInt(this.oObj.style.top)+25)iTop=iTop+12;this.oObj.style.left=iLeft;this.oObj.style.top=iTop;if(this.showShadow){G('dialogBoxShadow').style.left=iLeft+this.shadowWidth;G('dialogBoxShadow').style.top=iTop+this.shadowWidth};this.dragData={x:Event.pointerX(event),y:Event.pointerY(event)};document.body.style.cursor="move"},mouseup:function(event){if(!this.IsDraging)return;if(this.contentType==1)G("iframeBG").style.display="none";document.onmousemove=null;document.onmouseup=null;var mousX=Event.pointerX(event)-(document.documentElement.scrollLeft||document.body.scrollLeft);var mousY=Event.pointerY(event)-(document.documentElement.scrollTop||document.body.scrollTop);if(mousX<1||mousY<1||mousX>document.body.clientWidth||mousY>document.body.clientHeight){this.oObj.style.left=this.backData["x"];this.oObj.style.top=this.backData["y"];if(this.showShadow){G('dialogBoxShadow').style.left=this.backData.x+this.shadowWidth;G('dialogBoxShadow').style.top=this.backData.y+this.shadowWidth}};this.IsDraging=false;document.body.style.cursor="";Event.stopObserving(document,"selectstart",this.returnFalse,false)},returnFalse:function(){return false}};
+
+
+
diff --git a/js/popup_shuaxin_no.js b/js/popup_shuaxin_no.js
new file mode 100644
index 0000000..908b32f
--- /dev/null
+++ b/js/popup_shuaxin_no.js
@@ -0,0 +1,188 @@
+锘縱ar tcolor={
+    cColor:"#EEEEEE", //钂欑毊棰滆壊
+    bColor:"#FFFFFF", //鑳屾櫙棰滆壊
+    tColor:"#9C9E9C", //鏍囬鑳屾櫙棰滆壊锛岃竟妗嗛鑹�
+    wColor:"#FFFFFF" //鏍囬鏂囧瓧棰滆壊
+   };
+
+function popclose()
+{
+var a = parent.document.getElementById("dialogBoxClose");
+a.click();
+}
+
+if(!Array.prototype.push){
+Array.prototype.push=function(){
+   var startLength=this.length;
+   for(var i=0;i<arguments.length;i++)
+    this[startLength+i]=arguments[i];
+   return this.length;
+}
+};
+function G(){
+  //alert("aa");
+   var elements=new Array();
+   for(var i=0;i<arguments.length;i++){
+    var element=arguments[i];
+    if(typeof element=='string')
+     element=document.getElementById(element);
+    if(arguments.length==1)
+     return element;elements.push(element)
+   };
+   return elements
+};
+Function.prototype.bind=function(object){
+var __method=this;
+return function(){__method.apply(object,arguments)}
+};
+Function.prototype.bindAsEventListener=function(object){
+var __method=this;
+return function(event){__method.call(object,event||window.event)}
+};
+Object.extend=function(destination,source){
+for(property in source){destination[property]=source[property]};return destination
+};
+if(!window.Event){var Event=new Object()};
+Object.extend(Event,{observers:false,element:function(event){return event.target||event.srcElement},isLeftClick:function(event){return(((event.which)&&(event.which==1))||((event.button)&&(event.button==1)))},pointerX:function(event){return event.pageX||(event.clientX+(document.documentElement.scrollLeft||document.body.scrollLeft))},pointerY:function(event){return event.pageY||(event.clientY+(document.documentElement.scrollTop||document.body.scrollTop))},stop:function(event){if(event.preventDefault){event.preventDefault();event.stopPropagation()}else{event.returnValue=false;event.cancelBubble=true}},findElement:function(event,tagName){var element=Event.element(event);while(element.parentNode&&(!element.tagName||(element.tagName.toUpperCase()!=tagName.toUpperCase())))element=element.parentNode;return element},_observeAndCache:function(element,name,observer,useCapture){if(!this.observers)this.observers=[];if(element.addEventListener){this.observers.push([element,name,observer,useCapture]);element.addEventListener(name,observer,useCapture)}else if(element.attachEvent){this.observers.push([element,name,observer,useCapture]);element.attachEvent('on'+name,observer)}},unloadCache:function(){if(!Event.observers)return;for(var i=0;i<Event.observers.length;i++){Event.stopObserving.apply(this,Event.observers[i]);Event.observers[i][0]=null};Event.observers=false},observe:function(element,name,observer,useCapture){var element=G(element);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.attachEvent))name='keydown';this._observeAndCache(element,name,observer,useCapture)},stopObserving:function(element,name,observer,useCapture){var element=G(element);useCapture=useCapture||false;if(name=='keypress'&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||element.detachEvent))name='keydown';if(element.removeEventListener){element.removeEventListener(name,observer,useCapture)}else if(element.detachEvent){element.detachEvent('on'+name,observer)}}});
+Event.observe(window,'unload',Event.unloadCache,false);
+var Class=function(){
+var _class=function(){
+   this.initialize.apply(this,arguments)
+};
+for(i=0;i<arguments.length;i++){
+   superClass=arguments[i];for(member in superClass.prototype){_class.prototype[member]=superClass.prototype[member]}
+};
+_class.child=function(){return new Class(this)};
+_class.extend=function(f){for(property in f){_class.prototype[property]=f[property]}};
+return _class
+};
+function space(flag){
+if(flag=="begin"){
+   var ele=document.getElementById("ft");
+   if(typeof(ele)!="undefined"&&ele!=null)
+    ele.id="ft_popup";
+   ele=document.getElementById("usrbar");
+   if(typeof(ele)!="undefined"&&ele!=null)
+    ele.id="usrbar_popup"
+}
+else if(flag=="end"){
+   var ele=document.getElementById("ft_popup");
+   if(typeof(ele)!="undefined"&&ele!=null)ele.id="ft";
+   ele=document.getElementById("usrbar_popup");
+   if(typeof(ele)!="undefined"&&ele!=null)ele.id="usrbar"}
+};
+// Popup Class begin....
+var Popup=new Class();
+Popup.prototype={
+iframeIdName:'ifr_popup', //iframe鐨勫悕瀛�
+initialize:function(config){
+   this.config=Object.extend({ //灞炴�ц缃�
+    contentType:1, //pop绫诲瀷 1. 鍐呭祵iframe锛�2. 鏄剧ず缁欏畾鐨刪tml 3. confirm妗� 4. alert妗�
+    isHaveTitle:true, //鏄惁鏈夋爣棰樻爮
+    scrollType:'yes', //鍐呭祵iframe鏄惁鍙互婊氬姩
+    isBackgroundCanClick:false, //鑳屾櫙鏄惁鍙互鐐瑰嚮
+    isSupportDraging:true, //鏄惁鏀寔鎷栧姩
+    isShowShadow:true, //鏄惁鏄剧ず闃村奖
+    isReloadOnClose:true, //鍏抽棴鍚庢槸鍚﹂噸鏂板姞杞介〉闈�
+    width:400, //瀹藉害
+    height:300 //楂樺害
+   },config||{});
+   this.info={ //鍙傛暟
+    shadowWidth:0, //闃村奖瀹藉害
+    title:"", //鏍囬
+    contentUrl:"", //iframe鐨剈rl
+    contentHtml:"", //鍐呭鐨刪tml
+    callBack:null, //鍥炶皟鍑芥暟
+    parameter:null, //璋冪敤鐨勫弬鏁� 濡� {id:"divCall",str:"鐐瑰嚮纭畾鍚庢樉绀虹殑瀛楃涓�",obj:pop}
+    confirmCon:"", //confirm鐨勫唴瀹�
+    alertCon:"", //alert鐨勫唴瀹�
+    someHiddenTag:"select,object,embed", //鑷姩闅愯棌鐨勯〉闈㈠厓绱�
+    someDisabledBtn:"", //绂佺敤鐨刡tn
+    someHiddenEle:"", //闅愯棌鐨勫寑閫�
+    overlay:0, //瑕嗙洊
+    coverOpacity:0 //钂欑毊涓嶉�忔槑搴�
+   };
+    this.color=tcolor;
+    this.dropClass=null;
+    this.someToHidden=[];
+    this.someToDisabled=[];
+    if(!this.config.isHaveTitle)
+     this.config.isSupportDraging=false;
+    this.iniBuild()
+},
+setContent:function(arrt,val){ //璁剧疆鍐呭锛屽嵆 this.info 鐨勫弬鏁板唴瀹�
+   if(val!=''){
+    switch(arrt){
+     case 'width':this.config.width=val;break;
+     case 'height':this.config.height=val;break;
+     case 'title':this.info.title=val;break;
+     case 'contentUrl':this.info.contentUrl=val;break;
+     case 'contentHtml':this.info.contentHtml=val;break;
+     case 'callBack':this.info.callBack=val;break;
+     case 'parameter':this.info.parameter=val;break;
+     case 'confirmCon':this.info.confirmCon=val;break;
+     case 'alertCon':this.info.alertCon=val;break;
+     case 'someHiddenTag':this.info.someHiddenTag=val;break;
+     case 'someHiddenEle':this.info.someHiddenEle=val;break;
+     case 'someDisabledBtn':this.info.someDisabledBtn=val;break;
+     case 'overlay':this.info.overlay=val}
+   }
+},
+iniBuild:function(){
+   G('dialogCase')?G('dialogCase').parentNode.removeChild(G('dialogCase')):function(){};
+   var oDiv=document.createElement('span');oDiv.id='dialogCase';document.body.appendChild(oDiv)
+},
+build:function(){
+   var baseZIndex=10001+this.info.overlay*10;
+   var showZIndex=baseZIndex+2;this.iframeIdName='ifr_popup'+this.info.overlay;
+   //鍏抽棴鎸夐挳
+   //var path="http://img.baidu.com/hi/img/";
+   //var close='<input type="image" id="dialogBoxClose" src="'+path+'dialogclose.gif" border="0" width="16" height="16" align="absmiddle" title="鍏抽棴"/>';
+   var close='<img id="dialogBoxClose" title="鍏抽棴" src=/dingcan/images/dialogclose.gif  />';
+   var cB='filter: alpha(opacity='+this.info.coverOpacity+');opacity:'+this.info.coverOpacity/100+';';
+   var cover='<div id="dialogBoxBG" style="position:absolute;top:0px;left:0px;width:100%;height:100%;z-index:'+baseZIndex+';'+cB+'background-color:'+this.color.cColor+';display:none;"></div>';
+   var mainBox='<div id="dialogBox" style="border:1px solid '+this.color.tColor+';display:none;z-index:'+showZIndex+';position:relative;width:'+this.config.width+'px;"><table width="100%" border="0" cellpadding="0" cellspacing="0" bgcolor="'+this.color.bColor+'">';if(this.config.isHaveTitle){mainBox+='<tr height="24" bgcolor="'+this.color.tColor+'"><td><table style="-moz-user-select:none;height:24px;" width="100%" border="0" cellpadding="0" cellspacing="0" ><tr>'+'<td width="6" height="24"></td><td id="dialogBoxTitle" style="color:'+this.color.wColor+';font-size:14px;font-weight:bold;">'+this.info.title+'&nbsp;</td>'+'<td id="dialogClose" width="20" align="right" valign="middle">'+close+'</td><td width="6"></td></tr></table></td></tr>'}
+   else{mainBox+='<tr height="10"><td align="right">'+close+'</td></tr>'};
+   mainBox+='<tr style="height:'+this.config.height+'px" valign="top"><td id="dialogBody" style="position:relative;"></td></tr></table></div>'+'<div id="dialogBoxShadow" style="display:none;z-index:'+baseZIndex+';"></div>';
+   if(!this.config.isBackgroundCanClick){G('dialogCase').innerHTML=cover+mainBox;G('dialogBoxBG').style.height=document.body.scrollHeight}
+   else G('dialogCase').innerHTML=mainBox;Event.observe(G('dialogBoxClose'),"click",this.reset.bindAsEventListener(this),false);
+   if(this.config.isSupportDraging){dropClass=new Dragdrop(this.config.width,this.config.height,this.info.shadowWidth,this.config.isSupportDraging,this.config.contentType);G("dialogBoxTitle").style.cursor="move"};this.lastBuild()},lastBuild:function(){var confirm='<div style="width:100%;height:100%;text-align:center;"><div style="margin:20px 20px 0 20px;font-size:14px;line-height:16px;color:#000000;">'+this.info.confirmCon+'</div><div style="margin:20px;"><input id="dialogOk" type="button" value=" 纭畾 "/>&nbsp;<input id="dialogCancel" type="button" value=" 鍙栨秷 "/></div></div>';
+   var alert='<div style="width:100%;height:100%;text-align:center;"><div style="margin:20px 20px 0 20px;font-size:14px;line-height:16px;color:#000000;">'+this.info.alertCon+'</div><div style="margin:20px;"><input id="dialogYES" type="button" value=" 纭畾 "/></div></div>';
+   var baseZIndex=10001+this.info.overlay*10;var coverIfZIndex=baseZIndex+4;
+   if(this.config.contentType==1){var openIframe="<iframe width='100%' style='height:"+this.config.height+"px' name='"+this.iframeIdName+"' id='"+this.iframeIdName+"' src='"+this.info.contentUrl+"' frameborder='0' scrolling='"+this.config.scrollType+"'></iframe>";
+   var coverIframe="<div id='iframeBG' style='position:absolute;top:0px;left:0px;width:1px;height:1px;z-index:"+coverIfZIndex+";filter: alpha(opacity=00);opacity:0.00;background-color:#ffffff;'><div>";G("dialogBody").innerHTML=openIframe+coverIframe}
+   else if(this.config.contentType==2){G("dialogBody").innerHTML=this.info.contentHtml}else if(this.config.contentType==3){G("dialogBody").innerHTML=confirm;Event.observe(G('dialogOk'),"click",this.forCallback.bindAsEventListener(this),false);
+   Event.observe(G('dialogCancel'),"click",this.close.bindAsEventListener(this),false)}else if(this.config.contentType==4){G("dialogBody").innerHTML=alert;Event.observe(G('dialogYES'),"click",this.close.bindAsEventListener(this),false)}},reBuild:function(){G('dialogBody').height=G('dialogBody').clientHeight;this.lastBuild()},show:function(){this.hiddenSome();this.middle();if(this.config.isShowShadow)this.shadow()},forCallback:function(){return this.info.callBack(this.info.parameter)},shadow:function(){var oShadow=G('dialogBoxShadow');var oDialog=G('dialogBox');oShadow['style']['position']="absolute";oShadow['style']['background']="#000";oShadow['style']['display']="";oShadow['style']['opacity']="0.2";oShadow['style']['filter']="alpha(opacity=20)";oShadow['style']['top']=oDialog.offsetTop+this.info.shadowWidth;oShadow['style']['left']=oDialog.offsetLeft+this.info.shadowWidth;oShadow['style']['width']=oDialog.offsetWidth;oShadow['style']['height']=oDialog.offsetHeight},middle:function(){if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display='';
+   var oDialog=G('dialogBox');
+   oDialog['style']['position']="absolute";
+   oDialog['style']['display']='';
+   //鍙栧緱椤甸潰鐨勫搴﹀拰楂樺害
+   var sClientWidth=document.body.clientWidth;
+   var sClientHeight=document.body.clientHeight;
+   var sScrollTop=document.body.scrollTop;
+   //
+   var sleft=(sClientWidth/2)-(oDialog.offsetWidth/2);
+   var iTop=-80+(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2);
+   var sTop=iTop>0?iTop:(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2);
+   if(sTop<1)sTop="20";if(sleft<1)sleft="20";
+   oDialog['style']['left']=sleft+"px"; //宸︿晶浣嶇疆
+   oDialog['style']['top']=220+"px"     //椤堕儴浣嶇疆
+   },
+   reset:function(){if(this.config.isReloadOnClose){top.location.reload()};this.close()},close:function(){G('dialogBox').style.display='none';
+   if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display='none';
+   if(this.config.isShowShadow)G('dialogBoxShadow').style.display='none';G('dialogBody').innerHTML='';
+   this.showSome()},hiddenSome:function(){var tag=this.info.someHiddenTag.split(",");
+   if(tag.length==1&&tag[0]=="")tag.length=0;
+   for(var i=0;i<tag.length;i++){this.hiddenTag(tag[i])};
+   var ids=this.info.someHiddenEle.split(",");
+   if(ids.length==1&&ids[0]=="")ids.length=0;
+   for(var i=0;i<ids.length;i++){this.hiddenEle(ids[i])};
+   var ids=this.info.someDisabledBtn.split(",");
+   if(ids.length==1&&ids[0]=="")ids.length=0;
+   for(var i=0;i<ids.length;i++){this.disabledBtn(ids[i])};
+   space("begin")},disabledBtn:function(id){var ele=document.getElementById(id);
+   if(typeof(ele)!="undefined"&&ele!=null&&ele.disabled==false){ele.disabled=true;this.someToDisabled.push(ele)}},hiddenTag:function(tagName){var ele=document.getElementsByTagName(tagName);
+   if(ele!=null){for(var i=0;i<ele.length;i++){if(ele[i].style.display!="none"&&ele[i].style.visibility!='hidden'){ele[i].style.visibility='hidden';this.someToHidden.push(ele[i])}}}},hiddenEle:function(id){var ele=document.getElementById(id);if(typeof(ele)!="undefined"&&ele!=null){ele.style.visibility='hidden';this.someToHidden.push(ele)}},showSome:function(){for(var i=0;i<this.someToHidden.length;i++){this.someToHidden[i].style.visibility='visible'};for(var i=0;i<this.someToDisabled.length;i++){this.someToDisabled[i].disabled=false};space("end")}};var Dragdrop=new Class();Dragdrop.prototype={initialize:function(width,height,shadowWidth,showShadow,contentType){this.dragData=null;this.dragDataIn=null;this.backData=null;this.width=width;this.height=height;this.shadowWidth=shadowWidth;this.showShadow=showShadow;this.contentType=contentType;this.IsDraging=false;this.oObj=G('dialogBox');Event.observe(G('dialogBoxTitle'),"mousedown",this.moveStart.bindAsEventListener(this),false)},moveStart:function(event){this.IsDraging=true;if(this.contentType==1){G("iframeBG").style.display="";G("iframeBG").style.width=this.width;G("iframeBG").style.height=this.height};Event.observe(document,"mousemove",this.mousemove.bindAsEventListener(this),false);Event.observe(document,"mouseup",this.mouseup.bindAsEventListener(this),false);Event.observe(document,"selectstart",this.returnFalse,false);this.dragData={x:Event.pointerX(event),y:Event.pointerY(event)};this.backData={x:parseInt(this.oObj.style.left),y:parseInt(this.oObj.style.top)}},mousemove:function(event){if(!this.IsDraging)return;var iLeft=Event.pointerX(event)-this.dragData["x"]+parseInt(this.oObj.style.left);var iTop=Event.pointerY(event)-this.dragData["y"]+parseInt(this.oObj.style.top);if(this.dragData["y"]<parseInt(this.oObj.style.top))iTop=iTop-12;else if(this.dragData["y"]>parseInt(this.oObj.style.top)+25)iTop=iTop+12;this.oObj.style.left=iLeft;this.oObj.style.top=iTop;if(this.showShadow){G('dialogBoxShadow').style.left=iLeft+this.shadowWidth;G('dialogBoxShadow').style.top=iTop+this.shadowWidth};this.dragData={x:Event.pointerX(event),y:Event.pointerY(event)};document.body.style.cursor="move"},mouseup:function(event){if(!this.IsDraging)return;if(this.contentType==1)G("iframeBG").style.display="none";document.onmousemove=null;document.onmouseup=null;var mousX=Event.pointerX(event)-(document.documentElement.scrollLeft||document.body.scrollLeft);var mousY=Event.pointerY(event)-(document.documentElement.scrollTop||document.body.scrollTop);if(mousX<1||mousY<1||mousX>document.body.clientWidth||mousY>document.body.clientHeight){this.oObj.style.left=this.backData["x"];this.oObj.style.top=this.backData["y"];if(this.showShadow){G('dialogBoxShadow').style.left=this.backData.x+this.shadowWidth;G('dialogBoxShadow').style.top=this.backData.y+this.shadowWidth}};this.IsDraging=false;document.body.style.cursor="";Event.stopObserving(document,"selectstart",this.returnFalse,false)},returnFalse:function(){return false}};
+
+
+
diff --git a/js/public.js b/js/public.js
new file mode 100644
index 0000000..e738129
--- /dev/null
+++ b/js/public.js
@@ -0,0 +1,474 @@
+锘�/*
+ * 鎵撳紑鏂扮獥鍙� f:閾炬帴鍦板潃 n:绐楀彛鐨勫悕绉� w:绐楀彛鐨勫搴� h:绐楀彛鐨勯珮搴� s:绐楀彛鏄惁鏈夋粴鍔ㄦ潯锛�1锛氭湁婊氬姩鏉★紱0锛氭病鏈夋粴鍔ㄦ潯
+ */
+
+
+
+function openWin(f, n, w, h, s) 
+{
+    var result=window.open(f,n,"dialogHeight:"+h+";dialogWidth:"+w+";"+s);
+    if(result==true)
+    {
+    	window.location.reload(true);
+    }
+    else
+    {
+    	//window.location.reload(true);
+    }
+    
+}
+
+
+
+
+
+/*
+ * 鍒犻櫎璁板綍
+ */
+function del(url, info) 
+{
+	//if (openDeleteDialog(url, info)) 
+	//{
+		//window.location.reload(true);
+	//}
+	 if (confirm(info))
+     {
+	     var result=window.open(url,"window123","dialogHeight:234px;dialogWidth:271px;resizable:no;help:no;status:no;scroll:no");
+	     if(result==true)
+	     {
+	     	 window.location.reload(true);
+	     }
+	     else
+	     {
+	     	
+	     }
+     }
+     else
+     {
+     	
+     }
+}
+
+
+
+/*
+ * 鏍￠獙checkbox
+ */
+function checkAll(chkName, checkboxName, pageSize) {
+	var src = event.srcElement;
+	var chkN = eval("document.all." + chkName);
+
+	if (src.checked) {
+		chkN[0].checked = true;
+		chkN[1].checked = true;
+		for (var i = 0; i < pageSize; i++) {
+			var chk = eval("document.all." + checkboxName + i);
+			if (chk) {
+				chk.checked = true;
+			}
+		}
+	} else {
+		chkN[0].checked = false;
+		chkN[1].checked = false;
+		for (var i = 0; i < pageSize; i++) {
+			var chk = eval("document.all." + checkboxName + i);
+			if (chk) {
+				chk.checked = false;
+			}
+		}
+	}
+}
+
+/*
+ * 
+ */
+function makePages(maxPage, selectedPage, selectName) {
+	var sel = eval("document.all." + selectName);
+	sel.length = 0;
+	for (var i = 1; i <= maxPage; i++) {
+		sel.options[i] = new Option(i, i);
+		if (sel.options[i] == selectedPage) {
+			sel.options[i].selected = true;
+		}
+	}
+}
+
+
+
+/*
+ * 鏇挎崲瀛楃涓�
+ */
+function replaceStr(str) {
+	var re = "/( )/gi";
+	str = str.replace(re, "");
+	re = "/\</gi";
+	str = str.replace(re, "&lt;");
+
+	return str;
+}
+
+/*
+ * 鍘绘帀宸﹁竟绌烘牸
+ */
+function LTrim(str) {
+	var whitespace = new String(" \t\n\r");
+	var s = new String(str);
+	if (whitespace.indexOf(s.charAt(0)) != -1) {
+		var j = 0, i = s.length;
+		while (j < i && whitespace.indexOf(s.charAt(j)) != -1) {
+			j++;
+		}
+		s = s.substring(j, i);
+	}
+	return s;
+}
+
+/*
+ * 鍘绘帀鍙宠竟绌烘牸
+ */
+function RTrim(str) {
+	var whitespace = new String(" \t\n\r");
+	var s = new String(str);
+	if (whitespace.indexOf(s.charAt(s.length - 1)) != -1) {
+		var i = s.length - 1;
+		while (i >= 0 && whitespace.indexOf(s.charAt(i)) != -1) {
+			i--;
+		}
+		s = s.substring(0, i + 1);
+	}
+	return s;
+}
+
+/*
+ * 鍘绘帀涓よ竟绌烘牸
+ */
+function Trim(str) {
+	return RTrim(LTrim(str));
+}
+
+
+
+
+/*
+ * 
+ */
+function exeOperation(exePath) {
+	var obj = new ActiveXObject("Microsoft.XMLHTTP");
+	obj.open("post", exePath, false);
+	obj.send();
+	var res = obj.responseText;
+	var rs = Trim(res);
+	if (rs.indexOf('true', 0) != -1) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/*
+ * 
+ */
+function exeValidate(exePath) {
+	var obj = new ActiveXObject("Microsoft.XMLHTTP");
+	obj.open("post", exePath, false);
+	obj.send();
+	var res = obj.responseText;
+	var rs = Trim(res);
+	if (rs.indexOf('validate_login_user', 0) != -1) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+
+/*
+ * 鏄剧ず
+ */
+function validate_date(exePath) {
+	var obj = new ActiveXObject("Microsoft.XMLHTTP");
+	obj.open("post", exePath, false);
+	obj.send();
+	var res = obj.responseText;
+	var rs = Trim(res);
+	var begin_str = "<!--begin-->";
+	var beginIndex = rs.indexOf(begin_str) + begin_str.length;
+	var endIndex = rs.indexOf("<!--end-->");
+	rs = ((beginIndex >= 0) && (endIndex >= 0)) ? rs.substring(beginIndex,
+			endIndex) : "";
+	return Trim(rs);
+}
+
+/*
+ * 鏍￠獙鏄惁鏁板瓧
+ */
+function checkNumber(name, TempS) {
+	for (Count = 0; Count < TempS.length; Count++) {
+		TempChar = TempS.substring(Count, Count + 1);
+		RefString = "0123456789";
+		if (RefString.indexOf(TempChar, 0) == -1) {
+			alert("璇疯緭鍏ユ暟瀛�");
+			eval("document.all." + name).focus();
+			return false;
+		}
+	}
+}
+
+
+
+/*
+ * 鏄惁鏈夐潪娉曞瓧绗�
+ */
+function chksafe(a) {
+	fibdn = new Array("'", "\\");
+	i = fibdn.length;
+	j = a.length;
+	for (ii = 0; ii < i; ii++) {
+		for (jj = 0; jj < j; jj++) {
+			temp1 = a.charAt(jj);
+			temp2 = fibdn[ii];
+			if (temp1 == temp2) {
+				return false;
+			}
+		}
+	}
+	return true;
+}
+
+/*
+ * 
+ */
+function fucCheckNUM(NUM) {
+	var i, j, strTemp;
+	strTemp = "0123456789";
+	if (NUM.length == 0)
+		return false;
+	for (i = 0; i < NUM.length; i++) {
+		j = strTemp.indexOf(NUM.charAt(i));
+		if (j == -1) {
+			return false;
+		}
+	}
+	return true;
+}
+
+
+
+/*
+ * 
+ */
+function fucCheckLength(strTemp) {
+	var i, sum;
+	sum = 0;
+	for (i = 0; i < strTemp.length; i++) {
+		if ((strTemp.charCodeAt(i) >= 0) && (strTemp.charCodeAt(i) <= 255)) {
+			sum = sum + 1;
+		} else {
+			sum = sum + 2;
+		}
+	}
+	return sum;
+}
+
+/*
+ * 
+ */
+function chkElements(name, errMsg, max_length, lengthMsg) {
+	var el_name = eval("document.all." + name);
+	var v = el_name.value;
+	if (!chksafe(v)) {
+		el_name.focus();
+		alert(errMsg);
+		return false;
+	} else if (fucCheckLength(v) > max_length) {
+		el_name.focus();
+		alert(lengthMsg);
+		return false;
+	}
+	return true;
+}
+
+
+
+/*
+ * 鏍￠獙绌哄瓧绗︿覆
+ */
+function checkNullStr(name, msg) {
+	var el_name = eval("document.all." + name);
+	if (Trim(el_name.value).length == 0) {
+		alert(msg);
+		el_name.focus();
+		return false;
+	}
+	return true;
+}
+
+
+
+
+/*
+ *  鏄剧ず鏃ユ湡鎺ian
+ */
+function GetDate(nText, para) {
+	var v_url = para == "1" ? "./common/data.html" : "../../common/data.html";
+	var reVal = window
+			.open(
+					v_url,
+					'data',
+					"status:no;center:yes;scroll:no;resizable:no;dialogWidth:255px;dialogHeight:260px");
+	if (reVal != null) {
+		var n = eval("document.all." + nText);
+		n.value = reVal;
+	}
+}
+
+
+
+/*
+ * 鎸夋瘮渚嬬缉灏忓浘鐗�
+ */
+function DrawImage(ImgD, iwidth, iheight) {
+	var flag = false;
+	var image = new Image();
+	image.src = ImgD.src;
+	if (image.width > 0 && image.height > 0) {
+		flag = true;
+		if (image.width / image.height >= iwidth / iheight) {
+			if (image.width > iwidth) {
+				ImgD.width = iwidth;
+				ImgD.height = (image.height * iwidth) / image.width;
+			} else {
+				ImgD.width = image.width;
+				ImgD.height = image.height;
+			}
+			// ImgD.alt=image.width+"脳"+image.height;
+		} else {
+			if (image.height > iheight) {
+				ImgD.height = iheight;
+				ImgD.width = (image.width * iheight) / image.height;
+			} else {
+				ImgD.width = image.width;
+				ImgD.height = image.height;
+			}
+			// ImgD.alt=image.width+"脳"+image.height;
+		}
+	}
+	ImgD.style.visibility = "visible";
+}
+
+
+
+/*
+ * 鍥炶溅閿浆涓篢ab閿�
+ */
+function enterTab() {
+	if (event.keyCode == 13) {
+		oElement = document.activeElement;
+		if (oElement.tagName != "TEXTAREA" && oElement.type != "button")
+			event.keyCode = 9;
+		return;
+	}
+}
+
+/*
+ * 
+ */
+function objectEval(text) {
+	text = text.replace(/\n/g, " ");
+	text = text.replace(/\r/g, " ");
+	if (text.match(/^\s*\{.*\}\s*$/)) {
+		text = "[" + text + "]";
+	}
+	return eval(text)[0];
+}
+
+
+
+/*
+ * 鎵撳紑棰嗗鏌ヨ椤甸潰 action - 鏌ヨ鐨凙ction method - 璋冪敤鐨勬柟娉� title - 鏍囬message name -
+ * 鍛樺伐閫夋嫨鍩熺殑name
+ */
+function openLeaderQuery(action, method, title, name) {
+	openWin("../../common/selectStaff.jsp?action=" + action + "&method="
+					+ method + "&title=" + title + "&name=" + name,
+			"public_leader_find_page", "400", "150");
+}
+
+/*
+ * 绗竴琛屽彉鑹�
+ */
+function chgColor() {
+	var v_table = document.all["PowerTable"];
+	var v_row = v_table.rows[1];
+	var len = v_row.cells.length;
+	for (var i = 0; i < len; i++) {
+		var v_cell = v_row.cells[i];
+		v_cell.style.backgroundColor = "yellow";
+	}
+}
+
+/*
+ * 绗竴琛屽彉鑹�
+ */
+function chgColor2() {
+	var v_table = document.all["PowerTable"];
+	var rows_count = v_table.rows.length;
+	var v_row, v_cell, temp_len, len;
+	var rowspan = 0;
+
+	// get rowspan
+	if (v_table.rows.length > 1) {
+		len = v_table.rows[1].cells.length;
+		for (var r = 2; r < rows_count; r++) {
+			v_row = v_table.rows[r];
+			temp_len = v_row.cells.length;
+			if (temp_len == len) {
+				rowspan = r - 1;
+				break;
+			}
+		}
+
+		rowspan = (rowspan > 0) ? (rowspan + 1) : rows_count;
+		for (var r = 1; r < rowspan; r++) {
+			v_row = v_table.rows[r];
+			for (var t = 0; t < v_row.cells.length; t++) {
+				v_cell = v_row.cells[t];
+				v_cell.style.backgroundColor = "yellow";
+			}
+		}
+	}
+}
+
+
+
+/*
+ * 娣诲姞椤甸潰杞藉叆鍚庤Е鍙戠殑shijian
+ */
+function addLoadEvent(func) {
+	var oldonload = window.onload;
+	if (typeof(window.onload) != "function") {
+		window.onload = func;
+	} else {
+		window.onload = function() {
+			oldonload();
+			func();
+		}
+	}
+}
+
+
+
+// adsName:鍚嶇О,adsUrl:鍦板潃,sTime:鏃堕棿(灏忔椂) add by wujie 2005.12.12
+function PopAds(adsName, adsUrl, sTime, number, w, h, s) {
+	if (document.cookie.indexOf(adsName) == -1) {
+		window.open(adsUrl, adsName);
+		self.focus();
+		var expireDate = new Date();
+		var lefttime = 1000 * (3600 * sTime);
+		expireDate.setTime(expireDate.getTime() + lefttime);
+		document.cookie = adsName + "=yes" + "; expires="
+				+ expireDate.toGMTString() + ";";
+	}
+	openWin(adsUrl, number, w, h, s);
+}
diff --git a/liuService.java b/liuService.java
deleted file mode 100644
index fbe817a..0000000
--- a/liuService.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package com.itbaizhan.service;
-
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.itbaizhan.dao.DB;
-import com.itbaizhan.orm.Tcatelog;
-import com.itbaizhan.orm.Tgoods;
-import com.itbaizhan.orm.Torder;
-import com.itbaizhan.orm.TorderItem;
-import com.itbaizhan.orm.Txinyong;
-
-/**
- * 服务类：liuService
- *
- * 该类提供了多个与商品、订单、用户等相关的业务逻辑功能。它包含了查询商品、保存订单、更新库存、处理用户登录等功能。
- */
-public class liuService {
-
-	/**
-	 * 获取菜品种类的列表，返回菜品类别的 ID 和名称
-	 *
-	 * @return 返回菜品种类的 List，包含每个菜品的 ID 和名称
-	 */
-	public static List catelogList() {
-		List catelogList = new ArrayList(); // 初始化菜品种类列表
-		String sql = "select * from t_catelog where del='no'"; // 查询未被删除的菜品种类
-		Object[] params = {}; // 设置查询参数为空
-		DB mydb = new DB();
-
-		try {
-			mydb.doPstm(sql, params); // 执行 SQL 查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) { // 遍历结果集
-				Tcatelog catelog = new Tcatelog(); // 创建 Tcatelog 对象
-				catelog.setId(rs.getString("id")); // 设置菜品类别 ID
-				catelog.setName(rs.getString("name")); // 设置菜品类别名称
-				catelogList.add(catelog); // 将菜品类别添加到列表
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-		return catelogList; // 返回菜品类别列表
-	}
-
-	/**
-	 * 获取商品详细信息
-	 *
-	 * @param id 商品 ID
-	 * @return 返回商品详细信息的 Tgoods 对象
-	 */
-	public static Tgoods getGoods(String id) {
-		Tgoods goods = new Tgoods(); // 初始化商品对象
-		String sql = "select * from t_goods where id=?"; // 查询指定商品的 SQL 语句
-		Object[] params = { id }; // 设置查询参数为商品 ID
-		DB mydb = new DB();
-
-		try {
-			mydb.doPstm(sql, params); // 执行查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			rs.next(); // 移动到第一行（只查询一条记录）
-
-			// 设置商品属性
-			goods.setId(rs.getString("id"));
-			goods.setCatelog_id(rs.getString("catelog_id"));
-			goods.setBianhao(rs.getString("bianhao"));
-			goods.setMingcheng(rs.getString("mingcheng"));
-			goods.setJieshao(rs.getString("jieshao"));
-			goods.setFujian(rs.getString("fujian"));
-			goods.setShichangjia(rs.getInt("shichangjia"));
-			goods.setTejia(rs.getInt("tejia"));
-			goods.setDel(rs.getString("del"));
-
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-		return goods; // 返回商品对象
-	}
-
-	/**
-	 * 获取最新商品的信息（按商品 ID 排序，最多返回前 8 个商品）
-	 *
-	 * @return 返回最新商品列表
-	 */
-	public static List goodsNew() {
-		List goodsList = new ArrayList(); // 初始化商品列表
-		String sql = "select * from t_goods where del='no' order by id desc"; // 查询未删除的商品，按 ID 降序排列
-		Object[] params = {}; // 设置查询参数为空
-		DB mydb = new DB();
-
-		try {
-			mydb.doPstm(sql, params); // 执行查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) { // 遍历结果集
-				Tgoods goods = new Tgoods(); // 创建 Tgoods 对象
-
-				// 设置商品属性
-				goods.setId(rs.getString("id"));
-				goods.setCatelog_id(rs.getString("catelog_id"));
-				goods.setBianhao(rs.getString("bianhao"));
-				goods.setMingcheng(rs.getString("mingcheng"));
-				goods.setJieshao(rs.getString("jieshao"));
-				goods.setFujian(rs.getString("fujian"));
-				goods.setShichangjia(rs.getInt("shichangjia"));
-				goods.setTejia(rs.getInt("tejia"));
-				goods.setDel(rs.getString("del"));
-
-				goodsList.add(goods); // 将商品添加到列表
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-
-		// 限制返回最多 8 个商品
-		if (goodsList.size() > 8) {
-			goodsList = goodsList.subList(0, 8);
-		}
-		return goodsList; // 返回最新商品列表
-	}
-
-	/**
-	 * 根据菜品类别 ID 获取该类别下的商品列表
-	 *
-	 * @param catelog_id 菜品类别 ID
-	 * @return 返回该类别下的商品列表
-	 */
-	public static List goodsByCatelog(String catelog_id) {
-		List goodsList = new ArrayList(); // 初始化商品列表
-		String sql = "select * from t_goods where del='no' and catelog_id=? order by id desc"; // 根据类别 ID 查询商品
-		Object[] params = { catelog_id }; // 设置查询参数为菜品类别 ID
-		DB mydb = new DB();
-
-		try {
-			mydb.doPstm(sql, params); // 执行查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) { // 遍历结果集
-				Tgoods goods = new Tgoods(); // 创建 Tgoods 对象
-
-				// 设置商品属性
-				goods.setId(rs.getString("id"));
-				goods.setCatelog_id(rs.getString("catelog_id"));
-				goods.setBianhao(rs.getString("bianhao"));
-				goods.setMingcheng(rs.getString("mingcheng"));
-				goods.setJieshao(rs.getString("jieshao"));
-				goods.setFujian(rs.getString("fujian"));
-				goods.setShichangjia(rs.getInt("shichangjia"));
-				goods.setTejia(rs.getInt("tejia"));
-				goods.setDel(rs.getString("del"));
-
-				goodsList.add(goods); // 将商品添加到列表
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-		return goodsList; // 返回商品列表
-	}
-
-	/**
-	 * 保存订单信息
-	 *
-	 * @param order 订单对象，包含订单的各项信息
-	 */
-	public static void saveOrder(Torder order) {
-		String sql = "insert into t_order(id,bianhao,shijian,zhuangtai,huifu,songhuodizhi,fukuanfangshi,jine,user_id) values(?,?,?,?,?,?,?,?,?)";
-		Object[] params = { order.getId(), order.getBianhao(), order.getShijian(), order.getZhuangtai(),
-				order.getHuifu(), order.getSonghuodizhi(), order.getFukuanfangshi(), order.getJine(), order.getUser_id() };
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行插入操作
-		mydb.closed(); // 关闭数据库连接
-	}
-
-	/**
-	 * 保存订单商品明细
-	 *
-	 * @param id 订单明细 ID
-	 * @param order_id 订单 ID
-	 * @param goods_id 商品 ID
-	 * @param goods_quantity 商品数量
-	 */
-	public static void saveOrderItem(String id, String order_id, String goods_id, int goods_quantity) {
-		String sql = "insert into t_orderitem(id,order_id,goods_id,goods_quantity) values(?,?,?,?)";
-		Object[] params = { id, order_id, goods_id, goods_quantity };
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行插入操作
-		mydb.closed(); // 关闭数据库连接
-	}
-
-	/**
-	 * 更新商品库存
-	 *
-	 * @param goods_id 商品 ID
-	 * @param goods_quantity 商品数量
-	 */
-	public static void updateGoodsKucun(String goods_id, int goods_quantity) {
-		String sql = "update t_goods set kucun=kucun-? where id=?";
-		Object[] params = { goods_quantity, goods_id };
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行更新操作
-		mydb.closed(); // 关闭数据库连接
-	}
-
-	/**
-	 * 获取用户的订单列表
-	 *
-	 * @param user_id 用户 ID
-	 * @return 返回该用户的订单列表
-	 */
-	public static List orderList(String user_id) {
-		List orderList = new ArrayList(); // 初始化订单列表
-		String sql = "select * from t_order where user_id=?"; // 查询该用户的所有订单
-		Object[] params = { user_id }; // 设置查询参数为用户 ID
-		DB mydb = new DB();
-
-		try {
-			mydb.doPstm(sql, params); // 执行查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) { // 遍历结果集
-				Torder order = new Torder(); // 创建 Torder 对象
-
-				// 设置订单属性
-				order.setId(rs.getString("id"));
-				order.setBianhao(rs.getString("bianhao"));
-				order.setShijian(rs.getString("shijian"));
-				order.setZhuangtai(rs.getString("zhuangtai"));
-				order.setHuifu(rs.getString("huifu"));
-				order.setSonghuodizhi(rs.getString("songhuodizhi"));
-				order.setFukuanfangshi(rs.getString("fukuanfangshi"));
-				order.setJine(rs.getInt("jine"));
-				order.setUser_id(rs.getString("user_id"));
-
-				orderList.add(order); // 将订单添加到列表
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-		return orderList; // 返回订单列表
-	}
-
-	/**
-	 * 获取订单商品的详细信息列表
-	 *
-	 * @param order_id 订单 ID
-	 * @return 返回订单商品的列表，包含商品信息和数量
-	 */
-	public static List orderItemList(String order_id) {
-		List orderitemList = new ArrayList(); // 初始化订单商品列表
-		String sql = "select * from t_orderitem where order_id=?"; // 查询订单中包含的商品
-		Object[] params = { order_id }; // 设置查询参数为订单 ID
-		DB mydb = new DB();
-
-		try {
-			mydb.doPstm(sql, params); // 执行查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) { // 遍历结果集
-				TorderItem orderItem = new TorderItem(); // 创建 TorderItem 对象
-
-				// 设置订单商品属性
-				orderItem.setId(rs.getString("id"));
-				orderItem.setGoods(getGoods(rs.getString("goods_id"))); // 获取商品信息
-				orderItem.setGoods_quantity(rs.getInt("goods_quantity")); // 设置商品数量
-
-				orderitemList.add(orderItem); // 将订单商品添加到列表
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-		return orderitemList; // 返回订单商品列表
-	}
-
-	/**
-	 * 判断用户的账号是否存在
-	 *
-	 * @param loginname 用户登录账号
-	 * @return 如果账号存在，返回 "yizhan"，否则返回 "meizhan"
-	 */
-	public static String panduan_zhanghao(String loginname) {
-		String s = "meizhan"; // 默认返回“没占用”
-
-		String sql = "select * from t_user where del='no' and loginname=?"; // 查询账号是否存在
-		Object[] params = { loginname.trim() }; // 设置查询参数为账号
-		DB mydb = new DB();
-
-		try {
-			mydb.doPstm(sql, params); // 执行查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) { // 如果查询到结果，表示账号已存在
-				s = "yizhan"; // 账号已占用
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-		return s; // 返回账号是否已占用
-	}
-
-	/**
-	 * 获取用户的信用信息列表
-	 *
-	 * @param user_id 用户 ID
-	 * @return 返回该用户的信用信息列表
-	 */
-	public static List getxinyongList(String user_id) {
-		List xinyongList = new ArrayList(); // 初始化信用信息列表
-		String sql = "select * from t_xinyong where user_id=?"; // 查询该用户的信用信息
-		Object[] params = { user_id }; // 设置查询参数为用户 ID
-		DB mydb = new DB();
-
-		try {
-			mydb.doPstm(sql, params); // 执行查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) { // 遍历结果集
-				Txinyong xinyong = new Txinyong(); // 创建 Txinyong 对象
-
-				// 设置信用信息属性
-				xinyong.setId(rs.getString("id"));
-				xinyong.setShuxing(rs.getString("shuxing"));
-				xinyong.setNeirong(rs.getString("neirong"));
-				xinyong.setShijian(rs.getString("shijian"));
-				xinyong.setUser_id(rs.getString("user_id"));
-
-				xinyongList.add(xinyong); // 将信用信息添加到列表
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-		return xinyongList; // 返回信用信息列表
-	}
-}
diff --git a/liuyanMana.jsp b/liuyanMana.jsp
deleted file mode 100644
index 9de707b..0000000
--- a/liuyanMana.jsp
+++ /dev/null
@@ -1,80 +0,0 @@
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false" %> 
-
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-
-		<link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-		
-		<script language="JavaScript" src="<%=path %>/js/public.js" type="text/javascript"></script>
-		
-        <script language="javascript">
-           function liuyanDel(id)//纭鏄惁鍒犻櫎
-           {
-               if(confirm('鎮ㄧ‘瀹氬垹闄ゅ悧锛�'))
-               {
-                   window.location.href="<%=path %>/liuyan?type=liuyanDel&id="+id;//璺宠浆椤甸潰锛岃繘琛岀暀瑷�鍒犻櫎
-               }
-           }
-           
-           function liuyanHuifu(id)//鐣欒█鍥炲鍑芥暟
-           {
-               var strUrl = "<%=path %>/admin/liuyan/liuyanHuifu.jsp?id="+id;
-               var ret = window.open(strUrl,"","dialogWidth:700px; dialogHeight:400px; dialogLeft: status:no; directories:yes;scrollbars:yes;Resizable=no;");
-               //寤虹珛涓�涓ā鍨嬪璇濇锛屽璇濇楂樺害涓�400锛屽搴︿负700锛屾棤鐘舵�佹爮锛岀獥鍙ｆ棤婊氬姩鏍忥紝涓嶅彲璋冩暣澶у皬
-               window.location.reload(); //閲嶆柊鍔犺浇椤甸潰
-           }
-        </script>
-	</head>
-
-	<body leftmargin="2" topmargin="2" background='<%=path %>/img/allbg.gif'>
-			<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-				<tr bgcolor="#E7E7E7">
-					<td height="14" colspan="14" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-				</tr>
-				<tr align="center" bgcolor="#FAFAF1" height="22">
-					<td width="4%">搴忓彿</td>
-					<td width="20%">淇℃伅鍐呭</td>
-					<td width="8%">鍙戝竷鏃堕棿</td>
-					<td width="8%">鍥炲淇℃伅</td>
-					<td width="8%">鍥炲鏃堕棿</td>
-					<td width="8%">鎿嶄綔</td>
-		        </tr>	
-				<c:forEach items="${requestScope.liuyanList}" var="liuyan" varStatus="sta">
-				<tr align='center' bgcolor="#FFFFFF" height="22">
-					<td bgcolor="#FFFFFF" align="center">
-						 ${sta.index+1 } <!-- 璁剧疆搴忓彿浠�1寮�濮� -->
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						 ${liuyan.neirong }
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						${liuyan.liuyanshi }
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-					    ${liuyan.huifu }
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-					    ${liuyan.huifushi }
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						<input type="button" value="鍒犻櫎" onclick="liuyanDel(${liuyan.id })"/><!-- 鎵цliuyanDel锛坕d锛�-->
-						<input type="button" value="鍥炲" onclick="liuyanHuifu(${liuyan.id })"/><!-- 鎵цliuyanHuifu锛坕d锛�-->
-					</td>
-				</tr>
-			 </c:forEach>
-			</table>
-	</body>
-</html>
diff --git a/liuyan_servlet.java b/liuyan_servlet.java
deleted file mode 100644
index a191a26..0000000
--- a/liuyan_servlet.java
+++ /dev/null
@@ -1,299 +0,0 @@
-package com.itbaizhan.action;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import com.itbaizhan.dao.DB;
-import com.itbaizhan.orm.TLiuyan;
-import com.itbaizhan.orm.Tuser;
-
-public class liuyan_servlet extends HttpServlet
-{
-	/**
-	 * service方法用于处理客户端请求，区分不同的请求类型，
-	 * 并调用相应的方法来处理留言的增、删、查、改操作。
-	 */
-	public void service(HttpServletRequest req,HttpServletResponse res)throws ServletException, IOException
-	{
-		// 获取请求的type参数来确定操作类型
-		String type = req.getParameter("type");
-
-		// 根据请求的操作类型，调用相应的方法
-		if(type.endsWith("liuyanAdd"))
-		{
-			liuyanAdd(req, res);  // 留言添加
-		}
-		if(type.endsWith("liuyanMana"))
-		{
-			liuyanMana(req, res); // 留言管理
-		}
-		if(type.endsWith("liuyanDel"))
-		{
-			liuyanDel(req, res);  // 留言删除
-		}
-		if(type.endsWith("liuyanHuifu"))
-		{
-			liuyanHuifu(req, res); // 留言回复
-		}
-		if(type.endsWith("liuyanAll"))
-		{
-			liuyanAll(req, res);  // 获取所有留言
-		}
-		if(type.endsWith("liuyanDetail"))
-		{
-			liuyanDetail(req, res); // 留言详细信息
-		}
-	}
-
-	/**
-	 * liuyanAdd方法用于处理添加留言的操作。
-	 * 获取留言内容，保存到数据库，并跳转到提示页面。
-	 */
-	public void liuyanAdd(HttpServletRequest req,HttpServletResponse res)
-	{
-		HttpSession session = req.getSession();
-		Tuser user = (Tuser)session.getAttribute("user");  // 从session中获取当前登录用户
-
-		// 获取留言内容
-		String neirong = req.getParameter("neirong");
-		String liuyanshi = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()); // 当前时间
-		String user_id = user.getId();  // 获取用户ID
-		String huifu = "";  // 默认无回复
-		String huifushi = "";  // 默认无回复时间
-
-		// 构建SQL插入语句
-		String sql = "insert into t_liuyan(neirong, liuyanshi, user_id, huifu, huifushi) values(?,?,?,?,?)";
-		Object[] params = {neirong, liuyanshi, user_id, huifu, huifushi};
-
-		DB mydb = new DB();  // 创建DB对象
-		mydb.doPstm(sql, params);  // 执行SQL语句
-		mydb.closed();  // 关闭数据库连接
-
-		req.setAttribute("msg", "留言完毕");  // 设置提示信息
-		String targetURL = "/common/msg.jsp";  // 定义跳转页面
-		dispatch(targetURL, req, res);  // 请求转发到提示页面
-	}
-
-	/**
-	 * liuyanMana方法用于管理留言。
-	 * 从数据库获取所有留言，并将其显示在管理页面。
-	 */
-	public void liuyanMana(HttpServletRequest req,HttpServletResponse res) throws ServletException, IOException
-	{
-		List liuyanList = new ArrayList();
-		String sql = "select * from t_liuyan order by liuyanshi";  // 获取所有留言的SQL语句
-		Object[] params = {};
-		DB mydb = new DB();  // 创建DB对象
-		try
-		{
-			mydb.doPstm(sql, params);  // 执行SQL查询
-			ResultSet rs = mydb.getRs();  // 获取结果集
-			while(rs.next())  // 遍历结果集
-			{
-				TLiuyan liuyan = new TLiuyan();  // 创建留言对象
-
-				liuyan.setId(rs.getInt("id"));
-				liuyan.setNeirong(rs.getString("neirong"));
-				liuyan.setLiuyanshi(rs.getString("liuyanshi"));
-				liuyan.setUser_id(rs.getString("user_id"));
-				liuyan.setHuifu(rs.getString("huifu"));
-				liuyan.setHuifushi(rs.getString("huifushi"));
-
-				liuyanList.add(liuyan);  // 将留言添加到列表中
-			}
-			rs.close();  // 关闭结果集
-		}
-		catch(Exception e)
-		{
-			e.printStackTrace();  // 打印异常
-		}
-		mydb.closed();  // 关闭数据库连接
-
-		req.setAttribute("liuyanList", liuyanList);  // 将留言列表设置到请求属性中
-		req.getRequestDispatcher("admin/liuyan/liuyanMana.jsp").forward(req, res);  // 转发到留言管理页面
-	}
-
-	/**
-	 * liuyanDel方法用于删除指定ID的留言。
-	 * 从数据库删除对应留言数据，并跳转到提示页面。
-	 */
-	public void liuyanDel(HttpServletRequest req,HttpServletResponse res)
-	{
-		String sql = "delete from t_liuyan where id=" + Integer.parseInt(req.getParameter("id"));  // 删除留言的SQL语句
-		Object[] params = {};
-		DB mydb = new DB();  // 创建DB对象
-		mydb.doPstm(sql, params);  // 执行删除操作
-		mydb.closed();  // 关闭数据库连接
-
-		req.setAttribute("msg", "留言信息删除完毕");  // 设置删除成功的提示信息
-		String targetURL = "/common/msg.jsp";  // 定义跳转页面
-		dispatch(targetURL, req, res);  // 请求转发到提示页面
-	}
-
-	/**
-	 * liuyanHuifu方法用于回复留言。
-	 * 获取回复内容，并将其更新到数据库中，同时跳转到提示页面。
-	 */
-	public void liuyanHuifu(HttpServletRequest req,HttpServletResponse res)
-	{
-		String huifu = req.getParameter("huifu");  // 获取回复内容
-		String huifushi = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date());  // 回复时间
-		int id = Integer.parseInt(req.getParameter("id"));  // 获取留言ID
-
-		// 更新留言的回复内容和时间
-		String sql = "update t_liuyan set huifu=?, huifushi=? where id=?";
-		Object[] params = {huifu, huifushi, id};
-		DB mydb = new DB();  // 创建DB对象
-		mydb.doPstm(sql, params);  // 执行更新操作
-		mydb.closed();  // 关闭数据库连接
-
-		req.setAttribute("msg", "回复完毕");  // 设置回复成功的提示信息
-		String targetURL = "/common/msg.jsp";  // 定义跳转页面
-		dispatch(targetURL, req, res);  // 请求转发到提示页面
-	}
-
-	/**
-	 * liuyanAll方法用于获取所有留言。
-	 * 从数据库获取所有留言数据并显示在前端页面。
-	 */
-	public void liuyanAll(HttpServletRequest req,HttpServletResponse res) throws ServletException, IOException
-	{
-		List liuyanList = new ArrayList();
-		String sql = "select * from t_liuyan order by liuyanshi";  // 获取所有留言的SQL语句
-		Object[] params = {};
-		DB mydb = new DB();  // 创建DB对象
-		try
-		{
-			mydb.doPstm(sql, params);  // 执行SQL查询
-			ResultSet rs = mydb.getRs();  // 获取结果集
-			while(rs.next())  // 遍历结果集
-			{
-				TLiuyan liuyan = new TLiuyan();  // 创建留言对象
-
-				liuyan.setId(rs.getInt("id"));
-				liuyan.setNeirong(rs.getString("neirong"));
-				liuyan.setLiuyanshi(rs.getString("liuyanshi"));
-				liuyan.setUser_id(rs.getString("user_id"));
-				liuyan.setHuifu(rs.getString("huifu"));
-				liuyan.setHuifushi(rs.getString("huifushi"));
-
-				liuyanList.add(liuyan);  // 将留言添加到列表中
-			}
-			rs.close();  // 关闭结果集
-		}
-		catch(Exception e)
-		{
-			e.printStackTrace();  // 打印异常
-		}
-		mydb.closed();  // 关闭数据库连接
-
-		req.setAttribute("liuyanList", liuyanList);  // 将留言列表设置到请求属性中
-		req.getRequestDispatcher("site/liuyan/liuyanAll.jsp").forward(req, res);  // 转发到留言展示页面
-	}
-
-	/**
-	 * liuyanDetail方法用于查看指定ID的留言详细信息。
-	 * 从数据库中查询特定ID的留言，并将其显示在详细信息页面。
-	 */
-	public void liuyanDetail(HttpServletRequest req,HttpServletResponse res) throws ServletException, IOException
-	{
-		int id = Integer.parseInt(req.getParameter("id"));  // 获取留言ID
-
-		// 获取留言的详细信息
-		req.setAttribute("liuyan", get_liuyan(id));
-
-		// 转发到留言详细页面显示内容
-		req.getRequestDispatcher("site/liuyan/liuyanDetail.jsp").forward(req, res);
-	}
-
-	/**
-	 * get_liuyan方法用于根据留言ID从数据库中查询并返回该留言对象。
-	 * @param id 留言ID
-	 * @return 返回查询到的留言对象
-	 */
-	public TLiuyan get_liuyan(int id)
-	{
-		TLiuyan liuyan = new TLiuyan();  // 创建留言对象
-
-		// 查询特定ID的留言数据
-		String sql = "select * from t_liuyan where id=?";
-		Object[] params = {id};
-		DB mydb = new DB();  // 创建DB对象
-		try
-		{
-			mydb.doPstm(sql, params);  // 执行SQL查询
-			ResultSet rs = mydb.getRs();  // 获取结果集
-			while(rs.next())  // 遍历结果集
-			{
-				liuyan.setId(rs.getInt("id"));
-				liuyan.setNeirong(rs.getString("neirong"));
-				liuyan.setLiuyanshi(rs.getString("liuyanshi"));
-				liuyan.setUser_id(rs.getString("user_id"));
-				liuyan.setHuifu(rs.getString("huifu"));
-				liuyan.setHuifushi(rs.getString("huifushi"));
-			}
-			rs.close();  // 关闭结果集
-		}
-		catch(Exception e)
-		{
-			e.printStackTrace();  // 打印异常
-		}
-		mydb.closed();  // 关闭数据库连接
-
-		return liuyan;  // 返回留言对象
-	}
-
-	/**
-	 * dispatch方法用于将请求转发到指定的目标页面。
-	 * @param targetURI 目标页面的URI
-	 * @param request 请求对象
-	 * @param response 响应对象
-	 */
-	public void dispatch(String targetURI, HttpServletRequest request, HttpServletResponse response)
-	{
-		// 获取目标URI的RequestDispatcher
-		RequestDispatcher dispatch = getServletContext().getRequestDispatcher(targetURI);
-		try
-		{
-			dispatch.forward(request, response);  // 请求转发
-		}
-		catch (ServletException e)
-		{
-			e.printStackTrace();  // 打印异常
-		}
-		catch (IOException e)
-		{
-			e.printStackTrace();  // 打印异常
-		}
-	}
-
-	/**
-	 * init方法用于初始化Servlet配置。
-	 * @param config Servlet配置对象
-	 */
-	public void init(ServletConfig config) throws ServletException
-	{
-		super.init(config);  // 调用父类的初始化方法
-	}
-
-	/**
-	 * destroy方法用于销毁Servlet实例。
-	 * 在Servlet销毁时清理资源，通常不需要在此类中做额外处理。
-	 */
-	public void destroy()
-	{
-		// 在此方法中可以释放一些资源，如数据库连接等。
-	}
-}
diff --git a/loginService.java b/loginService.java
deleted file mode 100644
index 72aeb9e..0000000
--- a/loginService.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package com.itbaizhan.service;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpSession;
-
-import org.directwebremoting.WebContext;
-import org.directwebremoting.WebContextFactory;
-
-import com.itbaizhan.dao.DB;
-import com.itbaizhan.orm.TAdmin;
-import com.itbaizhan.orm.Tcatelog;
-import com.itbaizhan.orm.Tuser;
-import com.itbaizhan.util.Cart;
-
-public class loginService {
-
-	/**
-	 * 用户登录方法
-	 * 根据用户类型判断登录的身份，并验证账号密码。
-	 * 登录成功后，将用户信息存入 session 中。
-	 *
-	 * @param userName 用户名
-	 * @param userPw 密码
-	 * @param userType 用户类型（0：管理员，1：会员，2：其他）
-	 * @return 登录结果，"yes" 表示登录成功，"no" 表示登录失败
-	 */
-	public String login(String userName, String userPw, int userType) {
-		String result = "no"; // 默认登录失败
-
-		if (userType == 0) { // 系统管理员登录
-			String sql = "select * from t_admin where userName=? and userPw=?";
-			Object[] params = { userName, userPw };
-			DB mydb = new DB();
-			mydb.doPstm(sql, params);
-			try {
-				ResultSet rs = mydb.getRs(); // 获取查询结果集
-				boolean mark = (rs == null || !rs.next() ? false : true); // 判断查询结果是否为空
-				if (!mark) {
-					result = "no"; // 登录失败
-				} else {
-					result = "yes"; // 登录成功
-					TAdmin admin = new TAdmin();
-					admin.setUserId(rs.getInt("userId"));
-					admin.setUserName(rs.getString("userName"));
-					admin.setUserPw(rs.getString("userPw"));
-
-					WebContext ctx = WebContextFactory.get(); // 获取 WebContext 对象
-					HttpSession session = ctx.getSession();
-					session.setAttribute("userType", 0); // 设置用户类型为管理员
-					session.setAttribute("admin", admin); // 将管理员信息存入 session
-				}
-				rs.close();
-			} catch (SQLException e) {
-				System.out.println("登录失败！");
-				e.printStackTrace();
-			} finally {
-				mydb.closed();
-			}
-		}
-
-		if (userType == 1) { // 会员登录
-			String sql = "select * from t_user where loginname=? and loginpw=? and del='no'";
-			Object[] params = { userName, userPw };
-			DB mydb = new DB();
-			try {
-				mydb.doPstm(sql, params); // 执行 SQL 查询
-				ResultSet rs = mydb.getRs(); // 获取查询结果集
-				boolean mark = (rs == null || !rs.next() ? false : true); // 判断查询结果是否为空
-				if (!mark) {
-					result = "no"; // 登录失败
-				} else {
-					result = "yes"; // 登录成功
-					Tuser user = new Tuser();
-					user.setId(rs.getString("id"));
-					user.setLoginname(rs.getString("loginname"));
-					user.setLoginpw(rs.getString("loginpw"));
-					user.setName(rs.getString("name"));
-					user.setDel(rs.getString("del"));
-
-					WebContext ctx = WebContextFactory.get(); // 获取 WebContext 对象
-					HttpSession session = ctx.getSession();
-					session.setAttribute("userType", 1); // 设置用户类型为会员
-					session.setAttribute("user", user); // 将用户信息存入 session
-
-					// 创建一个空的购物车对象，存入 session
-					Cart cart = new Cart();
-					session.setAttribute("cart", cart);
-				}
-				rs.close();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			mydb.closed();
-		}
-
-		if (userType == 2) {
-			// 用户类型为 2 的登录逻辑可以在这里添加（暂未实现）
-		}
-		return result; // 返回登录结果
-	}
-
-	/**
-	 * 修改管理员密码
-	 * 管理员修改密码功能。
-	 *
-	 * @param userPwNew 新密码
-	 * @return 修改结果，"yes" 表示修改成功
-	 */
-	public String adminPwEdit(String userPwNew) {
-		System.out.println("DDDD");
-		try {
-			Thread.sleep(700); // 确保线程运行顺序
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-
-		WebContext ctx = WebContextFactory.get(); // 获取 WebContext 对象
-		HttpSession session = ctx.getSession();
-		TAdmin admin = (TAdmin) session.getAttribute("admin"); // 获取当前登录的管理员对象
-
-		String sql = "update t_admin set userPw=? where userId=?";
-		Object[] params = { userPwNew, admin.getUserId() }; // 设置更新的参数
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行更新操作
-
-		return "yes"; // 返回修改成功的结果
-	}
-
-	/**
-	 * 获取所有菜品类别
-	 * 查询所有未删除的菜品类别并返回结果。
-	 *
-	 * @return 菜品类别列表
-	 */
-	public List catelogAll() {
-		try {
-			Thread.sleep(700); // 确保线程运行顺序
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-
-		List catelogList = new ArrayList(); // 初始化菜品类别列表
-		String sql = "select * from t_catelog where del='no'"; // 查询未删除的菜品类别
-		Object[] params = {};
-		DB mydb = new DB();
-		try {
-			mydb.doPstm(sql, params); // 执行查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) { // 遍历结果集
-				Tcatelog catelog = new Tcatelog();
-				catelog.setId(rs.getString("id")); // 设置菜品类别 ID
-				catelog.setName(rs.getString("name")); // 设置菜品类别名称
-				catelogList.add(catelog); // 将菜品类别添加到列表
-			}
-			rs.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		mydb.closed(); // 关闭数据库连接
-		return catelogList; // 返回菜品类别列表
-	}
-}
diff --git a/orderMana.jsp b/orderMana.jsp
deleted file mode 100644
index 96607b1..0000000
--- a/orderMana.jsp
+++ /dev/null
@@ -1,121 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false" %> 
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-
-		<link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-		
-		<script language="JavaScript" src="<%=path %>/js/public.js" type="text/javascript"></script>
-		
-        <script language="javascript">
-            function orderDetail(order_id)//璁㈠崟鏄庣粏淇℃伅
-	        {
-	                 var url="<%=path %>/buy?type=orderDetail&order_id="+order_id; //璺宠浆椤甸潰
-	                 var n="";
-	                 var w="600px";//瀹藉害
-	                 var h="500px";//楂樺害
-	                 var s="resizable:no;help:no;status:no;scroll:yes"; //涓嶅彲璋冩暣澶у皬 鏃犲府鍔╂爮 鏃犵姸鎬佹爮 鏈夋粴鍔ㄦ潯 
-				     openWin(url,n,w,h,s);
-	        }
-	        
-	       function orderDel(id)
-           {
-               if(confirm('鎮ㄧ‘瀹氬垹闄ゅ悧锛�'))
-               {
-                   window.location.href="<%=path %>/order?type=orderDel&id="+id; //锛熷悗浼犲叆鍙傛暟锛�&涓哄弬鏁伴棿鐨勫垎闅旂
-               }
-           }
-           
-           function orderShouli(id)
-           {
-               if(confirm('鎮ㄧ‘瀹氬彈鐞嗚鍗曞悧锛�'))
-               {
-                   window.location.href="<%=path %>/order?type=orderShouli&id="+id;
-               }
-           }
-           
-           
-           function huifuAdd(id)
-           {
-               var url="<%=path %>/admin/order/huifuAdd.jsp?id="+id;
-               window.location.href=url;
-           }
-           
-           
-           function userDetail(id)
-           {
-               var url="<%=path %>/user?type=userDetail&id="+id;
-               window.location.href=url;
-           }
-        </script>
-	</head>
-
-	<body leftmargin="2" topmargin="2" background='<%=path %>/img/allbg.gif'>
-			<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-				<tr bgcolor="#E7E7E7">
-					<td height="14" colspan="44" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-				</tr>
-				<tr align="center" bgcolor="#FAFAF1" height="22">
-					<td width="4%">搴忓彿</td>
-					<td width="10%">璁㈠崟缂栧彿</td>
-					<td width="10%">涓嬪崟鏃堕棿</td>
-					<td width="10%">鐘舵��</td>
-					
-					<td width="10%">鎺掗槦璁℃椂</td>
-					
-					<td width="15%">閫佽揣鍦板潃</td>
-					<td width="10%">浠樻鏂瑰紡</td>
-					<td width="10%">鎬婚噾棰�</td>
-				<td width="10%">鏄庣粏</td>
-					
-					<td width="10%">鐢ㄦ埛淇℃伅</td>
-					<td width="10%">鎿嶄綔</td>
-		        </tr>	
-				<c:forEach items="${requestScope.orderList}" var="order" varStatus="ss">
-				<tr align='center' bgcolor="#FFFFFF" height="22">  <!--鍙栧緱璁㈠崟鐨勫悇绉嶄俊鎭紝搴忓彿浠�1寮�濮�-->
-					<td bgcolor="#FFFFFF" align="center">${ss.index+1}</td>
-					<td bgcolor="#FFFFFF" align="center">${order.bianhao}</td>
-					<td bgcolor="#FFFFFF" align="center">${order.shijian}</td>
-					<td bgcolor="#FFFFFF" align="center">
-					     <c:if test="${order.zhuangtai=='no'}"> <!-- 濡傛灉鐘舵��=no锛屾樉绀烘湭鍙楃悊锛岀偣鍑诲彈鐞嗚鍗曡Е鍙戝彈鐞嗚鍗昽rderShouli锛坕d锛夊嚱鏁� --> 
-					         鏈彈鐞�&nbsp;&nbsp;&nbsp;<a href="#" style="color: red" onclick="orderShouli(${order.id})" class="pn-loperator">鍙楃悊璁㈠崟</a>
-					     </c:if>
-					     <c:if test="${order.zhuangtai=='yes'}"> <!--濡傛灉鐘舵��=yes锛屾樉绀哄凡鍙楃悊-->
-					        宸插彈鐞�
-					     </c:if>
-					</td>
-					
-					
-					<td bgcolor="#FFFFFF" align="center">
-					    ${order.huifu}
-					    &nbsp;&nbsp;&nbsp;<a href="#" style="color: red" onclick="huifuAdd(${order.id})" class="pn-loperator">璁℃椂</a> 
-					    <!-- 鐐瑰嚮璁℃椂鍙互瑙﹀彂huifuAdd锛坕d锛夊嚱鏁帮紝鏉ヤ负鐢ㄦ埛杩涜娑堟伅鍥炲锛屽鍑犵偣杩囨潵鍙�-->
-					</td>
-					
-					<td bgcolor="#FFFFFF" align="center">${order.songhuodizhi}</td>
-					<td bgcolor="#FFFFFF" align="center">${order.fukuanfangshi}</td>
-					<td bgcolor="#FFFFFF" align="center">${order.jine}</td> <!-- 鑾峰緱浠樻鏂瑰紡锛岄�佽揣鍦板潃锛屾�婚噾棰濅俊鎭� -->
-					 <td><input value="鏄庣粏" type="button" onclick="orderDetail(${order.id})"/></td>
-			<!-- 鐐瑰嚮鏄庣粏瑙﹀彂鍓嶉潰瀹氫箟鐨勮鍗曟槑缁唎rderDetail锛坕d锛�-->		
-					<td><input value="鏌ョ湅鐢ㄦ埛" type="button" onclick="userDetail('${order.user_id}')"/></td> 
-			<!-- 鐐瑰嚮鏌ョ湅鐢ㄦ埛瑙﹀彂鍓嶉潰瀹氫箟鐨勭敤鎴锋槑缁唘serDetail锛坕d锛�-->
-					<td>
-					    <input type="button" onclick="orderDel(${order.id})" value="鍒犻櫎"/>
-					</td>
-				</tr>
-				</c:forEach>
-			</table>
-	</body>
-</html>
diff --git a/order_servlet.java b/order_servlet.java
deleted file mode 100644
index 1048704..0000000
--- a/order_servlet.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package com.itbaizhan.action;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.itbaizhan.dao.DB;
-import com.itbaizhan.orm.Torder;
-
-public class order_servlet extends HttpServlet {
-
-	/**
-	 * service方法根据请求的类型(type)来决定调用哪个处理方法。
-	 * @param req HttpServletRequest对象，包含请求参数和数据
-	 * @param res HttpServletResponse对象，用于返回响应数据
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		// 获取请求的type参数来判断要执行的操作
-		String type = req.getParameter("type");
-
-		if (type.endsWith("orderMana")) {
-			orderMana(req, res); // 订单管理
-		}
-		if (type.endsWith("orderDel")) {
-			orderDel(req, res); // 订单删除
-		}
-		if (type.endsWith("orderShouli")) {
-			orderShouli(req, res); // 受理订单
-		}
-
-		if (type.endsWith("huifuAdd")) {
-			huifuAdd(req, res); // 添加回复
-		}
-	}
-
-	/**
-	 * orderMana方法用于查询所有订单并展示在管理页面。
-	 * 查询数据库中所有订单，并将其保存到request中供JSP页面显示。
-	 * @param req HttpServletRequest对象
-	 * @param res HttpServletResponse对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void orderMana(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		List orderList = new ArrayList(); // 用来保存订单列表
-		String sql = "select * from t_order order by zhuangtai desc"; // 查询所有订单，按状态倒序排列
-		Object[] params = {}; // SQL语句参数，当前查询没有参数
-
-		DB mydb = new DB(); // 创建DB对象来操作数据库
-		try {
-			mydb.doPstm(sql, params); // 执行SQL查询
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) {
-				Torder order = new Torder(); // 创建Torder对象来封装每一条订单数据
-
-				// 从结果集中提取每个字段的值，并设置到Torder对象中
-				order.setId(rs.getString("id"));
-				order.setBianhao(rs.getString("bianhao"));
-				order.setShijian(rs.getString("shijian"));
-				order.setZhuangtai(rs.getString("zhuangtai"));
-				order.setHuifu(rs.getString("huifu"));
-				order.setSonghuodizhi(rs.getString("songhuodizhi"));
-				order.setFukuanfangshi(rs.getString("fukuanfangshi"));
-				order.setJine(rs.getInt("jine"));
-				order.setUser_id(rs.getString("user_id"));
-
-				// 将订单添加到订单列表
-				orderList.add(order);
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace(); // 捕获异常并打印堆栈信息
-		}
-		mydb.closed(); // 关闭数据库连接
-
-		// 将订单列表保存到request中，以便JSP页面进行展示
-		req.setAttribute("orderList", orderList);
-		req.getRequestDispatcher("admin/order/orderMana.jsp").forward(req, res); // 请求转发到订单管理页面
-	}
-
-	/**
-	 * orderDel方法用于删除指定ID的订单。
-	 * @param req HttpServletRequest对象
-	 * @param res HttpServletResponse对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void orderDel(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String id = req.getParameter("id"); // 获取要删除订单的ID
-
-		// 编写SQL语句删除指定ID的订单
-		String sql = "delete from t_order where id=?";
-		Object[] params = { id }; // 设置参数为订单ID
-		DB mydb = new DB(); // 创建DB对象
-		mydb.doPstm(sql, params); // 执行删除操作
-		mydb.closed(); // 关闭数据库连接
-
-		// 设置删除成功的消息，并转发到消息页面显示
-		req.setAttribute("msg", "信息删除完毕");
-		String targetURL = "/common/msg.jsp";
-		dispatch(targetURL, req, res);
-	}
-
-	/**
-	 * orderShouli方法用于受理订单，将订单状态更改为已受理。
-	 * @param req HttpServletRequest对象
-	 * @param res HttpServletResponse对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void orderShouli(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String id = req.getParameter("id"); // 获取要受理的订单ID
-
-		// 编写SQL语句更新订单的状态为"yes"（已受理）
-		String sql = "update t_order set zhuangtai='yes' where id=?";
-		Object[] params = { id }; // 设置参数为订单ID
-		DB mydb = new DB(); // 创建DB对象
-		mydb.doPstm(sql, params); // 执行更新操作
-		mydb.closed(); // 关闭数据库连接
-
-		// 设置受理成功的消息，并转发到消息页面显示
-		req.setAttribute("msg", "订单受理完毕");
-		String targetURL = "/common/msg.jsp";
-		dispatch(targetURL, req, res);
-	}
-
-	/**
-	 * huifuAdd方法用于为订单添加回复信息。
-	 * @param req HttpServletRequest对象
-	 * @param res HttpServletResponse对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void huifuAdd(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String id = req.getParameter("id"); // 获取订单ID
-		String huifu = req.getParameter("huifu"); // 获取回复内容
-
-		// 编写SQL语句更新订单的回复内容
-		String sql = "update t_order set huifu=? where id=?";
-		Object[] params = { huifu, id }; // 设置参数为回复内容和订单ID
-		DB mydb = new DB(); // 创建DB对象
-		mydb.doPstm(sql, params); // 执行更新操作
-		mydb.closed(); // 关闭数据库连接
-
-		// 设置回复成功的消息，并转发到消息页面显示
-		req.setAttribute("msg", "操作成功");
-		String targetURL = "/common/msg.jsp";
-		dispatch(targetURL, req, res);
-	}
-
-	/**
-	 * dispatch方法用于将请求转发到指定的目标页面。
-	 * @param targetURI 目标页面的URI
-	 * @param request 请求对象
-	 * @param response 响应对象
-	 */
-	public void dispatch(String targetURI, HttpServletRequest request, HttpServletResponse response) {
-		// 获取目标URI的RequestDispatcher
-		RequestDispatcher dispatch = getServletContext().getRequestDispatcher(targetURI);
-		try {
-			dispatch.forward(request, response); // 执行请求转发
-		} catch (ServletException e) {
-			e.printStackTrace(); // 捕获并打印异常
-		} catch (IOException e) {
-			e.printStackTrace(); // 捕获并打印异常
-		}
-	}
-
-	/**
-	 * init方法用于初始化Servlet配置。
-	 * @param config Servlet配置对象
-	 */
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config); // 调用父类的初始化方法
-	}
-
-	/**
-	 * destroy方法用于销毁Servlet实例。
-	 * 在Servlet销毁时清理资源，通常不需要在此类中做额外处理。
-	 */
-	public void destroy() {
-		// 在此方法中可以释放一些资源，如数据库连接等
-	}
-}
diff --git a/site/cart/mycart.jsp b/site/cart/mycart.jsp
new file mode 100644
index 0000000..2438053
--- /dev/null
+++ b/site/cart/mycart.jsp
@@ -0,0 +1,157 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type='text/javascript' src='<%=path %>/dwr/interface/cartService.js'></script>
+	<script type='text/javascript' src='<%=path %>/dwr/engine.js'></script>
+	<script type='text/javascript' src='<%=path %>/dwr/util.js'></script>
+    
+    <script type="text/javascript">
+            function delGoodsFromCart(goodsId) //鍒犻櫎璐墿杞﹂噷鐨勮揣鐗�
+	        {
+	            document.getElementById("indicator1").style.display="block";
+	            cartService.delGoodsFromCart(goodsId,callback111);
+	        }
+           
+            function clearCart() //娓呯┖璐墿杞�
+	        {
+	            document.getElementById("indicator1").style.display="block";
+	            cartService.clearCart(callback111);
+	        }
+           
+            function modiNum(goodsId,quantity) //鏀瑰彉璐墿杞﹂噷鐗╁搧鐨勬暟閲�
+	        {
+	            var r1= /^[0-9]*[1-9][0-9]*$/銆�銆�//姝ｆ暣鏁� 
+	            var val=r1.test(quantity); //quantity涓轰綘瑕佸垽鏂殑瀛楃 鎵ц杩斿洖缁撴灉 true 鎴� false
+	            if(val==false)
+	            {
+	                alert("鏁伴噺蹇呴』鏄暟瀛�,璇烽噸鏂拌緭鍏�");
+	            }
+	            else  //鍚﹀垯璋冪敤modiNum鍑芥暟锛屾敼鍙樿喘鐗╄溅涓墿鍝佺殑鏁伴噺	
+	            {
+	                document.getElementById("indicator1").style.display="block";
+	                cartService.modiNum(goodsId,quantity,callback111);
+	            }
+	        }
+	        
+	        function callback111(data) //鍒ゆ柇鏄惁璁㈠崟绗﹀悎搴撳瓨
+	        {
+	            document.getElementById("indicator1").style.display="none";
+	            if(data=="no")
+			    {
+			        alert("搴撳瓨涓嶈冻");
+			    }
+			    if(data=="yes")  //澶熷簱瀛橈紝閲嶆柊鍔犺浇璇ラ〉闈�
+			    {
+			        document.location.reload(true);
+			    }
+	        }
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 澶撮儴 -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 澶撮儴 -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 鍙充晶 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">鎴戠殑璐墿杞�</a></h2>
+				<div class="entry">
+                    <table width="98%" border="0" cellpadding="2" cellspacing="1" align="center" style="margin-top:8px">
+											<tr align="center" bgcolor="#FAFAF1" height="22">
+												  <td>鍟嗗搧鍚嶇О</td>
+								                  <td>璐拱浠锋牸</td>
+								                  <td>璐拱鏁伴噺</td>
+								                  <td>鎬婚噾棰�</td>
+								                  <td>鎿嶄綔</td>
+									        </tr>	
+											<c:forEach items="${sessionScope.cart.items}" var="item">
+											<tr align='center' bgcolor="#FFFFFF" height="22">
+												<td bgcolor="#FFFFFF" align="center">${item.value.goods.mingcheng}</td>
+												<td bgcolor="#FFFFFF" align="center">锟�:${item.value.goods.tejia}</td>
+												<td bgcolor="#FFFFFF" align="center"><input type="text" onChange="modiNum(${item.value.goods.id},this.value)" value="${item.value.goods_quantity}" size="4"/></td>
+												<!-- 鏀瑰彉鏁伴噺 -->
+												<td bgcolor="#FFFFFF" align="center">${item.value.goods.tejia * item.value.goods_quantity}</td>
+												<!-- 鎬婚噾棰�=鐗逛环*鏁伴噺 -->
+												<td bgcolor="#FFFFFF" align="center">
+												   <input type="button" value="鍒犻櫎" style="width: 50px;height: 20px;" onclick="delGoodsFromCart(${item.value.goods.id})">
+												</td>
+											</tr>
+											</c:forEach>
+											<tr>
+								                 <td colspan="5" class="Order_Total" align="right">
+								                    <br>
+												     鎬婚噾棰濓細<span id="totalMoney">${sessionScope.cart.totalPrice}</span>
+												    &nbsp;&nbsp;&nbsp;&nbsp;
+												    <img id="indicator1" src="<%=path %>/images/loading.gif" style="display:none"/>
+												 </td>
+								              </tr>	
+										</table>
+										<table>
+				        				   <tr height="7"><td></td></tr>
+						                   <tr>
+						                       <td width="120"></td>
+						                       <td>
+						                           <input type="button" value="娓呯┖" style="width: 80px;height: 30px;" onclick="clearCart()">
+						                       </td>
+						                       <td>
+						                           <input type="button" value="缁х画" style="width: 80px;height: 30px;" onclick="javascript:window.location.href='<%=path %>/site/default.jsp'">
+						                       </td>
+						                       <td>
+						                           <input type="button" value="缁撹处" style="width: 80px;height: 30px;" onclick="javascript:window.location.href='<%=path %>/site/order/orderQueren.jsp'">
+						                       </td>
+						                   </tr>
+						               </table>
+ 				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶 -->
+		<!-- 宸︿晶 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶 -->
+		<div style="clear: both;">&nbsp;</div>
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/site/default.jsp b/site/default.jsp
new file mode 100644
index 0000000..97835ab
--- /dev/null
+++ b/site/default.jsp
@@ -0,0 +1,23 @@
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head><!-- 杩斿洖璇ョ綉椤电殑鏍箄rlrequest.getScheme()杩斿洖鍗忚鐨勫悕绉癶ttp銆俽equest.getServerName()鑾峰彇鏈嶅姟鍣ㄧ殑鍚嶇Оlocalhost锛宺equest.getServerPort()鑾峰彇绔彛8080-->
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+  </head>
+  
+  <body>
+        <script type="text/javascript">
+            var url="<%=path %>/index?type=index"
+            window.location.href=url;//榛樿璺宠浆鐨勭晫闈㈢殑鍦板潃
+        </script>
+  </body>
+</html>
diff --git a/site/goods/goodsByCatelog.jsp b/site/goods/goodsByCatelog.jsp
new file mode 100644
index 0000000..543ad48
--- /dev/null
+++ b/site/goods/goodsByCatelog.jsp
@@ -0,0 +1,93 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type="text/javascript">
+        
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 澶撮儴 -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 澶撮儴 -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 鍙充晶 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">鑿滃搧淇℃伅</a></h2>
+				<div class="entry"> <!-- 璁剧疆鑿滃搧鍥剧墖鏍峰紡 -->
+				    <TABLE class=main border=0 cellSpacing=2 cellPadding=2>
+		                  <TR>
+			                  <c:forEach items="${requestScope.goodsList}" var="goods" varStatus="sta">
+			                    <c:if test="${sta.index%4==0}"><!-- 姣忚鏀�4寮犲浘鐗� -->
+			                       </tr><tr>
+			                    </c:if>
+				                <TD>
+				                  <TABLE onmouseover="this.style.backgroundColor='#FF6600'" onmouseout="this.style.backgroundColor=''" border=0 cellSpacing=1 cellPadding=2 width=98 bgColor=#e1e1e1 align=center height=100>
+				                    <TR>
+				                      <TD bgColor=#ffffff  align=left>
+				                        <P align="center">
+				                           <A href="<%=path %>/goods?type=goodsDetailQian&id=${goods.id }"><IMG border=0 align=absMiddle src="<%=path %>/${goods.fujian }" width=150 height=140></A>
+				                           </>
+				                           <center><A href="<%=path %>/goods?type=goodsDetailQian&id=${goods.id }"><FONT color=#ff0000></FONT>${goods.mingcheng }</A></center>
+				                        </P>
+				                      </TD>
+				                    </TR>
+				                  </TABLE>
+				                </TD>
+			                </c:forEach>
+			              </TR>
+		             </TABLE>
+				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶 -->
+		
+		<!-- 宸︿晶 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶 -->
+		<div style="clear: both;">&nbsp;</div> <!-- clear:both璇ュ睘鎬х殑鍊兼寚鍑轰簡涓嶅厑璁告湁娴姩鍏冪礌 -->
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/site/goods/goodsDetailQian.jsp b/site/goods/goodsDetailQian.jsp
new file mode 100644
index 0000000..e301c0c
--- /dev/null
+++ b/site/goods/goodsDetailQian.jsp
@@ -0,0 +1,110 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type="text/javascript">
+	        function buy1()
+	        {
+	            <c:if test="${sessionScope.userType !=1}">
+	                alert("璇峰厛鐧诲綍");
+	            </c:if>
+	            <c:if test="${sessionScope.userType==1}">
+		            if(document.buy.quantity.value=="")
+		            {
+		                alert("璇疯緭鍏ヨ喘涔版暟閲�");
+		                return false;
+		            }
+		            document.buy.submit();
+	            </c:if>
+	        }
+	</script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!--澶撮儴 -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 澶撮儴 -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 鍙充晶 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">鑿滃搧璇︾粏淇℃伅</a></h2>
+				<div class="entry">
+				    <form action="<%=path %>/buy?type=addToCart" method="post" name="buy">
+                         <table width="100%" border="0" cellpadding="9" cellspacing="9">
+							    <tr>
+							       <td align="left"><img width="220" height="180" src="<%=path %>/${requestScope.goods.fujian }" style="border:1px solid #ccc; padding:3px;"/></td>
+							    </tr>
+							    <tr>
+							       <td align="left">鍟嗗搧缂栧彿锛�${requestScope.goods.bianhao }</td>
+							    </tr>
+							    <tr>
+							       <td align="left">鍟嗗搧鍚嶇О锛�${requestScope.goods.mingcheng }</td>
+							    </tr>
+							    <tr>
+							       <td align="left">鍟嗗搧鎻忚堪锛�<c:out value="${requestScope.goods.jieshao }" escapeXml="false"></c:out></td>
+							    </tr>
+							    <tr>
+							       <td align="left">浠锋牸锛�${requestScope.goods.shichangjia }</td>
+							    </tr>
+							    <tr>
+							       <td align="left">
+							             鏁伴噺锛�<input type="text" name="quantity" value="1" size="8" onkeyup="this.value=this.value.replace(/\D/g,'')" onafterpaste="this.value=this.value.replace(/\D/g,'')"/>
+							           <!--鎻掑叆鑿滃搧鐨勬暟閲忔锛宱npropertychange褰撹緭鍏ユ灞炴�у彉鍖栨椂锛岃Е鍙憃nchange1灞炴�э紝淇敼鏁版嵁搴撹彍鍝佷环鏍� 涓嬩竴鍙ヤ负鎸夐敭涔嬪悗瑙﹀彂灏嗚緭鍏ュ�间负闈炴暟瀛楃殑瀛楃鏇挎崲涓虹┖锛岀矘璐翠箣鍚庤Е鍙戝皢杈撳叆鍊间负闈炴暟瀛楃殑瀛楃鏇挎崲涓虹┖-->
+							           <input type="hidden" name="goods_id" value="${requestScope.goods.id }"/>
+							           <input type="button" value="璐拱" style="width: 80px;height: 30px;" onclick="buy1()">
+							       </td>
+							    </tr>
+			              </table>         
+                    </form>
+				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶 -->
+		<!-- 宸︿晶 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶 -->
+		<div style="clear: both;">&nbsp;</div>
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/site/goods/goodsNew.jsp b/site/goods/goodsNew.jsp
new file mode 100644
index 0000000..caac8d0
--- /dev/null
+++ b/site/goods/goodsNew.jsp
@@ -0,0 +1,93 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type="text/javascript">
+        
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 澶撮儴 -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 澶撮儴 -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 鍙充晶 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">鑿滃搧淇℃伅</a></h2>
+				<div class="entry"> <!-- 璁剧疆鑿滃搧鍥剧墖鏍峰紡 -->
+				    <TABLE class=main border=0 cellSpacing=2 cellPadding=2>
+		                  <TR>
+			                  <c:forEach items="${requestScope.goodsList}" var="goods" varStatus="sta">
+			                    <c:if test="${sta.index%4==0}"> <!-- 姣忚鏀�4寮犲浘鐗� -->
+			                       </tr><tr>
+			                    </c:if>
+				                <TD>
+				                  <TABLE onmouseover="this.style.backgroundColor='#FF6600'" onmouseout="this.style.backgroundColor=''" border=0 cellSpacing=1 cellPadding=2 width=98 bgColor=#e1e1e1 align=center height=100>
+				                    <TR>
+				                      <TD bgColor=#ffffff  align=left>
+				                        <P align="center">
+				                           <A href="<%=path %>/goods?type=goodsDetailQian&id=${goods.id }"><IMG border=0 align=absMiddle src="<%=path %>/${goods.fujian }" width=150 height=140></A>
+				                           </>
+				                           <center><A href="<%=path %>/goods?type=goodsDetailQian&id=${goods.id }"><FONT color=#ff0000></FONT>${goods.mingcheng }</A></center>
+				                        </P>
+				                      </TD>
+				                    </TR>
+				                  </TABLE>
+				                </TD>
+			                </c:forEach>
+			              </TR>
+		             </TABLE>
+				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶 -->
+		
+		<!-- 宸︿晶 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶 -->
+		<div style="clear: both;">&nbsp;</div>
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/site/goods/goodsRes.jsp b/site/goods/goodsRes.jsp
new file mode 100644
index 0000000..78a7944
--- /dev/null
+++ b/site/goods/goodsRes.jsp
@@ -0,0 +1,92 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type="text/javascript">
+        
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 澶撮儴 -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 澶撮儴 -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 鍙充晶 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">鑿滃搧淇℃伅</a></h2>
+				<div class="entry">
+				    <TABLE class=main border=0 cellSpacing=2 cellPadding=2>
+		                  <TR>
+			                  <c:forEach items="${requestScope.goodsList}" var="goods" varStatus="sta">
+			                    <c:if test="${sta.index%4==0}">
+			                       </tr><tr>
+			                    </c:if>
+				                <TD>
+				                  <TABLE onmouseover="this.style.backgroundColor='#FF6600'" onmouseout="this.style.backgroundColor=''" border=0 cellSpacing=1 cellPadding=2 width=98 bgColor=#e1e1e1 align=center height=100>
+				                    <TR>
+				                      <TD bgColor=#ffffff  align=left>
+				                        <P align="center">
+				                           <A href="<%=path %>/goods?type=goodsDetailQian&id=${goods.id }"><IMG border=0 align=absMiddle src="<%=path %>/${goods.fujian }" width=150 height=140></A>
+				                           </>
+				                           <center><A href="<%=path %>/goods?type=goodsDetailQian&id=${goods.id }"><FONT color=#ff0000></FONT>${goods.mingcheng }</A></center>
+				                        </P>
+				                      </TD>
+				                    </TR>
+				                  </TABLE>
+				                </TD>
+			                </c:forEach>
+			              </TR>
+		             </TABLE>
+				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶 -->
+		<!-- 宸︿晶 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶 -->
+		<div style="clear: both;">&nbsp;</div>
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/site/goods/goodsSea.jsp b/site/goods/goodsSea.jsp
new file mode 100644
index 0000000..9ce52f6
--- /dev/null
+++ b/site/goods/goodsSea.jsp
@@ -0,0 +1,90 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type="text/javascript">
+        
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 澶撮儴 -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 澶撮儴 -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 鍙充晶 -->
+		<div id="content">
+			<div class="post">
+				<!-- <h2 class="title"><a href="#">鑿滃搧淇℃伅</a></h2> -->
+				<div class="entry">
+				    <form name="ff" method="post" action="<%=path %>/goods?type=goodsRes">
+				        <table align="left" border="0" cellpadding="9" cellspacing="9">
+							<tr align='center'>
+								<td style="width: 60px;" align="left">
+									鑿滃搧鍚嶇О锛�										    
+								</td>
+								<td align="left">
+									<input name="mingcheng" type="text" style="width: 200px;" />
+								    
+								</td>
+							</tr>
+							<tr align='center'>
+							   <td style="width: 60px;" align="left"></td>
+							   <td align="left">
+							      <input type="submit" value="鏌ヨ"/>&nbsp; 
+							      <input type="reset" value="閲嶇疆"/>&nbsp;	
+							   </td>
+							</tr>
+						</table>
+				    </form>
+				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶 -->
+		<!-- 宸︿晶 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶 -->
+		<div style="clear: both;">&nbsp;</div>
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/site/inc/daohang.jsp b/site/inc/daohang.jsp
new file mode 100644
index 0000000..4710547
--- /dev/null
+++ b/site/inc/daohang.jsp
@@ -0,0 +1,81 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+	
+	<script type="text/javascript" src="<%=path %>/js/popup_shuaxin.js"></script>
+    
+    <script type="text/javascript">
+	   function userlogin() //浼氬憳鐧诲綍
+       {
+            var url="<%=path %>/site/userlogin/userlogin.jsp";
+            var pop=new Popup({ contentType:1,isReloadOnClose:false,width:400,height:200}); //pop绫诲瀷涓�1锛屽唴宓宨frame锛屽叧闂悗涓嶉噸鏂板姞杞介〉闈�
+            pop.setContent("contentUrl",url);
+            pop.setContent("title","浼氬憳鐧诲綍");
+            pop.build();
+            pop.show();
+       }
+       
+       function mycart() //鎴戠殑璐墿杞�
+       {
+            <c:if test="${sessionScope.userType !=1}">  //鍒ゆ柇鏄惁鐧诲綍浜�
+                  alert("璇峰厛鐧诲綍");
+            </c:if>
+            
+            <c:if test="${sessionScope.userType==1}">
+                var url="<%=path %>/site/cart/mycart.jsp";
+                window.open(url,"_self");
+            </c:if>
+       } 
+         
+       function myorder()
+       {
+            <c:if test="${sessionScope.userType !=1}">  //鍒ゆ柇鏄惁鐧诲綍浜�
+                  alert("璇峰厛鐧诲綍");
+            </c:if>
+            
+            <c:if test="${sessionScope.userType==1}">
+                var url="<%=path %>/buy?type=myorder";
+                window.open(url,"_self");
+            </c:if>
+       } 
+    </script>
+    
+  </head>
+  
+  <body>
+        <div id="menu">
+			<ul>
+				<li><a href="<%=path %>/goods?type=goodsNew">鑿滃搧淇℃伅</a></li>
+				<li><a href="<%=path %>/site/userreg/userreg.jsp">娉ㄥ唽浼氬憳</a></li>
+				<li><a href="<%=path %>/site/goods/goodsSea.jsp">鑿滃搧鏌ヨ</a></li>
+				<li><a href="#" onclick="mycart()">鎴戠殑璐墿杞�</a></li>
+				<li><a href="#" onclick="myorder()">鎴戠殑璁㈠崟</a></li>
+				 <li><a href="<%=path %>/liuyan?type=liuyanAll">绯荤粺鐣欒█鏉�</a></li>
+			</ul>
+		</div>
+		<div id="search">
+			<form method="post" action="" style="color: white;font-family: 寰蒋闆呴粦">
+			    <c:if test="${sessionScope.userType ==1 }">
+			             娆㈣繋鎮細${sessionScope.user.name }&nbsp;&nbsp; <!--鍙栧緱鐢ㄦ埛鍚�-->
+			    <a href="<%=path %>/user?type=userLogout" style="color: white;font-family: 寰蒋闆呴粦">瀹夊叏閫�鍑�</a> &nbsp;&nbsp;
+			    </c:if>
+			    <c:if test="${sessionScope.userType !=1 }"> <!-- 濡傛灉鏈櫥褰曟樉绀轰細鍛樼櫥褰曟寜閽� -->
+			    <a href="#" onclick="userlogin()" style="color: white;font-family: 寰蒋闆呴粦">浼氬憳鐧婚檰</a>
+			    </c:if>
+			</form>
+		</div>
+  </body>
+</html>
diff --git a/site/inc/left.jsp b/site/inc/left.jsp
new file mode 100644
index 0000000..640fb46
--- /dev/null
+++ b/site/inc/left.jsp
@@ -0,0 +1,47 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+    
+    
+    
+  </head>
+  
+  <body>
+            <ul>
+				<!-- <li>
+					<h2>浼氬憳鐧诲綍</h2>
+					<p>Mauris vitae nisl n ornare, orci in consectetuer hendrerit, volutpat.</p>
+				</li> -->
+				<li>
+					<h2>鑿滃搧绫诲埆</h2>
+					<ul>
+					    <c:forEach items="${sessionScope.catelogList}" var="catelog">
+						<li><a href="<%=path %>/goods?type=goodsByCatelog&catelog_id=${catelog.id}">${catelog.name}</a></li>
+						</c:forEach>
+					</ul>
+				</li>
+				<li>
+					
+					
+					
+					
+					
+					
+				</li>
+			</ul>
+  </body>
+</html>
diff --git a/site/index.jsp b/site/index.jsp
new file mode 100644
index 0000000..8c0eae3
--- /dev/null
+++ b/site/index.jsp
@@ -0,0 +1,72 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    <!--璋冪敤涓�涓閮ㄧ殑CSS鏍峰紡鏂囦欢,css鐨勯摼鎺ヨ矾寰勬槸path/css/qiantai.css,璋冪敤鐨勬牱寮忎负stylesheet锛岃緭鍑哄獟浠嬫槸灞忓箷-->
+    
+    <script type="text/javascript">
+        var url="<%=path %>/goods?type=goodsNew"
+        window.location.href=url;//璺宠浆鍒拌椤甸潰锛屼紶鍏ュ弬鏁�
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 鏍囬閮ㄥ垎缁撴潫 -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include> 
+		<!-- 杩涘叆daohang.jsp瀵艰埅椤甸潰锛岃缃鏋滅紦瀛樺尯婊′簡锛屽氨杈撳嚭鏁版嵁銆�-->
+	</div>
+	
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 鍙充晶css鏍峰紡璁剧疆 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">1111</a></h2>
+				<div class="entry">
+					<p>Sed lacus. Donec lectus. Nullam prum. Proin imperdiet est. Phasellus dapibus semper urna. Pellentesque ornare,</p>
+				<!-- 鎷変竵鏂囨帓鐗堟祴璇� -->
+				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶css鏍峰紡璁剧疆 -->
+		<!-- 宸︿晶璁剧疆 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶璁剧疆 -->
+		<div style="clear: both;">&nbsp;</div><!-- clear:both璇ュ睘鎬х殑鍊兼寚鍑轰簡涓嶅厑璁告湁娴姩鍏冪礌 -->
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/huifuAdd.jsp b/site/liuyan/liuyanAdd.jsp
similarity index 59%
rename from huifuAdd.jsp
rename to site/liuyan/liuyanAdd.jsp
index 4919a81..239ce5b 100644
--- a/huifuAdd.jsp
+++ b/site/liuyan/liuyanAdd.jsp
@@ -1,6 +1,4 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
 <%@ page isELIgnored="false" %> 
 
 <%
@@ -10,6 +8,7 @@ String path = request.getContextPath();
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
+	    <base target="_self"/>
 		<meta http-equiv="pragma" content="no-cache" />
 		<meta http-equiv="cache-control" content="no-cache" />
 		<meta http-equiv="expires" content="0" />
@@ -19,40 +18,39 @@ String path = request.getContextPath();
         <link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
         
         <script language="javascript">
-            function c()//娌℃湁杈撳叆浠讳綍淇℃伅锛屾彁绀鸿杈撳叆淇℃伅鍐呭銆�
+            function c()//鍒ゆ柇鏄惁杈撳叆鐣欒█
             {
-                if(document.formAdd.huifu.value=="")
+                if(document.formAdd.neirong.value=="")
                 {
                     alert("璇疯緭鍏ヤ俊鎭唴瀹�");
                     return false;
                 }
                 
-                document.formAdd.submit();//鍚﹀垯锛屽皢鍥炲淇℃伅鍙戦��
+                document.formAdd.submit();
             }
         </script>
 	</head>
 
 	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'>
-			<form action="<%=path %>/order?type=huifuAdd" name="formAdd" method="post">
-				     <table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-						<tr bgcolor="#E7E7E7">
-							<td height="14" colspan="4" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-						</tr>
+			<form action="<%=path %>/liuyan?type=liuyanAdd" name="formAdd" method="post">
+				     <table width="98%" align="center" border="0" cellpadding="4" cellspacing="1" bgcolor="#CBD8AC" style="margin-bottom:8px">
+						<tr bgcolor="#EEF4EA">
+					        <td colspan="3" background="<%=path %>/img/wbg.gif" class='title'><span>&nbsp;</span></td>
+					    </tr>
 						<tr align='center' bgcolor="#FFFFFF"  height="22">
 						    <td width="10%" bgcolor="#FFFFFF" align="right">
-						         淇℃伅鍐呭锛�
+						          淇℃伅鍐呭锛�
 						    </td>
 						    <td width="90%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="huifu" size="40"/>
+						        <input type="text" name="neirong" size="80"/>
 						    </td>
 						</tr>
-						<tr align='center' bgcolor="#FFFFFF" height="22">
+						<tr align='center' bgcolor="#FFFFFF"  height="22">
 						    <td width="10%" bgcolor="#FFFFFF" align="right">
 						        &nbsp;
 						    </td>
 						    <td width="90%" bgcolor="#FFFFFF" align="left">
-						       <input type="hidden" name="id" value="<%=request.getParameter("id") %>"/>
-						       <input type="button" value="鎻愪氦" onclick="c()"/>&nbsp; <!-- 鎻愪氦鏃惰Е鍙慶鍑芥暟锛屽垽鏂槸鍚︽湭鍥炲鍐呭 -->
+						       <input type="button" value="鎻愪氦" onclick="c()"/>&nbsp; 
 						       <input type="reset" value="閲嶇疆"/>&nbsp;
 						    </td>
 						</tr>
diff --git a/site/liuyan/liuyanAll.jsp b/site/liuyan/liuyanAll.jsp
new file mode 100644
index 0000000..36e603a
--- /dev/null
+++ b/site/liuyan/liuyanAll.jsp
@@ -0,0 +1,108 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <style rel="stylesheet" type="text/css">
+	    .c1-bline{border-bottom:#999 1px dashed;border-top:1px;}
+		.f-right{float:right}
+		.f-left{float:left}
+		.clear{clear:both}
+	</style>
+    
+    <script type="text/javascript">
+            function liuyanAdd()//娣诲姞鐣欒█,涓婇潰璁剧疆浜嗗悜鍙虫诞鍔紝dashed铏氱嚎妗嗭紝涓婅竟妗嗭紝鏃犳诞鍔ㄥ厓绱�
+	        {
+		             <c:if test="${sessionScope.userType!=1}">//濡傛灉娌℃湁鐧诲綍
+	                    alert("璇峰厛鐧诲綍");
+	                 </c:if>
+	                 <c:if test="${sessionScope.userType==1}">//濡傛灉鐧诲綍浜嗭紝鍒涘缓涓獥鍙ｏ紝閲嶈浇褰撳墠椤甸潰
+	                    var strUrl = "<%=path %>/site/liuyan/liuyanAdd.jsp";
+		                var ret = window.open(strUrl,"","dialogWidth:800px; dialogHeight:500px; dialogLeft: status:no; directories:yes;scrollbars:yes;Resizable=no;");
+		                window.location.reload();
+	                 </c:if>
+	        }
+	        
+	        function liuyanDetail(id)//鐣欒█鏄庣粏
+	        {
+	             var strUrl = "<%=path %>/liuyan?type=liuyanDetail&id="+id;
+	             var ret = window.open(strUrl,"","dialogWidth:800px; dialogHeight:500px; dialogLeft: status:no; directories:yes;scrollbars:yes;Resizable=no;");
+	        }
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 澶撮儴-->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 澶撮儴 -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 涓棿 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">&nbsp;&nbsp;鐣欒█鏉挎ā鍧� </a></h2>
+				<div class="entry">
+					<c:forEach items="${requestScope.liuyanList}" var="liuyan">
+										   <div class="c1-bline" style="padding:7px 0px;">
+										       <div class="f-left">
+										           &nbsp;&nbsp;&nbsp;
+											       <img src="<%=path %>/images/head-mark4.gif" align="middle" class="img-vm" border="0"/> 
+										           <a href="#" onclick="liuyanDetail(${liuyan.id })">${liuyan.neirong}</a>
+										       </div>
+										      <div class="f-right">${liuyan.liuyanshi}</div>
+										      <div class="clear"></div>
+										  </div>
+										</c:forEach>
+										<br/>
+										<center>
+										   <a href="#" onclick="liuyanAdd()" style="color: red">鎴戣鐣欒█</a>
+										</center>
+				</div>
+			</div>
+		</div>
+		<!-- 涓棿 -->
+		<!-- 宸︿晶 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶 -->
+		<div style="clear: both;">&nbsp;</div>
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/liuyanHuifu.jsp b/site/liuyan/liuyanDetail.jsp
similarity index 58%
rename from liuyanHuifu.jsp
rename to site/liuyan/liuyanDetail.jsp
index 9855dff..36fb9ef 100644
--- a/liuyanHuifu.jsp
+++ b/site/liuyan/liuyanDetail.jsp
@@ -1,6 +1,7 @@
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ page isELIgnored="false" %> 
-<%@ taglib uri="http://java.fckeditor.net" prefix="FCK"%>
 
 <%
 String path = request.getContextPath();
@@ -9,7 +10,6 @@ String path = request.getContextPath();
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
-	    <base target="_self"/>
 		<meta http-equiv="pragma" content="no-cache" />
 		<meta http-equiv="cache-control" content="no-cache" />
 		<meta http-equiv="expires" content="0" />
@@ -19,41 +19,45 @@ String path = request.getContextPath();
         <link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
         
         <script language="javascript">
-            function c()//鏃犲唴瀹规彁绀鸿杈撳叆鍥炲鍐呭
-            {
-                if(document.formAdd.huifu.value=="")
-                {
-                    alert("璇疯緭鍏ュ洖澶嶅唴瀹�");
-                    return false;
-                }
-                
-                document.formAdd.submit();//鏈夊唴瀹瑰皢鍐呭鎻愪氦 
-            }
         </script>
 	</head>
 
 	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'>
-			<form action="<%=path %>/liuyan?type=liuyanHuifu" name="formAdd" method="post">
+			<form action="<%=path %>/gonggaoAdd.action" name="formAdd" method="post">
 				     <table width="98%" align="center" border="0" cellpadding="4" cellspacing="1" bgcolor="#CBD8AC" style="margin-bottom:8px">
 						<tr bgcolor="#EEF4EA">
-					        <td colspan="3" background="<%=path %>/img/wbg.gif" class='title'><span>淇℃伅浜ゆ祦</span></td>
+					        <td colspan="3" background="<%=path %>/img/wbg.gif" class='title'><span>&nbsp;</span></td>
 					    </tr>
+						<tr align='center' bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='red';" onMouseOut="javascript:this.bgColor='#FFFFFF';" height="22">
+						    <td width="25%" bgcolor="#FFFFFF" align="right">
+						          淇℃伅鍐呭锛�
+						    </td>
+						    <td width="75%" bgcolor="#FFFFFF" align="left">
+						        ${requestScope.liuyan.neirong }
+						    </td>
+						</tr>
+						<tr align='center' bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='red';" onMouseOut="javascript:this.bgColor='#FFFFFF';" height="22">
+						    <td width="25%" bgcolor="#FFFFFF" align="right">
+						          鍙戝竷鏃堕棿锛�
+						    </td>
+						    <td width="75%" bgcolor="#FFFFFF" align="left">
+						        ${requestScope.liuyan.liuyanshi }
+						    </td>
+						</tr>
 						<tr align='center' bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='red';" onMouseOut="javascript:this.bgColor='#FFFFFF';" height="22">
 						    <td width="25%" bgcolor="#FFFFFF" align="right">
 						          鍥炲鍐呭锛�
 						    </td>
 						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="huifu" size="80"/>
+						        ${requestScope.liuyan.huifu }
 						    </td>
 						</tr>
 						<tr align='center' bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='red';" onMouseOut="javascript:this.bgColor='#FFFFFF';" height="22">
 						    <td width="25%" bgcolor="#FFFFFF" align="right">
-						        &nbsp;
+						         鍥炲鍐呭锛�
 						    </td>
 						    <td width="75%" bgcolor="#FFFFFF" align="left">
-						       <input type="hidden" name="id" value="<%=request.getParameter("id") %>"/> <!-- 鑾峰緱id灞炴�� -->
-						       <input type="button" value="鎻愪氦" onclick="c()"/>&nbsp; <!-- 瑙﹀彂涔嬪墠瀹氫箟鐨勬槸鍚︽湁鍐呭鐨勫垽鏂� -->
-						       <input type="reset" value="閲嶇疆"/>&nbsp;
+						        ${requestScope.liuyan.huifushi }
 						    </td>
 						</tr>
 					 </table>
diff --git a/site/order/myorder.jsp b/site/order/myorder.jsp
new file mode 100644
index 0000000..535a196
--- /dev/null
+++ b/site/order/myorder.jsp
@@ -0,0 +1,113 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type="text/javascript">
+	        function orderDetail(order_id)//璁㈠崟鏄庣粏鍑芥暟
+	        {
+                 var strUrl="<%=path %>/buy?type=orderDetail&order_id="+order_id;//浼犲叆鍙傛暟
+                 var ret = window.open(strUrl,"","dialogWidth:800px; dialogHeight:500px; dialogLeft: status:no; directories:yes;scrollbars:yes;Resizable=no;");
+			     //鐐瑰嚮璁㈠崟鏄庣粏锛屽脊鍑虹獥鍙ｏ紝瀹�800px锛岄珮500px锛屾棤鐘舵�佹爮锛岀洰褰曟爮鍙锛屾湁婊氬姩鏍忥紝涓嶅彲鏀瑰彉澶у皬
+	        }
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 鎴戠殑璁㈠崟椤甸潰鐨勫ご閮ㄨ彍鍗曟爮daohang.jsp -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 鎴戠殑璁㈠崟椤甸潰鐨勫ご閮ㄨ彍鍗曟爮daohang.jsp  -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 鍙充晶 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">鎴戠殑璁㈠崟</a></h2>
+				<div class="entry">
+					 <c:forEach items="${requestScope.orderList}" var="order">
+						               <fieldset style="width:95%; margin-left:5px;"><legend class="fieldtitle"></legend>
+											<table class="bill" width="97%" cellpadding="4" cellspacing="4">
+											    <tr>
+											        <td>璁㈠崟缂栧彿锛�${order.bianhao}</td>
+											    </tr>
+											    <tr>
+											        <td>涓嬪崟鏃堕棿锛�${order.shijian}</td>
+											    </tr>
+											    <tr>
+											        <td>
+											                                璁㈠崟鐘舵�侊細
+											           <c:if test="${order.zhuangtai=='no'}"> <!-- if鐨勬彃鍏� -->
+												                             鏈彈鐞�
+												       </c:if>
+												       <c:if test="${order.zhuangtai=='yes'}">
+												                             宸插彈鐞�
+												       </c:if>
+											        </td>
+											    </tr>
+											    <tr>
+											        <td>鎺掗槦璁℃椂锛�${order.huifu}</td>
+											    </tr>
+											    <tr>
+											        <td>閫佽揣鍦板潃锛�${order.songhuodizhi}</td>
+											    </tr>
+											    <tr>
+											        <td>浠樻鏂瑰紡锛�${order.fukuanfangshi}</td>
+											    </tr>
+											    <tr>
+											        <td>鎬婚噾棰濓細${order.jine}&nbsp;
+														<a href="#" onclick="orderDetail(${order.id})"/>璁㈠崟鏄庣粏</a>
+													</td>
+											    </tr>
+											</table>
+									   </fieldset>
+									   <br/>
+									   </c:forEach>                      
+ 				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶 -->
+		<!-- 宸︿晶鑿滃搧绫诲埆 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶鑿滃搧绫诲埆 -->
+		<div style="clear: both;">&nbsp;</div>
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p> <a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/site/order/orderDetail.jsp b/site/order/orderDetail.jsp
new file mode 100644
index 0000000..8b19261
--- /dev/null
+++ b/site/order/orderDetail.jsp
@@ -0,0 +1,180 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    
+    <title>My JSP 'orderDetail.jsp' starting page</title>
+    
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+	<style type="text/css">
+         a:link          { color: #000000; text-decoration: none } //閾炬帴骞冲父鐨勭姸鎬侊紝瓒呴摼鎺ユ棤涓嬪垝绾�
+		 a:visited       { color: #000000; text-decoration: none } //閾炬帴琚闂箣鍚庯紝瓒呴摼鎺ユ棤涓嬪垝绾�
+		 a:active        { color: #000000; text-decoration: none } //榧犳爣鏀惧埌杩炴帴涓婄殑鏃跺�欙紝瓒呴摼鎺ユ棤涓嬪垝绾�
+		 a:hover         { color: #ff0000; text-decoration: none; position: relative; right: 0px; top: 1px } //杩炴帴琚寜涓嬬殑鏃跺�欙紝瓒呴摼鎺ユ棤涓嬪垝绾匡紝鐩稿瀹氫綅锛堥殢绐楀彛澶у皬鍙樺寲鑰屽彉鍖栵級
+		
+		.C_Font{ font-weight:bold;}
+		.Red{ color:#FF0000; font-weight:bold;}
+		.Sell_Title{ text-align:center;background:url(<%=path %>/images/icon_sell.gif) top no-repeat left;
+		 font-weight:bold; font-size:14px; color:#FFFFFF; height:30px;}
+		.UserName{ padding:4px 0;}
+		.UserName input{ width:100px; border:1px solid #666;}
+		.UserRegster{  padding:5px 8px 5px 0;}
+		.UserRegster a,.UserRegster a:link,.UserRegster a:visited{ color:#f50;}
+		.UserRegster input{ background:url(<%=path %>/images/button.gif) no-repeat; width:73px; height:23px; border:0px; cursor:hand;}
+		.LoginTitle{text-align:center;background:url(<%=path %>/images/icon_login.gif) top no-repeat left;font-weight:bold; font-size:14px; color:#FFFFFF; height:30px;}
+		.Logo{ text-align:center; vertical-align:top; margin:8px 0;}
+		.Item01Menu{ text-align:right; vertical-align:top;}
+		.Item01Menu a{ padding:2px 10px; background:url(<%=path %>/images/dot_main01.gif) no-repeat left;}
+		.C_Item_Title{ background:url(<%=path %>/images/icon05.gif) no-repeat center;font-weight:bold; text-align:center; color:#fff; height:34px;}
+		.C_Item_Title a,.C_Item_Title a:link,.C_Item_Title a:visited{font-weight:bold; text-align:center; color:#fff;}
+		
+		.C_login_Title{ background:url(<%=path %>/images/heng.gif) no-repeat center;font-weight:bold;font-size:12px; text-align:center; color:#fff; height:34px; padding-top:10px;}
+		.C_Sell_Title{ background:url(<%=path %>/images/icon03.gif) no-repeat center;font-weight:bold; text-align:center; color:#fff; height:34px; padding-top:10px;}
+		.C_DC_Title{ background:url(<%=path %>/images/DC.gif) no-repeat center;font-weight:bold; text-align:center; color:#fff; height:34px; padding-top:10px;}
+		.C_Sort_Title{ background:url(<%=path %>/images/heng.gif) no-repeat center;font-weight:bold;font-size:12px; text-align:center; color:#fff; height:34px; padding-top:10px;}
+		.C_Sort_Title a,.C_Sort_Title a:link,.C_Sort_Title a:visited{ color:#fff;}
+		.C_Search_Title{ background:url(<%=path %>/images/Recomm_05.gif) no-repeat center;font-weight:bold; text-align:center; color:#fff; height:34px; padding-top:10px;}
+		.C_Help_Title{ padding:4px 0;}
+		.C_Help_Title a{ background:url(<%=path %>/images/icon_sell.gif) no-repeat center;font-weight:bold;  color:#fff; height:24px;  padding-left:15px; width:175px; padding-top:5px;}
+		.C_Help_Title a,.C_Help_Title a:link,.C_Help_Title a:visited{ color:#fff;}
+		
+		.C_Goods_Title{ border:1px solid #ccc; background:url(<%=path %>/images/Bule_46.gif) repeat-x; margin-bottom:5px; height:32px;}
+		.C_Goods_Border{ border-top:4px solid #4380CC; padding-top:10px;}
+		.C_Item_bg{ background:url(<%=path %>/images/Bule_56.gif) repeat-y; padding:3px 8px;}
+		.C_pages{ padding:5px 10px; text-align:center;}
+		
+		.C_Input{ background:url(<%=path %>/images/button2.gif) no-repeat; width:73px; height:23px; border:0px; cursor:hand; color:#333;}
+		.input{ color:#f50;height:18px; }
+		.C_Input02{background:url(<%=path %>/images/button.gif) no-repeat; width:73px; height:23px; border:0px; cursor:hand; color:#333;}
+		.C_Input03{background:url(<%=path %>/images/btn_2.png) no-repeat; width:69px; height:28px; border:0px; cursor:hand; color:#fff;}
+		.Register{background:url(<%=path %>/images/btn_1.png) no-repeat; width:105px; height:28px; border:0px; cursor:hand;  text-align:center; padding-top:6px;}
+		//no-repeat涓嶅钩閾�
+		.Order_Table{ margin:15px 0;}
+		.Order_Table td{ font-size:14px;}
+		.Order_Font{ color:#FF0000; font-weight:bold;}
+		.Order_Title{ font-size:14px; font-weight:bold; padding:4px 5px;}
+		.Order_Total{  font-weight:bold; padding:5px 10px 0 10px; color:#FF0000; text-align:center; font-size:14px;}
+		.Car_Leftbg{ background:url(<%=path %>/images/Car_05.gif) repeat-y left; width:8px;}
+		.Car_Rightbg{ background:url(<%=path %>/images/Car_13.gif) repeat-y right; width:8px;}
+		.C_Carbg_Default{ background:url(<%=path %>/images/Car_21.gif) no-repeat center;font-size:12px; text-align:center; width:150px;}
+		.C_Carbg_Current{ background:url(<%=path %>/images/Car_18.gif) no-repeat center;font-size:12px; text-align:center; color:#fff; width:150px;}
+		.Onlinpay{
+		}
+		.Onlinpay input{ background:url(<%=path %>/images/Car_icon_07.gif) no-repeat center; width:115px; height:30px; border:0px; cursor:hand; padding-bottom:8px; padding-right:8px;}
+		
+		.textBox{
+			border-bottom:1px;
+			border-left:1px;
+			border-right:1px;
+			border-top:1px;
+			border-color:#666666;
+			border-style:solid;
+		}
+		
+		.itemTitle {
+			font-family: "榛戜綋", "Arial Black";
+			font-size: 16px;
+			line-height: 40px;
+			font-weight: 200;
+			color: #000000;
+			text-decoration: none;
+			letter-spacing: 5px;  
+		} //瀛楁瘝闂磋窛5px
+		
+		.blueText {
+			font-family: "瀹嬩綋", System;
+			font-size: 12px;
+			line-height: 20px;
+			color: #0033CC;
+			text-decoration: none;
+		}
+		
+		.redText {
+			font-family: "瀹嬩綋", System;
+			font-size: 12px;
+			line-height: 20px;
+			color: #FF0000;
+			text-decoration: none;
+		}
+		
+		
+		.text {
+			font-family: "瀹嬩綋", System;
+			font-size: 12px;
+			line-height: 20px;
+			color: #000000;
+			text-decoration: none;
+		}
+		
+		
+		.body {
+			margin-left: 0px;
+			margin-top: 2px;
+			margin-right: 0px;
+			margin-bottom: 2px;
+			background-image: url(<%=path %>/images/backGroup.gif);	
+		}
+		
+		
+		.header_menu{background:url(<%=path %>/images/header_menu_02.gif) repeat-x;}
+		
+		
+		.whiteTitle{
+			font-family: "瀹嬩綋", System;
+			font-size: 13px;
+			line-height: 20px;
+			font-weight: bold;
+			color: #FFFFFF;
+			text-decoration: none;	
+		}
+		
+		
+		.whiteText {
+			font-family: "瀹嬩綋", System;
+			font-size: 12px;
+			line-height: 20px;
+			color: #FFFFFF;
+			text-decoration: none;
+		}
+		
+		.blackTitle {
+			font-family: "瀹嬩綋", System;
+			font-size: 12px;
+			font-weight: bold;
+			line-height: 20px;
+			color: #000000;
+			text-decoration: none;
+		}
+    </style>
+	
+  </head>
+  
+  <body class="body" leftmargin="0" rightmargin="0">
+     <table cellspacing="1" cellpadding="0" width="100%" border="0" bgcolor="#F7F3F7">
+          <tr height="26">
+              <td class="blackTitle" align="center">鍟嗗搧鍚嶇О</td>
+              <td class="blackTitle" align="center">璐拱鏁伴噺</td>
+              <td class="blackTitle" align="center">璐拱浠锋牸</td>
+          </tr>
+		  <c:forEach items="${requestScope.orderItemList}" var="orderItem">
+		  <tr class="text" align="center" bgcolor="#FFFFFF">
+			  <td>${orderItem.goods.mingcheng}</td>
+			  <td>${orderItem.goods_quantity}</td>
+			  <td>${orderItem.goods.tejia}</td>
+		  </tr>
+		  </c:forEach>
+  	</table>
+  </body>
+</html>
diff --git a/site/order/orderQueren.jsp b/site/order/orderQueren.jsp
new file mode 100644
index 0000000..b7a446b
--- /dev/null
+++ b/site/order/orderQueren.jsp
@@ -0,0 +1,123 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head> <!-- 璁㈠崟濉啓鐣岄潰 -->
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type="text/javascript">
+            function back1() //杩斿洖涔嬪墠鐨勯〉闈�
+	        {
+	           window.history.go(-1);
+	        }
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 澶撮儴鍚勭鍔熻兘 -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 澶撮儴鍚勭鍔熻兘 -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!--鍙充晶 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">濉啓璁㈠崟</a></h2>
+				<div class="entry">
+                    <form action="<%=path %>/buy?type=orderSubmit" name="f" method="post">
+					                        <table width="98%" align="center" border="0" cellpadding="9" cellspacing="9">
+												<tr align='center'>
+												    <td width="20%" bgcolor="#FFFFFF" align="left">
+												          鏀惰揣浜哄笎鍙凤細
+												    </td>
+												    <td width="80%" bgcolor="#FFFFFF" align="left">
+												         <input type="text" readonly="readonly" value="${sessionScope.user.loginname}"/>
+												    </td>
+												</tr>
+												<tr align='center'>
+												    <td width="20%" bgcolor="#FFFFFF" align="left">
+												          鏀惰揣浜哄鍚嶏細
+												    </td>
+												    <td width="80%" bgcolor="#FFFFFF" align="left">
+												         <input type="text" readonly="readonly" value="${sessionScope.user.name}"/>
+												    </td>
+												</tr>
+												<tr align='center'>
+												    <td width="20%" bgcolor="#FFFFFF" align="left">
+												          閫佽揣鍦板潃锛�
+												    </td>
+												    <td width="80%" bgcolor="#FFFFFF" align="left">
+												         <input type="text" name="songhuodizhi"/>
+												    </td>
+												</tr>
+												<tr align='center'>
+												    <td width="20%" bgcolor="#FFFFFF" align="left">
+												                浠樻鏂瑰紡锛�
+												    </td>
+												    <td width="80%" bgcolor="#FFFFFF" align="left">
+												         <select name="fukuanfangshi" style="width:155px;">
+					   		                               <option value="璐у埌浠樻">璐у埌浠樻</option>
+					   		                             </select> <!-- 涓嬫媺鑿滃崟 -->
+												    </td>
+												 </tr>
+										    </table>
+					        				<table>
+					        				   <tr height="7"><td></td></tr>
+							                   <tr>
+							                       <td width="120"></td>
+							                       <td>
+							                          <input type="button" value="杩斿洖" style="width: 80px;height: 30px;" onclick="back1()">
+							                       </td>
+							                       <td>
+							                          <input type="button" value="鎻愪氦璁㈠崟" style="width: 80px;height: 30px;" onclick="javascript:document.f.submit();">
+							                       </td>
+							                   </tr>
+							               </table>
+							            </form>
+ 				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶 -->
+		<!-- 宸︿晶鑿滃搧绫诲埆 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶鑿滃搧绫诲埆 -->
+		<div style="clear: both;">&nbsp;</div>
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/site/order/orderSubmit.jsp b/site/order/orderSubmit.jsp
new file mode 100644
index 0000000..90cd248
--- /dev/null
+++ b/site/order/orderSubmit.jsp
@@ -0,0 +1,94 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ page isELIgnored="false" %> 
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type="text/javascript">
+            function back1()//杩斿洖涔嬪墠鐨勭晫闈�
+	        {
+	           window.history.go(-1);
+	        }
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	<!-- 澶撮儴鍚勭鍔熻兘 -->
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+	</div>
+	<!-- 澶撮儴鍚勭鍔熻兘 -->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 鍙充晶 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#"></a></h2>
+				<div class="entry">
+                    <table width="99%" border="0" cellpadding="5" cellspacing="5" bgcolor="#FFFFFF" align="center" style="margin-top:8px">
+								              <tr>
+								                  <td align="left" style="color: red">鎭枩鎮紝璁㈠崟鎻愪氦鎴愬姛锛�</td>
+								              </tr>
+								              <tr>
+								                  <td style="font-size: 15px;">璁㈠崟缂栧彿锛�${requestScope.order.bianhao }</td>
+								              </tr>
+								              
+								              <tr>
+								                  <td style="font-size: 15px;">鎬婚噾棰濓細${requestScope.order.jine }</td>
+								              </tr>
+								              <tr>
+								                  <td style="font-size: 15px;">涓嬪崟鏃ユ湡:${requestScope.order.shijian }</td>
+								              </tr>
+								              <tr>
+								                  <td style="font-size: 15px;">閫佽揣鍦板潃:${requestScope.order.songhuodizhi }</td>
+								              </tr>
+								              <tr>
+								                  <td style="font-size: 15px;">浠樻鏂瑰紡:${requestScope.order.fukuanfangshi }</td>
+								              </tr>
+					        			</table>
+ 				</div>
+			</div>
+		</div>
+		<!-- 鍙充晶 -->
+		<!-- 宸︿晶鑿滃搧绫诲埆 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include>
+		</div>
+		<!-- 宸︿晶鑿滃搧绫诲埆 -->
+		<div style="clear: both;">&nbsp;</div> <!--clear:both璇ュ睘鎬х殑鍊兼寚鍑轰簡涓嶅厑璁告湁娴姩鍏冪礌 -->
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/site/userlogin/userlogin.jsp b/site/userlogin/userlogin.jsp
new file mode 100644
index 0000000..a965fac
--- /dev/null
+++ b/site/userlogin/userlogin.jsp
@@ -0,0 +1,84 @@
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%
+String path = request.getContextPath();
+String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+	
+	<script type='text/javascript' src='<%=path %>/dwr/interface/loginService.js'></script>
+    <script type='text/javascript' src='<%=path %>/dwr/engine.js'></script>
+    <script type='text/javascript' src='<%=path %>/dwr/util.js'></script>
+    
+	<script type="text/javascript">
+	        function login()//浼氬憳鐧诲綍淇℃伅瀹屾暣鐨勫垽鏂�
+	        {
+	           if(document.userLogin.loginname.value=="")
+	           {
+	               alert("璇疯緭鍏ヨ处鍙�");
+	               return;
+	           }
+	           if(document.userLogin.loginpw.value=="")
+	           {
+	               alert("璇疯緭鍏ュ瘑鐮�");
+	               return;
+	           }
+	           document.getElementById("indicator").style.display="block";//璁剧疆鎴愬潡绾у厓绱狅紝甯﹁嚜鍔ㄦ崲琛�
+	           loginService.login(document.userLogin.loginname.value,document.userLogin.loginpw.value,1,callback);//鍒ゆ柇璐﹀彿瀵嗙爜鏄惁姝ｇ‘
+	        }
+	        
+	        function callback(data)
+			{
+			    document.getElementById("indicator").style.display="none";
+			    if(data=="no")//璐﹀彿瀵嗙爜閿欒锛岃繑鍥瀎ail.jsp椤甸潰
+			    {			       
+			        var url="<%=path %>/common/fail.jsp";
+			        window.location.href=url;
+			    }
+			    if(data!="no")//杩斿洖鐨刣ata灏辨槸鐢ㄦ埛鐨刬d锛屽綋璐﹀彿瀵嗙爜姝ｇ‘鏃�
+			    {			        
+			        var url="<%=path %>/common/succ.jsp";
+			        window.location.href=url;
+			    }
+			}
+	        
+	</script>
+  </head>
+  
+  <body>
+		<form name="userLogin" method="POST" action="">
+		      <table cellspacing="0" cellpadding="0" width="98%" align="center" border="0">
+		          <tr>
+		            <td align="center" colspan="2" height="10"></td>
+		          </tr>
+		          <tr>
+		            <td align="right" width="31%" height="30" style="font-size: 11px;">璐﹀彿锛�</td>
+		            <td align="left" width="69%"><input type="text" name="loginname" style="width: 100px;"/></td>
+		          </tr>
+		          <tr>
+		            <td align="right" height="30" style="font-size: 11px;">瀵嗙爜锛�</td>
+		            <td align="left"><input type="password" name="loginpw" style="width: 100px;"/></td>
+		          </tr>
+		          <tr>
+		            <td align="center" colspan="2" height="5"></td>
+		          </tr>
+		          <tr>
+		            <td align="right" height="30" style="font-size: 11px;">&nbsp;</td>
+		            <td align="left">
+		               <input type="button" value="鐧� 褰�" onclick="login()" style="border:#ccc 1px solid; background-color:#FFFFFF; font-size:12px; padding-top:3px;" />
+					   &nbsp;
+					   <input type="reset" value="閲� 缃�" style="border:#ccc 1px solid; background-color:#FFFFFF; font-size:12px; padding-top:3px;" />
+		               <img id="indicator" src="<%=path %>/images/loading.gif" style="display:none"/> <!-- id锛歩ndicator鎻掑叆杞藉叆鍔ㄧ敾 -->
+		            </td>
+		          </tr>
+		      </table>
+	    </form>
+  </body>
+</html>
diff --git a/site/userreg/userreg.jsp b/site/userreg/userreg.jsp
new file mode 100644
index 0000000..98753b4
--- /dev/null
+++ b/site/userreg/userreg.jsp
@@ -0,0 +1,122 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head><!-- 浼氬憳娉ㄥ唽椤甸潰 -->
+	<meta http-equiv="pragma" content="no-cache"/>
+	<meta http-equiv="cache-control" content="no-cache"/>
+	<meta http-equiv="expires" content="0"/>    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+	<meta http-equiv="description" content="This is my page"/>
+    
+    <link href="<%=path %>/css/qiantai.css" rel="stylesheet" type="text/css" media="screen" />
+    
+    <script type="text/javascript">
+        function check1()//浼氬憳娉ㄥ唽鐣岄潰淇℃伅瀹屾暣鍒ゆ柇
+	    {
+	        if(document.form1.loginname.value=="")
+	        {
+	            alert("璇疯緭鍏ヨ处鍙�");
+	            return false;
+	        }
+	        if(document.form1.loginpw.value=="")
+	        {
+	            alert("璇疯緭鍏ュ瘑鐮�");
+	            return false;
+	        }
+	        document.form1.submit();
+	    }
+    </script>
+  </head>
+  
+  <body>
+<div id="wrapper">
+	<div id="logo">
+		<h1><a href="#">鍩轰簬JSP鐨勯珮鏍″揩椁愬簵璁㈤绯荤粺
+
+
+
+</a></h1>
+		<p><em><a href="#">&nbsp;</a></em></p>
+	</div>
+	<hr/>
+	
+	<div id="header">
+		<jsp:include flush="true" page="/site/inc/daohang.jsp"></jsp:include>
+		<!-- 杩涘叆daohang.jsp瀵艰埅椤甸潰锛岃缃鏋滅紦瀛樺尯婊′簡锛屽氨杈撳嚭鏁版嵁銆�-->
+	</div>
+<!--鏍囬澶撮儴閮ㄥ垎-->
+	
+	
+	<div id="page">
+	<div id="page-bgtop">
+		<!-- 涓棿 -->
+		<div id="content">
+			<div class="post">
+				<h2 class="title"><a href="#">&nbsp;&nbsp;浼氬憳娉ㄥ唽 </a></h2>
+				<div class="entry">
+					<form action="<%=path %>/user?type=userReg" name="form1" method="post">
+												<table width="98%" border="0" align="center" cellpadding="0" cellspacing="1" bgcolor="#CCCCCC">
+													<tr>
+														<td width="20%" height="30" align="right" bgcolor="#F9F9F9" style="font-size: 11px;">
+															璐﹀彿锛�
+														</td>
+														<td width="80%" bgcolor="#FFFFFF">
+															&nbsp;
+															<input type="text" name="loginname" style="width: 200px;"/>
+														</td>
+													</tr>
+													<tr>
+														<td height="30" align="right" bgcolor="#F9F9F9" style="font-size: 11px;">
+															瀵嗙爜锛�
+														</td>
+														<td bgcolor="#FFFFFF">
+															&nbsp;
+															<input type="password" name="loginpw" style="width: 200px;"/>
+														</td>
+													</tr>
+													<tr>
+														<td height="30" align="right" bgcolor="#F9F9F9" style="font-size: 11px;">
+															濮撳悕锛�
+														</td>
+														<td bgcolor="#FFFFFF">
+															&nbsp;
+															<input type="text" name="name" style="width: 200px;"/>
+														</td>
+													</tr>
+													<tr>
+														<td height="30" align="right" bgcolor="#F9F9F9">
+															&nbsp;
+														</td>
+														<td bgcolor="#FFFFFF">
+															&nbsp;
+															<input type="button" value="娉ㄥ唽" onclick="check1();"/>
+															<input type="reset" value="閲嶇疆"/>
+														</td>
+													</tr>
+												</table>
+										  </form>
+				</div>
+			</div>
+		</div>
+		<!-- 涓棿 -->
+		<!-- 宸︿晶 -->
+		<div id="sidebar">
+			<jsp:include flush="true" page="/site/inc/left.jsp"></jsp:include><!--杩涘叆left.jsp宸︿晶鑿滃搧绫诲埆椤甸潰锛岃缃鏋滅紦瀛樺尯婊′簡锛屽氨杈撳嚭鏁版嵁銆�-->
+		</div>
+		<!-- 宸︿晶 -->
+		<div style="clear: both;">&nbsp;</div> <!--clear:both璇ュ睘鎬х殑鍊兼寚鍑轰簡涓嶅厑璁告湁娴姩鍏冪礌 -->
+	</div>
+	</div>
+	
+	<div id="footer-bgcontent">
+	<div id="footer">
+		<p><a href="<%=path %>/login.jsp">绯荤粺鍚庡彴</a></p>
+	</div>
+	</div>
+</div>
+</body>
+</html>
diff --git a/sysPro.jsp b/sysPro.jsp
deleted file mode 100644
index e69de29..0000000
diff --git a/updown/updown.jsp b/updown/updown.jsp
new file mode 100644
index 0000000..17aaf14
--- /dev/null
+++ b/updown/updown.jsp
@@ -0,0 +1,49 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
+<%@ page import="com.jspsmart.upload.*" %>
+<%
+String path = request.getContextPath();
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><!--鍔熻兘宸插垹闄�-->
+  <head>
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+  </head>
+  
+  <body> 
+      <% 
+          try
+          {
+              String fujianPath=request.getParameter("fujianPath");//鑾峰緱鍥剧墖璺緞
+	          String fujianYuashiMing=request.getParameter("fujianYuashiMing");//鑾峰緱鍥剧墖鐨勫師濮嬪悕
+	          fujianYuashiMing=java.net.URLDecoder.decode(fujianYuashiMing,"UTF-8");//鍥剧墖鍘熷鍚嶇殑缂栫爜鏂瑰紡
+	          System.out.println(fujianYuashiMing+fujianPath);//杈撳嚭鍥剧墖鐨勫師濮嬪悕鍜岃矾寰�
+	          
+	          SmartUpload su = new SmartUpload(); // 鏂板缓涓�涓猄martUpload瀵硅薄 
+	
+	          su.initialize(pageContext); // 鍒濆鍖� 
+	
+	          su.setContentDisposition(null); 
+	          // 璁惧畾contentDisposition涓簄ull浠ョ姝㈡祻瑙堝櫒鑷姩鎵撳紑鏂囦欢锛� 
+	          //淇濊瘉鐐瑰嚮閾炬帴鍚庢槸涓嬭浇鏂囦欢銆傝嫢涓嶈瀹氾紝鍒欎笅杞界殑鏂囦欢鎵╁睍鍚嶄负 
+	          //doc鏃讹紝娴忚鍣ㄥ皢鑷姩鐢╳ord鎵撳紑瀹冦�傛墿灞曞悕涓簆df鏃讹紝灏嗙敤acrobat鎵撳紑	          	         
+	          su.downloadFile(fujianPath, null, new String(fujianYuashiMing.getBytes(), "ISO8859-1")); // 涓嬭浇涓枃鏂囦欢	         
+	          out.clear();
+	          out=pageContext.pushBody(); 
+          }
+          catch(Exception e)
+          {%>
+              <script type="text/javascript">
+                    alert("鏂囦欢涓嶅瓨鍦ㄣ�傝鑱旂郴绠＄悊浜哄憳");
+                    window.history.back();
+              </script>
+        <%}
+      %> 
+
+      
+  </body>
+</html>
diff --git a/userDetail.jsp b/userDetail.jsp
deleted file mode 100644
index 1ef9874..0000000
--- a/userDetail.jsp
+++ /dev/null
@@ -1,83 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false" %> 
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-
-		<link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-		
-		<script language="JavaScript" src="<%=path %>/js/public.js" type="text/javascript"></script> 
-		
-        <script language="javascript">
-           function xinyongAdd(user_id) //娣诲姞鐢ㄦ埛淇＄敤璇勪环妯″潡
-           {                      //寮曞叆澶栭儴js鏂囦欢锛屽鍔犻〉闈㈢殑鏁存磥鎬у拰浠ｇ爜鐨勫彲缁存姢鎬�
-                   var url="<%=path %>/admin/xinyong/xinyongAdd.jsp?user_id="+user_id;
-                   window.location.href=url; //璺宠浆鍒扮敤鎴穒d鐨剎inyongAdd.jsp鐣岄潰
-           }
-        </script>
-	</head>
-
-	<body leftmargin="2" topmargin="2" background='<%=path %>/img/allbg.gif'>
-			<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-				<tr bgcolor="#E7E7E7">
-					<td height="14" colspan="14" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-				</tr>
-				<tr align="center" bgcolor="#FAFAF1" height="22">
-				    <td width="4%">搴忓彿</td>
-					<td width="10%">璐﹀彿</td>
-					<td width="10%">瀵� 鐮�</td>
-					<td width="10%">濮撳悕</td>
-					<td width="10%">鎿嶄綔</td>
-		        </tr>	
-				<c:forEach items="${requestScope.userList}" var="user" varStatus="ss"> <!-- 鑾峰彇鐢ㄦ埛淇℃伅锛岃緭鍑哄簭鍙凤紝鍒濆�间负1 -->
-				<tr align='center' bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='red';" onMouseOut="javascript:this.bgColor='#FFFFFF';" height="22">
-					<td bgcolor="#FFFFFF" align="center">
-						 ${ss.index+1}<!--璁剧疆搴忓彿浠�1寮�濮�  -->
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						 ${user.loginname}
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						 ${user.loginpw}
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						 ${user.name} <!-- 鍙栧緱鐢ㄦ埛鐨勫悇绉嶄俊鎭� -->
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						<input type="button" value="娣诲姞淇＄敤璇勪环" onclick="xinyongAdd(${user.id})"/> <!-- 瑙﹀彂娣诲姞淇＄敤jsp鏂囦欢 -->
-					</td>
-				</tr>
-				</c:forEach>
-			</table>
-			
-			
-			<c:forEach items="${requestScope.xinyongList}" var="xinyong" varStatus="sta"> 
-			   &nbsp;&nbsp;&nbsp;
-			   <fieldset style="width:60%; margin-left:5px;"><legend class="fieldtitle"></legend> <!-- 浣跨敤fieldset鏉ヤ负杩欏嚑鏉″姞涓婃 -->
-					<table class="bill" width="97%" cellpadding="4" cellspacing="4" border="0">
-					    <tr>
-					        <td style="width: 100">灞炴�э細${xinyong.shuxing}</td>
-					    </tr>
-					    <tr>
-					        <td style="width: 100">璇勪环鍐呭锛�${xinyong.neirong}</td>
-					    </tr>
-					    <tr>
-					        <td style="width: 100">璇勪环鏃堕棿锛�${xinyong.shijian}</td>
-					    </tr>
-					</table>
-			   </fieldset>
-			   <br/>
-			   </c:forEach>
-	</body>
-</html>
diff --git a/userMana.jsp b/userMana.jsp
deleted file mode 100644
index 3a0e09a..0000000
--- a/userMana.jsp
+++ /dev/null
@@ -1,66 +0,0 @@
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false" %> 
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-
-		<link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-		
-		<script language="JavaScript" src="<%=path %>/js/public.js" type="text/javascript"></script> 
-		
-        <script language="javascript">
-           function userDel(id)
-           {
-               if(confirm('鎮ㄧ‘瀹氬垹闄ゅ悧锛�'))
-               {
-                   window.location.href="<%=path %>/user?type=userDel&id="+id; //濡傛灉纭鍒犻櫎锛屽垯浼氳烦杞埌杩欎釜鐣岄潰锛岋紵鍚庝负浼犲叆鐨勫弬鏁帮紝鎻愮ず鐢ㄦ埛淇℃伅鍒犻櫎瀹屾瘯
-               }
-           }
-        </script>
-	</head>
-
-	<body leftmargin="2" topmargin="2" background='<%=path %>/img/allbg.gif'>
-			<table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-				<tr bgcolor="#E7E7E7">
-					<td height="14" colspan="14" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-				</tr>
-				<tr align="center" bgcolor="#FAFAF1" height="22">
-				    <td width="4%">搴忓彿</td>
-					<td width="10%">璐﹀彿</td>
-					<td width="10%">瀵� 鐮�</td>
-					<td width="10%">濮撳悕</td>
-					<td width="10%">鎿嶄綔</td>
-		        </tr>	
-				<c:forEach items="${requestScope.userList}" var="user" varStatus="ss"> <!-- 瀵逛簬姣忎竴椤� 锛屽彇寰楃敤鎴峰悕锛屽皢搴忓彿鍒濆�艰缃负1-->
-				<tr align='center' bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='red';" onMouseOut="javascript:this.bgColor='#FFFFFF';" height="22">
-					<td bgcolor="#FFFFFF" align="center">
-						 ${ss.index+1}
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						 ${user.loginname}
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						 ${user.loginpw}
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						 ${user.name}
-					</td>
-					<td bgcolor="#FFFFFF" align="center">
-						<input type="button" value="鍒犻櫎" onclick="userDel(${user.id})"/> <!-- 鍒犻櫎鏃跺垹闄や富閿敤鎴稩D锛屽畬鎴愬鏁翠釜鏁版嵁椤圭殑鍒犻櫎 -->
-					</td>
-				</tr>
-				</c:forEach>
-			</table>
-	</body>
-</html>
diff --git a/userPw.jsp b/userPw.jsp
deleted file mode 100644
index 994a83b..0000000
--- a/userPw.jsp
+++ /dev/null
@@ -1,96 +0,0 @@
-<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
-<%@ page isELIgnored="false" %> 
-
-<%
-String path = request.getContextPath();
-%> 
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"> <!-- 淇敼瀵嗙爜妯″潡 -->
-	<head>
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" />
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-        
-        <link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-		
-		<script type='text/javascript' src='<%=path %>/dwr/interface/loginService.js'></script>
-        <script type='text/javascript' src='<%=path %>/dwr/engine.js'></script>
-        <script type='text/javascript' src='<%=path %>/dwr/util.js'></script>
-		
-        <script language="javascript">
-            function check()
-            {
-                 var userPwReal="${sessionScope.admin.userPw}"; //浠巗ession鑼冨洿閲屽彇寰楃鐞嗗憳鐨勫瘑鐮侊紝璧嬪�肩粰userPwReal
-                 if(document.formPw.userPw.value !=userPwReal) //濡傛灉鍙栧緱鐨勮緭鍏ュ瘑鐮佷笌鍘熷瘑鐮佷笉鍚岋紝鎻愮ず鍘熷瘑鐮佷笉姝ｇ‘
-                 {
-                     alert("鍘熷瘑鐮佷笉姝ｇ‘");
-                     return ;
-                 }
-                 
-                 if(document.formPw.userPw1.value =="") //濡傛灉鏂板瘑鐮佽缃负绌猴紝鎻愮ず鏂板瘑鐮佷笉鑳戒负绌�
-                 {
-                     alert("鏂板瘑鐮佷笉鑳界┖");
-                     return ;
-                 }
-                 
-                 document.getElementById("indicator").style.display="block"; //灏嗘瘡涓�鏍忚缃垚鍧楃骇锛岃嚜鍔ㄦ崲琛�
-                 loginService.adminPwEdit(document.formPw.userPw1.value,callback);
-                 //璋冪敤loginService.adminPwEdit鍑芥暟锛屾潵瀵圭敤鎴风殑璐﹀彿瀵嗙爜鏄惁姝ｇ‘鍋氬垽鏂�
-            }
-            function callback(data)//callback鍑芥暟锛屽師瀵嗙爜涓庢柊瀵嗙爜閫氳繃鍚庢墽琛宑allback锛屾彁绀轰慨鏀规垚鍔�
-            {
-                document.getElementById("indicator").style.display="none";
-                alert("淇敼鎴愬姛");
-            }
-        </script>
-	</head>
-
-	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'>
-			<form method="post" action="<%=path %>/userPwEdit.action" name="formPw">
-			<table width="98%" align="center" border="0" cellpadding="4" cellspacing="1" bgcolor="#CBD8AC" style="margin-bottom:8px">
-				<tr bgcolor="#EEF4EA">
-				    <td colspan="2" background="<%=path %>/img/wbg.gif" class='title'><span>瀵嗙爜淇敼</span></td>
-				</tr>
-				<tr bgcolor="#FFFFFF">
-				    <td width="25%" bgcolor="#FFFFFF" align="right">
-				         鐧诲綍鍚嶏細
-				    </td>
-				    <td width="75%" bgcolor="#FFFFFF">
-				        <input type="text" value="${sessionScope.admin.userName }" name="userName" size="20" disabled="disabled"/> 
-				        <!--鐧诲綍鍚嶅彇寰楁槸session鑼冨洿閲屽彇寰楃鐞嗗憳鐨勭敤鎴峰悕锛宒isabled="disabled"涓虹姝㈣緭鍏�-->
-				    </td>
-				</tr>
-				<tr bgcolor="#FFFFFF">
-				    <td width="25%" bgcolor="#FFFFFF" align="right">
-				        鍘熷瘑鐮侊細
-				    </td>
-				    <td width="75%" bgcolor="#FFFFFF">
-				        <input type="password" name="userPw" id="userPw" size="22"/>
-				    </td>
-				</tr>
-				<tr bgcolor="#FFFFFF">
-				    <td width="25%" bgcolor="#FFFFFF" align="right">
-				         鏂板瘑鐮侊細
-				    </td>
-				    <td width="75%" bgcolor="#FFFFFF">
-				        <input type="password" id="userPw1" name="userPw1" size="22"/>
-				    </td>
-				</tr>
-				<tr bgcolor="#FFFFFF">
-				    <td width="25%" bgcolor="#FFFFFF" align="right">
-				        &nbsp;
-				    </td>
-			        <td width="75%" bgcolor="#FFFFFF">
-			             <input type="button" value="淇敼" onclick="check()"/>
-			             &nbsp;&nbsp;&nbsp;
-			             <input type="reset" value="閲嶇疆"/>
-			             <img id="indicator" src="<%=path %>/images/loading.gif" alt="Loading..." style="display:none"/> <!-- 鎻掑叆杞藉叆鍔ㄧ敾 -->
-			        </td>
-				</tr>
-			</table>
-			</form>
-   </body>
-</html>
diff --git a/user_servlet.java b/user_servlet.java
deleted file mode 100644
index ec83748..0000000
--- a/user_servlet.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package com.itbaizhan.action;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import com.itbaizhan.dao.DB;
-import com.itbaizhan.orm.Tuser;
-import com.itbaizhan.service.liuService;
-
-public class user_servlet extends HttpServlet {
-
-	/**
-	 * service方法根据请求的类型(type)来决定调用哪个处理方法。
-	 * @param req HttpServletRequest对象，包含请求参数和数据
-	 * @param res HttpServletResponse对象，用于返回响应数据
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		// 获取请求的type参数来判断要执行的操作
-		String type = req.getParameter("type");
-
-		if (type.endsWith("userReg")) {
-			userReg(req, res); // 会员注册
-		}
-		if (type.endsWith("userLogout")) {
-			userLogout(req, res); // 会员退出
-		}
-		if (type.endsWith("userMana")) {
-			userMana(req, res); // 会员管理
-		}
-		if (type.endsWith("userDel")) {
-			userDel(req, res); // 会员删除
-		}
-
-		if (type.endsWith("userDetail")) {
-			userDetail(req, res); // 会员详细信息
-		}
-	}
-
-	/**
-	 * userReg方法用于会员注册。
-	 * 该方法获取用户提交的注册信息，检查账号是否已被占用，如果没有被占用则执行注册操作。
-	 * @param req HttpServletRequest对象
-	 * @param res HttpServletResponse对象
-	 */
-	public void userReg(HttpServletRequest req, HttpServletResponse res) {
-		String id = String.valueOf(new Date().getTime()); // 使用当前时间戳作为用户ID
-		String loginname = req.getParameter("loginname"); // 获取用户名
-		String loginpw = req.getParameter("loginpw"); // 获取密码
-		String name = req.getParameter("name"); // 获取用户姓名
-		String del = "no"; // 设置删除标志为"no"表示用户没有被删除
-
-		// 检查账号是否已经被占用
-		String s = liuService.panduan_zhanghao(loginname);
-		if (s.equals("yizhan")) {
-			// 如果账号已经被占用，返回提示信息
-			req.setAttribute("message", "账号已被占用，请输入其他账号");
-			req.setAttribute("path", "site/userreg/userreg.jsp");
-			String targetURL = "/common/success.jsp";
-			dispatch(targetURL, req, res);
-		} else {
-			// 如果账号未被占用，则执行注册操作
-			String sql = "insert into t_user values(?,?,?,?,?)"; // 插入新用户的SQL语句
-			Object[] params = {id, loginname, loginpw, name, del}; // 设置SQL语句的参数
-			DB mydb = new DB();
-			mydb.doPstm(sql, params); // 执行插入操作
-			mydb.closed(); // 关闭数据库连接
-
-			// 注册成功，返回成功页面
-			req.setAttribute("message", "注册成功，请登录");
-			req.setAttribute("path", "site/default.jsp");
-			String targetURL = "/common/success.jsp";
-			dispatch(targetURL, req, res);
-		}
-	}
-
-	/**
-	 * userLogout方法用于会员退出系统。
-	 * @param req HttpServletRequest对象
-	 * @param res HttpServletResponse对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void userLogout(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		HttpSession session = req.getSession(); // 获取当前会话
-		session.setAttribute("userType", null); // 清除会话中的用户类型
-		session.setAttribute("user", null); // 清除会话中的用户信息
-
-		// 提示用户退出成功
-		req.setAttribute("message", "成功退出系统");
-		req.setAttribute("path", "site/default.jsp");
-		String targetURL = "/common/success.jsp";
-		dispatch(targetURL, req, res);
-	}
-
-	/**
-	 * userMana方法用于会员管理，查询所有未删除的会员。
-	 * @param req HttpServletRequest对象
-	 * @param res HttpServletResponse对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void userMana(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		List userList = new ArrayList(); // 用于保存用户信息的列表
-		String sql = "select * from t_user where del='no'"; // 查询所有未被删除的用户
-		Object[] params = {}; // SQL查询没有参数
-		DB mydb = new DB();
-		try {
-			mydb.doPstm(sql, params); // 执行查询操作
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) {
-				Tuser user = new Tuser(); // 创建Tuser对象来封装每个用户的数据
-				user.setId(rs.getString("id"));
-				user.setLoginname(rs.getString("loginname"));
-				user.setLoginpw(rs.getString("loginpw"));
-				user.setName(rs.getString("name"));
-				userList.add(user); // 将用户添加到列表中
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace(); // 捕获异常并打印堆栈信息
-		}
-		mydb.closed(); // 关闭数据库连接
-
-		// 将用户列表传递给JSP页面
-		req.setAttribute("userList", userList);
-		req.getRequestDispatcher("admin/user/userMana.jsp").forward(req, res);
-	}
-
-	/**
-	 * userDel方法用于删除指定ID的用户。
-	 * 实际上是将用户的`del`字段更新为"yes"表示删除。
-	 * @param req HttpServletRequest对象
-	 * @param res HttpServletResponse对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void userDel(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String id = req.getParameter("id"); // 获取要删除用户的ID
-		String sql = "update t_user set del='yes' where id=?"; // 更新SQL语句，将del字段设为"yes"
-		Object[] params = {id}; // 设置参数为用户ID
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行更新操作
-		mydb.closed(); // 关闭数据库连接
-
-		// 返回删除成功的消息
-		req.setAttribute("msg", "用户信息删除完毕");
-		String targetURL = "/common/msg.jsp";
-		dispatch(targetURL, req, res);
-	}
-
-	/**
-	 * userDetail方法用于查看指定用户的详细信息。
-	 * @param req HttpServletRequest对象
-	 * @param res HttpServletResponse对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException I/O异常
-	 */
-	public void userDetail(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String id = req.getParameter("id"); // 获取用户ID
-		List userList = new ArrayList(); // 用于保存用户信息的列表
-		String sql = "select * from t_user where id=?"; // 查询指定ID的用户
-		Object[] params = {id}; // 设置参数为用户ID
-		DB mydb = new DB();
-		try {
-			mydb.doPstm(sql, params); // 执行查询操作
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) {
-				Tuser user = new Tuser(); // 创建Tuser对象来封装用户数据
-				user.setId(rs.getString("id"));
-				user.setLoginname(rs.getString("loginname"));
-				user.setLoginpw(rs.getString("loginpw"));
-				user.setName(rs.getString("name"));
-				userList.add(user); // 将用户添加到列表中
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace(); // 捕获异常并打印堆栈信息
-		}
-		mydb.closed(); // 关闭数据库连接
-
-		// 获取用户信用信息，并将数据传递给JSP页面
-		req.setAttribute("userList", userList);
-		req.setAttribute("xinyongList", liuService.getxinyongList(id));
-		req.getRequestDispatcher("admin/user/userDetail.jsp").forward(req, res);
-	}
-
-	/**
-	 * dispatch方法用于将请求转发到指定的目标页面。
-	 * @param targetURI 目标页面的URI
-	 * @param request 请求对象
-	 * @param response 响应对象
-	 */
-	public void dispatch(String targetURI, HttpServletRequest request, HttpServletResponse response) {
-		// 获取目标URI的RequestDispatcher
-		RequestDispatcher dispatch = getServletContext().getRequestDispatcher(targetURI); // 获取请求转发器
-		try {
-			dispatch.forward(request, response); // 执行请求转发
-			return;
-		} catch (ServletException e) {
-			e.printStackTrace(); // 捕获ServletException异常并打印堆栈信息
-		} catch (IOException e) {
-			e.printStackTrace(); // 捕获IOException异常并打印堆栈信息
-		}
-	}
-
-	/**
-	 * init方法在Servlet初始化时调用，通常用于一些初始化操作。
-	 * @param config ServletConfig对象，包含Servlet的配置参数
-	 * @throws ServletException Servlet初始化异常
-	 */
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config); // 调用父类的init方法进行初始化
-	}
-
-	/**
-	 * destroy方法在Servlet销毁时调用，用于清理资源。
-	 */
-	public void destroy() {
-		// 在此方法中执行清理工作，例如关闭数据库连接等资源释放操作。
-	}
-}
diff --git a/xinyongAdd.jsp b/xinyongAdd.jsp
deleted file mode 100644
index 499b7b6..0000000
--- a/xinyongAdd.jsp
+++ /dev/null
@@ -1,83 +0,0 @@
-<%@page import="java.text.SimpleDateFormat"%>
-<%@page import="java.util.Date"%>  
-<%@ page language="java" pageEncoding="UTF-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ page isELIgnored="false"%> 
-
-<%
-String path = request.getContextPath();
-%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"> <!-- 1.鎻掑叆鏃堕棿鏍煎紡鐨勫寘.2.鎻掑叆澶勭悊鏃堕棿鐨勫寘銆�34.浣跨敤JSTL锛圝SP鏍囧噯鏍囩搴擄級5.浣垮緱EL涓嶅綋鎴愬瓧绗︿覆澶勭悊-->
-	<head> 
-		<meta http-equiv="pragma" content="no-cache" />
-		<meta http-equiv="cache-control" content="no-cache" />
-		<meta http-equiv="expires" content="0" /> 
-		<meta http-equiv="keywords" content="keyword1,keyword2,keyword3" />
-		<meta http-equiv="description" content="This is my page" />
-        
-        <link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
-        
-        <script language="javascript">
-            function c() //濡傛灉璇勪环鍐呭涓虹┖锛屾彁绀鸿杈撳叆璇勮鍐呭
-            {
-                if(document.formAdd.neirong.value=="") 
-                {
-                    alert("璇疯緭鍏ヨ瘎浠峰唴瀹�");
-                    return false;
-                }
-                
-                document.formAdd.submit();  //濡傛灉涓嶄负绌哄垯鎻愪氦淇℃伅
-            }
-        </script>
-	</head>
-
-	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'> <!-- 璺濈宸﹁竟涓�2锛岃窛绂讳笂闈负9锛岃儗鏅浘鐗囦负銆傘�� -->
-			<form action="<%=path %>/xinyong?type=xinyongAdd" name="formAdd" method="post"> <!--琛ㄥ崟鐨勬柟娉曚负鎻愪氦  -->
-				     <table width="98%" border="0" cellpadding="2" cellspacing="1" bgcolor="#D1DDAA" align="center" style="margin-top:8px">
-						<tr bgcolor="#E7E7E7">
-							<td height="14" colspan="4" background="<%=path %>/img/tbg.gif">&nbsp;&nbsp;</td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF" onMouseMove="javascript:this.bgColor='red';" onMouseOut="javascript:this.bgColor='#FFFFFF';" height="22">
-						    <td width="10%" bgcolor="#FFFFFF" align="right">
-						                         璇勪环灞炴�э細
-						    </td>
-						    <td width="90%" bgcolor="#FFFFFF" align="left">
-						        <input type="radio" name="shuxing" value="濂借瘎" checked="checked" style="border: 0px;"/>濂借瘎
-								&nbsp;&nbsp;&nbsp;&nbsp;
-								<input type="radio" name="shuxing" value="宸瘎" style="border: 0px;"/>宸瘎
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="10%" bgcolor="#FFFFFF" align="right">
-						                         璇勪环鍐呭锛�
-						    </td>
-						    <td width="90%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="neirong" size="40"/>
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="10%" bgcolor="#FFFFFF" align="right">
-						                         璇勪环鏃堕棿锛�
-						    </td>
-						    <td width="90%" bgcolor="#FFFFFF" align="left">
-						        <input type="text" name="shijian" size="40" value="<%=new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date())%>"/> 
-						        <!-- 鍙栧緱绯荤粺褰撳墠鏃堕棿锛屾牸寮忎负yyyy骞�-MM鏈�-dd鍙� HH鐐癸細mm鍒� -->
-						    </td>
-						</tr>
-						<tr align='center' bgcolor="#FFFFFF"  height="22">
-						    <td width="10%" bgcolor="#FFFFFF" align="right">
-						        &nbsp;
-						    </td>
-						    <td width="90%" bgcolor="#FFFFFF" align="left">
-						       <input type="hidden" name="user_id" value="<%=request.getParameter("user_id") %>"/> <!-- 鎻掑叆闅愯棌鍩燂紝鑾峰緱鐢ㄦ埛鐨刬d -->
-						       <input type="button" value="鎻愪氦" onclick="c()"/>&nbsp; 
-						       <input type="reset" value="閲嶇疆"/>&nbsp;
-						    </td>
-						</tr>
-					 </table>
-			</form>
-   </body>
-</html>
diff --git a/xinyong_servlet.java b/xinyong_servlet.java
deleted file mode 100644
index cb14738..0000000
--- a/xinyong_servlet.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package com.itbaizhan.action;
-
-import java.io.IOException;
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.itbaizhan.dao.DB;
-import com.itbaizhan.orm.Txinyong;
-
-public class xinyong_servlet extends HttpServlet {
-
-	/**
-	 * service方法，根据请求的type参数决定调用哪个功能方法。
-	 * @param req HttpServletRequest 请求对象
-	 * @param res HttpServletResponse 响应对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException IO异常
-	 */
-	public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String type = req.getParameter("type"); // 获取请求参数 type
-
-		if (type.endsWith("xinyongAdd")) {
-			xinyongAdd(req, res); // 调用信用添加方法
-		}
-		if (type.endsWith("xinyongMana")) {
-			xinyongMana(req, res); // 调用信用管理方法
-		}
-		if (type.endsWith("xinyongDel")) {
-			xinyongDel(req, res); // 调用信用删除方法
-		}
-	}
-
-	/**
-	 * 处理信用添加功能。
-	 * @param req HttpServletRequest 请求对象
-	 * @param res HttpServletResponse 响应对象
-	 */
-	public void xinyongAdd(HttpServletRequest req, HttpServletResponse res) {
-		String id = String.valueOf(new Date().getTime()); // 使用当前时间戳生成唯一ID
-		String shuxing = req.getParameter("shuxing").trim(); // 获取信用属性
-		String neirong = req.getParameter("neirong").trim(); // 获取信用内容
-		String shijian = req.getParameter("shijian").trim(); // 获取时间
-		String user_id = req.getParameter("user_id").trim(); // 获取用户ID
-
-		// 插入SQL语句
-		String sql = "insert into t_xinyong(id, shuxing, neirong, shijian, user_id) values(?,?,?,?,?)";
-		Object[] params = {id, shuxing, neirong, shijian, user_id};
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行插入操作
-		mydb.closed(); // 关闭数据库连接
-
-		req.setAttribute("msg", "操作成功"); // 设置提示消息
-		String targetURL = "/common/msg.jsp"; // 跳转到提示页面
-		dispatch(targetURL, req, res); // 执行请求转发
-	}
-
-	/**
-	 * 处理信用管理功能。
-	 * @param req HttpServletRequest 请求对象
-	 * @param res HttpServletResponse 响应对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException IO异常
-	 */
-	public void xinyongMana(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String user_id = req.getParameter("user_id").trim(); // 获取用户ID
-
-		List xinyongList = new ArrayList(); // 用于存储信用记录的列表
-		String sql = "select * from t_xinyong where user_id=?";
-		Object[] params = {user_id};
-		DB mydb = new DB();
-		try {
-			mydb.doPstm(sql, params); // 执行查询操作
-			ResultSet rs = mydb.getRs(); // 获取查询结果集
-			while (rs.next()) {
-				Txinyong xinyong = new Txinyong(); // 创建信用对象
-
-				// 设置信用对象的属性
-				xinyong.setId(rs.getString("id"));
-				xinyong.setShuxing(rs.getString("shuxing"));
-				xinyong.setNeirong(rs.getString("neirong"));
-				xinyong.setShijian(rs.getString("shijian"));
-				xinyong.setUser_id(rs.getString("user_id"));
-
-				xinyongList.add(xinyong); // 将信用对象添加到列表中
-			}
-			rs.close(); // 关闭结果集
-		} catch (Exception e) {
-			e.printStackTrace(); // 捕获异常并打印堆栈信息
-		}
-		mydb.closed(); // 关闭数据库连接
-
-		req.setAttribute("xinyongList", xinyongList); // 将信用列表传递到请求中
-		req.getRequestDispatcher("admin/xinyong/xinyongMana.jsp").forward(req, res); // 转发请求到管理页面
-	}
-
-	/**
-	 * 处理信用删除功能。
-	 * @param req HttpServletRequest 请求对象
-	 * @param res HttpServletResponse 响应对象
-	 * @throws ServletException Servlet异常
-	 * @throws IOException IO异常
-	 */
-	public void xinyongDel(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		String id = req.getParameter("id").trim(); // 获取信用记录ID
-
-		String sql = "delete from t_xinyong where id=?";
-		Object[] params = {id};
-		DB mydb = new DB();
-		mydb.doPstm(sql, params); // 执行删除操作
-		mydb.closed(); // 关闭数据库连接
-
-		req.setAttribute("msg", "操作成功"); // 设置提示消息
-		String targetURL = "/common/msg.jsp"; // 跳转到提示页面
-		dispatch(targetURL, req, res); // 执行请求转发
-	}
-
-	/**
-	 * 执行请求转发到指定页面。
-	 * @param targetURI 目标页面的URI
-	 * @param request HttpServletRequest 请求对象
-	 * @param response HttpServletResponse 响应对象
-	 */
-	public void dispatch(String targetURI, HttpServletRequest request, HttpServletResponse response) {
-		RequestDispatcher dispatch = getServletContext().getRequestDispatcher(targetURI); // 获取请求转发器
-		try {
-			dispatch.forward(request, response); // 执行转发
-			return;
-		} catch (ServletException e) {
-			e.printStackTrace(); // 捕获并打印ServletException异常
-		} catch (IOException e) {
-			e.printStackTrace(); // 捕获并打印IOException异常
-		}
-	}
-
-	/**
-	 * Servlet初始化方法，在Servlet实例化时调用。
-	 * @param config ServletConfig对象，包含Servlet配置参数
-	 * @throws ServletException Servlet异常
-	 */
-	public void init(ServletConfig config) throws ServletException {
-		super.init(config); // 调用父类的init方法进行初始化
-	}
-
-	/**
-	 * Servlet销毁方法，在Servlet销毁时调用。
-	 * 用于释放资源，如关闭数据库连接等。
-	 */
-	public void destroy() {
-		// 在此方法中执行清理工作，例如释放数据库连接等
-	}
-}