Merge remote-tracking branch 'remotes/origin/wyc_branch' into develop

# Conflicts:
#	left.jsp
#	xinyongAdd.jsp

TLiuyan.java

@@ -0,0 +1,90 @@
+package com.itbaizhan.orm;
+
+/**
+ * TLiuyan generated by MyEclipse Persistence Tools
+ */
+
+public class TLiuyan implements java.io.Serializable
+{
+	private Integer id;//留言ID
+	private String neirong;//留言内容
+	private String liuyanshi;//留言时间
+	private String user_id;//用户ID
+
+	private String huifu;//回复内容
+	private String huifushi;//回复时间
+	
+	private Tuser user;
+
+	public String getHuifu()//得到回复内容
+	{
+		return huifu;
+	}
+
+	public void setHuifu(String huifu)//设置回复内容
+	{
+		this.huifu = huifu;
+	}
+
+	public String getHuifushi()//得到回复时间
+	{
+		return huifushi;
+	}
+
+	public void setHuifushi(String huifushi)//设置回复时间
+	{
+		this.huifushi = huifushi;
+	}
+
+	public Integer getId()//得到回复ID
+	{
+		return id;
+	}
+
+	public void setId(Integer id)//设置回复ID
+	{
+		this.id = id;
+	}
+
+	public String getLiuyanshi()//得到回复时间
+	{
+		return liuyanshi;
+	}
+
+	public void setLiuyanshi(String liuyanshi)//设置回复时间
+	{
+		this.liuyanshi = liuyanshi;
+	}
+
+	public String getNeirong()//得到回复内容
+	{
+		return neirong;
+	}
+
+	public void setNeirong(String neirong)//设置回复内容
+	{
+		this.neirong = neirong;
+	}
+
+	public Tuser getUser()//得到留言用户
+	{
+		return user;
+	}
+
+	public void setUser(Tuser user)//设置留言用户
+	{
+		this.user = user;
+	}
+
+	public String getUser_id()//得到留言用户ID
+	{
+		return user_id;
+	}
+
+	public void setUser_id(String user_id)//设置留言用户ID
+	{
+		this.user_id = user_id;
+	}
+
+	
+}

Tcatelog.java

@@ -0,0 +1,45 @@
+package com.itbaizhan.orm;
+
+// 商品分类类
+public class Tcatelog {
+
+    // 商品分类的ID
+    private String id;  // 商品分类ID，用于唯一标识商品分类
+
+    // 商品分类的名称
+    private String name;  // 商品分类名称，用于描述商品所属的类别
+
+    // 商品是否已被删除的标记
+    private String del;  // 商品分类是否删除的标记，"1"表示已删除，"0"表示未删除
+
+    // 获取商品分类的删除标记
+    public String getDel() {
+        return del;  // 返回商品分类的删除状态
+    }
+
+    // 设置商品分类的删除标记
+    public void setDel(String del) {
+        this.del = del;  // 设置商品分类的删除状态
+    }
+
+    // 获取商品分类的名称
+    public String getName() {
+        return name;  // 返回商品分类的名称
+    }
+
+    // 设置商品分类的名称
+    public void setName(String name) {
+        this.name = name;  // 设置商品分类的名称
+    }
+
+    // 获取商品分类的ID
+    public String getId() {
+        return id;  // 返回商品分类的ID
+    }
+
+    // 设置商品分类的ID
+    public void setId(String id) {
+        this.id = id;  // 设置商品分类的ID
+    }
+
+}

Tgoods.java

@@ -0,0 +1,107 @@
+package com.itbaizhan.orm;
+
+public class Tgoods //菜品信息类
+{
+	private String id;//菜品的ID
+	private String catelog_id;//菜品类别的ID
+	private String bianhao;//菜品的编号
+	private String mingcheng;//菜品的名称
+	
+	private String jieshao;//菜品的介绍
+	private String fujian;//菜品的图片
+	private int shichangjia;//菜品的市场价
+	private int tejia;//菜品的特价
+	
+	private String del;//菜品是否删除标志
+
+	public String getBianhao()//得到菜品编号
+	{
+		return bianhao;
+	}
+
+	public void setBianhao(String bianhao)//设置菜品编号
+	{
+		this.bianhao = bianhao;
+	}
+
+	public String getCatelog_id()//得到菜品类别ID
+	{
+		return catelog_id;
+	}
+
+	public void setCatelog_id(String catelog_id)//设置菜品类别ID
+	{
+		this.catelog_id = catelog_id;
+	}
+
+	public String getDel()//得到菜品是否删除信息
+	{
+		return del;
+	}
+
+	public void setDel(String del)//设置菜品是否删除信息
+	{
+		this.del = del;
+	}
+
+	public String getFujian()//得到菜品图片信息
+	{
+		return fujian;
+	}
+
+	public void setFujian(String fujian)//设置菜品图片信息
+	{
+		this.fujian = fujian;
+	}
+
+	public String getId()//得到菜品ID信息
+	{
+		return id;
+	}
+
+	public void setId(String id)//设置菜品ID信息
+	{
+		this.id = id;
+	}
+
+	public String getJieshao()//得到菜品介绍信息
+	{
+		return jieshao;
+	}
+
+	public void setJieshao(String jieshao)//设置菜品介绍信息
+	{
+		this.jieshao = jieshao;
+	}
+
+	public String getMingcheng()//得到菜品名称信息
+	{
+		return mingcheng;
+	}
+
+	public void setMingcheng(String mingcheng)//设置菜品名称信息
+	{
+		this.mingcheng = mingcheng;
+	}
+
+	public int getShichangjia()//得到菜品市场价信息
+	{
+		return shichangjia;
+	}
+
+	public void setShichangjia(int shichangjia)//设置菜品市场价信息
+	{
+		this.shichangjia = shichangjia;
+	}
+
+	public int getTejia()//得到菜品特价信息
+	{
+		return tejia;
+	}
+
+	public void setTejia(int tejia)//设置菜品市特价信息
+	{
+		this.tejia = tejia;
+	}
+		
+}

Torder.java

@@ -0,0 +1,123 @@
+package com.itbaizhan.orm;
+
+/**
+ * TOrder generated by MyEclipse Persistence Tools
+ */
+
+public class Torder implements java.io.Serializable
+{
+
+	private String id;//订单ID
+	private String bianhao;//订单编号
+	private String shijian;//下单时间
+	private String zhuangtai;//订单状态
+	
+	private String huifu;//回复内容
+	
+	private String songhuodizhi;//送货地址
+	private String fukuanfangshi;//付款方式
+	private int jine=0;//总金额
+	private String user_id;//用户ID
+
+	
+
+	/** 默认构造函数 */
+	public Torder()
+	{
+	}
+
+	public String getBianhao()//得到订单编号
+	{
+		return bianhao;
+	}
+
+	public void setBianhao(String bianhao)//设置订单编号
+	{
+		this.bianhao = bianhao;
+	}
+
+	public String getFukuanfangshi()//得到付款方式
+	{
+		return fukuanfangshi;
+	}
+
+	public void setFukuanfangshi(String fukuanfangshi)//设置付款方式
+	{
+		this.fukuanfangshi = fukuanfangshi;
+	}
+
+
+	public String getId()//得到订单ID
+	{
+		return id;
+	}
+
+	public void setId(String id)//设置订单ID
+	{
+		this.id = id;
+	}
+
+	public int getJine()//得到总金额
+	{
+		return jine;
+	}
+
+	public String getHuifu()//得到回复内容
+	{
+		return huifu;
+	}
+
+	public void setHuifu(String huifu)//设置回复内容
+	{
+		this.huifu = huifu;
+	}
+
+	public void setJine(int jine)//设置总金额
+	{
+		this.jine = jine;
+	}
+
+
+	public String getShijian()//得到下单时间
+	{
+		return shijian;
+	}
+
+	public void setShijian(String shijian)//设置下单时间
+	{
+		this.shijian = shijian;
+	}
+
+	public String getSonghuodizhi()//得到送货地址
+	{
+		return songhuodizhi;
+	}
+
+	public void setSonghuodizhi(String songhuodizhi)//设置送货地址
+	{
+		this.songhuodizhi = songhuodizhi;
+	}
+
+
+	public String getUser_id()//得到用户ID
+	{
+		return user_id;
+	}
+
+	public void setUser_id(String user_id)//设置用户ID
+	{
+		this.user_id = user_id;
+	}
+
+	public String getZhuangtai()//得到订单状态
+	{
+		return zhuangtai;
+	}
+
+	public void setZhuangtai(String zhuangtai)//设置订单状态
+	{
+		this.zhuangtai = zhuangtai;
+	}
+
+	
+}

TorderItem.java

@@ -0,0 +1,57 @@
+package com.itbaizhan.orm;
+
+public class TorderItem
+{
+	private String id;//订单明细ID
+	private String order_id;//订单ID
+	private String goods_id;//商品ID
+	private int goods_quantity;//商品数量
+	
+	
+	private Tgoods goods;//表里没有。自己加的
+	
+	public int getGoods_quantity()//得到商品数量
+	{
+		return goods_quantity;
+	}
+	public void setGoods_quantity(int goods_quantity)//设置商品数量
+	{
+		this.goods_quantity = goods_quantity;
+	}
+	
+	public String getGoods_id()//得到商品ID
+	{
+		return goods_id;
+	}
+	public void setGoods_id(String goods_id)//设置商品ID
+	{
+		this.goods_id = goods_id;
+	}
+	public String getId()//得到订单明细ID
+	{
+		return id;
+	}
+	public void setId(String id)//设置订单明细ID
+	{
+		this.id = id;
+	}
+	public String getOrder_id()//得到订单ID
+	{
+		return order_id;
+	}
+	public void setOrder_id(String order_id)//设置订单ID
+	{
+		this.order_id = order_id;
+	}
+	public Tgoods getGoods()//得到商品信息
+	{
+		return goods;
+	}
+	public void setGoods(Tgoods goods)//设置商品信息
+	{
+		this.goods = goods;
+	}
+	
+	
+
+}

Tuser.java

@@ -0,0 +1,54 @@
+package com.itbaizhan.orm;
+
+public class Tuser
+{
+	private String id;//用户ID
+	private String loginname;//用户登录账号
+	private String loginpw;//用户登录密码
+	private String name;//用户登录名
+	
+	private String del;//是否删除标志
+	
+	public String getId()//得到用户ID
+	{
+		return id;
+	}
+	public void setId(String id)//设置用户ID
+	{
+		this.id = id;
+	}
+	public String getLoginname()//得到用户登录账号
+	{
+		return loginname;
+	}
+	public void setLoginname(String loginname)//设置用户登录账号
+	{
+		this.loginname = loginname;
+	}
+	public String getLoginpw()//得到用户登录密码
+	{
+		return loginpw;
+	}
+	
+	public String getDel()//得到用户是否删除信息
+	{
+		return del;
+	}
+	public void setDel(String del)//设置用户是否删除信息
+	{
+		this.del = del;
+	}
+	public void setLoginpw(String loginpw)//得到用户登录密码
+	{
+		this.loginpw = loginpw;
+	}
+	public String getName()//得到用户姓名
+	{
+		return name;
+	}
+	public void setName(String name)//设置用户姓名
+	{
+		this.name = name;
+	}
+	
+}

Txinyong.java

@@ -0,0 +1,62 @@
+package com.itbaizhan.orm;
+
+public class Txinyong
+{
+	private String id;//管理员给用户评价ID
+	private String shuxing;//管理员给用户评价属性
+	private String neirong;//管理员给用户评价内容
+	private String shijian;//管理员给用户评价时间
+	
+	private String user_id;//用户ID
+
+	public String getId()//得到评价ID
+	{
+		return id;
+	}
+
+	public void setId(String id)//设置评价ID
+	{
+		this.id = id;
+	}
+
+	public String getShuxing()//得到评价属性
+	{
+		return shuxing;
+	}
+
+	public void setShuxing(String shuxing)//设置评价属性
+	{
+		this.shuxing = shuxing;
+	}
+
+	public String getNeirong()//得到评价内容
+	{
+		return neirong;
+	}
+
+	public void setNeirong(String neirong)//设置评价内容
+	{
+		this.neirong = neirong;
+	}
+
+	public String getShijian()//得到评价时间
+	{
+		return shijian;
+	}
+
+	public void setShijian(String shijian)//设置评价时间
+	{
+		this.shijian = shijian;
+	}
+
+	public String getUser_id()//得到用户ID
+	{
+		return user_id;
+	}
+
+	public void setUser_id(String user_id)//设置用户ID
+	{
+		this.user_id = user_id;
+	}
+	
+}

base.css

@@ -0,0 +1,713 @@
+* {
+	font-size: 12px;
+<<<<<<< HEAD
+	font-family: "    ";
+=======
+	font-family: "ËÎÌå";
+>>>>>>> remotes/origin/wyp_branch
+}
+
+td { line-height: 1.5; }
+
+body {
+  font-size: 12px;
+  line-height: 1.5;
+<<<<<<< HEAD
+  font-family: "    ";
+=======
+  font-family: "ËÎÌå";
+>>>>>>> remotes/origin/wyp_branch
+}
+
+form,h1,h2,h3,ul,ol,div{	margin: 0; padding:0;}
+
+td,th,div {
+	word-break:break-all;
+	word-wrap:break-word;
+}
+
+b,strong {
+	color:#666600;
+}
+
+li,dd {
+  list-style-type:none; margin:0px; padding:0px; 
+}
+
+input[type=button]{
+ background-color: #F1F8B4;
+}
+
+h1 { color:#171B16; font-size:130%; font-weight:bold; }
+h2 { color:#171B16; font-size:115%; font-weight:bold; }
+h3 { color:#171B16; font-size:100%; font-weight:bold;}
+
+<<<<<<< HEAD
+a:link { font-size: 9pt; color: #000000; text-decoration: none; font-family: ""    ""; }
+a:visited{ font-size: 9pt; color: #000000; text-decoration: none; font-family: ""    ""; }
+a:hover {color: red; font-family: ""    "";}
+=======
+a:link { font-size: 9pt; color: #000000; text-decoration: none; font-family: ""ËÎÌå""; }
+a:visited{ font-size: 9pt; color: #000000; text-decoration: none; font-family: ""ËÎÌå""; }
+a:hover {color: red; font-family: ""ËÎÌå"";}
+>>>>>>> remotes/origin/wyp_branch
+a img { border-style:none; }
+
+b a {
+	color:#666600;
+}
+strong a {
+	color:#666600;
+}
+
+a b{
+	color:#666600;
+}
+a strong{
+	color:#666600;
+}
+
+input { border: 1px solid #ababab; }
+<<<<<<< HEAD
+/*.aΪ    */
+=======
+/*.aΪÀàÃû*/
+>>>>>>> remotes/origin/wyp_branch
+.pubinputs {
+	height: 22px;
+  width:250px;
+	padding:4px 3px 2px 3px;
+	border-width:1px;
+	border-style:solid;
+	border-color:#999999 #dddddd #dddddd #999999;
+}
+
+.iptxt {
+	height:22px;
+	padding:4px 3px 2px 3px;
+	border-width:1px;
+	border-style:solid;
+	border-color:#999999 #dddddd #dddddd #999999;
+}
+
+.alltxt {
+	padding:4px 3px 2px 3px;
+	border-width:1px;
+	border-style:solid;
+	border-color:#999999 #dddddd #dddddd #999999;
+}
+
+.pubinput {
+	height: 24px;
+	width:250px;
+	padding-top:3px;
+	padding-bottom:0px;
+}
+.pubinputl {
+	height: 24px;
+	width:350px;
+	padding-top:3px;
+	padding-bottom:0px;
+}
+
+.np {
+	border:none;
+}
+
+.linerow{border-bottom: 1px solid #ACACAC;}
+
+.coolbg {
+  border-right: 1px solid #ACACAC;
+  border-bottom: 1px solid #ACACAC;
+  background-color: #F1F8B4;
+  padding:2px;
+  padding-right:5px;
+  padding-left:5px;
+  background: url(allbtbg2.gif) #EFF7D0;
+  cursor:pointer;
+}
+
+.coolbg2 {
+  border: 1px solid #000000;
+  background-color: #DFDDD2;
+  height:18px
+}
+
+.ll {
+  border-right: 2px solid #ACACAC;
+  border-bottom: 2px solid #ACACAC;
+  background-color: #E6E6E6
+}
+
+.bline {border-bottom: 1px dotted #BCBCBC; height:28px; background-color: #FFFFFF;}
+#uploadfield{float:left;}
+.bline2 {border-bottom: 1px solid #BCBCBC;}
+
+.coolbt {
+  border-left: 1px solid #EFEFEF;
+  border-top: 1px solid #EFEFEF;
+  border-right: 1px solid #ACACAC;
+  border-bottom: 1px solid #ACACAC;
+  background-color: #E4F7D7;
+  cursor:pointer;
+}
+
+.coolbt2 {
+  border-left: 1px solid #EFEFEF;
+  border-top: 1px solid #EFEFEF;
+  border-right: 1px solid #ACACAC;
+  border-bottom: 1px solid #ACACAC;
+  background-color: #F7FCDA
+}
+
+.coolbg3 {
+  border: 1px solid #BDC5B4;
+  background-color: #DFDDD2;
+  height:20px;
+  width:140px;
+  text-align:right;
+}
+
+.coolbg61 {
+	line-height:26px;
+	width:380px;
+	border-top:1px solid #BDC5B4;
+	border-left:1px solid #BDC5B4;
+	border-right:1px solid #BDC5B4;
+	height:26px;
+	text-align:right;
+	background-color: #E7F3B1;
+}
+
+.coolbg62 {
+  border: 1px solid #BDC5B4;
+  background-color: #F8FDF0;
+  height:300px;
+  width:380px;
+  padding:5px;
+}
+
+.coolbg4 {
+  border-bottom: 1px solid #C9CFC1;
+  background-color: #EDEBE5;
+  height:20px;
+  width:190px;
+  text-align:right;
+}
+
+.coolbg5 {
+  border-top: 1px solid #BDC5B4;
+  background-color: #EDEBE5;
+  font-size:1pt;
+  height:6px;
+  width:190px;
+}
+
+.dlg {
+  border: 2px solid #749F4D;
+  background-color: #F0FAEB;
+  padding: 2px;
+  width: 360px;
+  line-height:160%;
+}
+
+.dlgws {
+  border: 2px solid #749F4D;
+  background-color: #F0FAEB;
+  padding: 2px;
+  width: 280px;
+  line-height:160%;
+}
+.dlgws div {
+  width: 100%;
+}
+
+.dlgTesttitle {
+  border: 2px solid #749F4D;
+  background-color: #F0FAEB;
+  padding: 2px;
+  width: 200px;
+  line-height:150%;
+}
+
+#_mysource{ z-index:5000; }
+#_mywriter{ z-index:6000; }
+
+.option1{ background-color: #DCECA6; }
+.option2{ background-color: #F7FBD2; }
+.option3{ background-color: #FFFFFF; }
+
+.ininput{
+width:96%;
+height:20px;
+border:1px solid #ffffff;
+}
+
+.nbt{ 
+  padding: 1px;
+  background-image:url('allbtbg.gif');
+  background-color:#ffffff;
+  border:1px solid #A5AF83;
+}
+
+.tdt{
+  padding-left: 6px;
+}
+
+.waitpage
+{
+  top:0;
+  left:0;
+  filter:Alpha(opacity=70);
+  -moz-opacity:0.7;
+  position:absolute;
+  z-index:10000;
+}
+
+.divpre
+{
+	filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);
+}
+
+.autoinput {
+	padding-left:3px;
+	width:90%;
+	height:22px
+}
+
+.bodytitle
+{
+  margin:auto;
+  height:28px;
+  border:1px dotted #BFD67C;
+  background:url('wbg.gif');
+  margin-bottom:6px;
+  width:98%;
+  font-weight:bold;
+}
+.bodytitle div 
+{
+  float:left
+}
+.bodytitletxt
+{
+  padding-left:6px;
+  line-height:28px;
+}
+.tbtitle td{ padding:3px; }
+
+.tblist td{
+	background:#FFFFFF;
+	padding:6px;
+<<<<<<< HEAD
+}/* 通用样å¼<C3A5> */
+* {
+    font-size: 12px; /* 设置默认字体大å°<C3A5>为12px */
+    font-family: ""; /* 设置默认字体（未指定具体字体） */
+}
+
+td { 
+    line-height: 1.5; /* 设置表格å<C2BC>•å…ƒæ ¼çš„行高为1.5 */
+}
+
+/* 设置页é<C2B5>¢çš„基础字体样å¼<C3A5> */
+body {
+    font-size: 12px; /* 设置全局字体大å°<C3A5> */
+    line-height: 1.5; /* 设置行高 */
+    font-family: ""; /* 设置全局字体（未指定具体字体） */
+}
+
+/* é‡<C3A9>置一些常è§<C3A8>的元素的 margin å’Œ padding */
+form, h1, h2, h3, ul, ol, div {
+    margin: 0; /* 去除外边è·<C3A8> */
+    padding: 0; /* 去除内边è·<C3A8> */
+}
+
+/* 设置表格å<C2BC>•å…ƒæ ¼çš„文字æ<E28094>¢è¡Œæ–¹å¼<C3A5> */
+td, th, div {
+    word-break: break-all; /* 强制长å<C2BF>•è¯<C3A8>在任æ„<C3A6>ä½<C3A4>置断开æ<E282AC>¢è¡Œ */
+    word-wrap: break-word; /* 在å<C2A8>•è¯<C3A8>内强制æ<C2B6>¢è¡Œ */
+}
+
+/* 强调标签的字体颜色 */
+b, strong {
+    color: #666600; /* 设置粗体文字颜色为深黄色 */
+}
+
+/* 去除列表项的默认样å¼<C3A5> */
+li, dd {
+    list-style-type: none; /* 去除列表标记 */
+    margin: 0px; /* 去除外边è·<C3A8> */
+    padding: 0px; /* 去除内边è·<C3A8> */
+}
+
+/* 设置按钮样å¼<C3A5> */
+input[type=button] {
+    background-color: #F1F8B4; /* 设置按钮背景色为浅黄色 */
+}
+
+/* 标题样å¼<C3A5> */
+h1 {
+    color: #171B16; /* 设置h1的颜色为深色 */
+    font-size: 130%; /* 设置h1字体大å°<C3A5>为130% */
+    font-weight: bold; /* 设置h1加粗 */
+}
+
+h2 {
+    color: #171B16; /* 设置h2的颜色为深色 */
+    font-size: 115%; /* 设置h2字体大å°<C3A5>为115% */
+    font-weight: bold; /* 设置h2加粗 */
+}
+
+h3 {
+    color: #171B16; /* 设置h3的颜色为深色 */
+    font-size: 100%; /* 设置h3字体大å°<C3A5>为100% */
+    font-weight: bold; /* 设置h3加粗 */
+}
+
+/* 设置链接的样å¼<C3A5> */
+a:link {
+    font-size: 9pt; /* 设置未访问链接的字体大å°<C3A5> */
+    color: #000000; /* 设置未访问链接的字体颜色为黑色 */
+    text-decoration: none; /* 去除下划线 */
+    font-family: ""; /* 设置链接字体（未指定具体字体） */
+}
+
+a:visited {
+    font-size: 9pt; /* 设置已访问链接的字体大å°<C3A5> */
+    color: #000000; /* 设置已访问链接的字体颜色为黑色 */
+    text-decoration: none; /* 去除下划线 */
+    font-family: ""; /* 设置链接字体（未指定具体字体） */
+}
+
+a:hover {
+    color: red; /* 鼠标悬å<C2AC>œæ—¶ï¼Œé“¾æŽ¥é¢œè‰²å<C2B2>˜ä¸ºçº¢è‰² */
+    font-family: ""; /* 设置悬å<C2AC>œæ—¶å­—体（未指定具体字体） */
+}
+
+a img {
+    border-style: none; /* 去除链接中的图片边框 */
+}
+
+/* 让链接中的 b å’Œ strong 元素也使用相å<C2B8>Œçš„颜色 */
+b a {
+    color: #666600; /* 设置链接中的b标签颜色 */
+}
+
+strong a {
+    color: #666600; /* 设置链接中的strong标签颜色 */
+}
+
+a b {
+    color: #666600; /* 设置链接中的b标签颜色 */
+}
+
+a strong {
+    color: #666600; /* 设置链接中的strong标签颜色 */
+}
+
+/* 输入框样å¼<C3A5> */
+input {
+    border: 1px solid #ababab; /* 设置输入框的边框为浅ç<E280A6>°è‰² */
+}
+
+/* 公共输入框样å¼<C3A5> */
+.pubinputs {
+    height: 22px; /* 设置输入框高度 */
+    width: 250px; /* 设置输入框宽度 */
+    padding: 4px 3px 2px 3px; /* 设置内边è·<C3A8> */
+    border-width: 1px; /* 设置边框宽度 */
+    border-style: solid; /* 设置边框样å¼<C3A5>为实线 */
+    border-color: #999999 #dddddd #dddddd #999999; /* 设置四个边框的颜色 */
+}
+
+/* 普通输入框样å¼<C3A5> */
+.iptxt {
+    height: 22px; /* 设置输入框高度 */
+    padding: 4px 3px 2px 3px; /* 设置内边è·<C3A8> */
+    border-width: 1px; /* 设置边框宽度 */
+    border-style: solid; /* 设置边框样å¼<C3A5>为实线 */
+    border-color: #999999 #dddddd #dddddd #999999; /* 设置四个边框的颜色 */
+}
+
+/* 包å<E280A6>«æ–‡æœ¬æ¡†æ ·å¼<C3A5> */
+.alltxt {
+    padding: 4px 3px 2px 3px; /* 设置内边è·<C3A8> */
+    border-width: 1px; /* 设置边框宽度 */
+    border-style: solid; /* 设置边框样å¼<C3A5>为实线 */
+    border-color: #999999 #dddddd #dddddd #999999; /* 设置四个边框的颜色 */
+}
+
+/* 具有特定样å¼<C3A5>的输入框 */
+.pubinput {
+    height: 24px; /* 设置输入框高度 */
+    width: 250px; /* 设置输入框宽度 */
+    padding-top: 3px; /* 设置顶部内边è·<C3A8> */
+    padding-bottom: 0px; /* 设置底部内边è·<C3A8> */
+}
+
+.pubinputl {
+    height: 24px; /* 设置输入框高度 */
+    width: 350px; /* 设置输入框宽度 */
+    padding-top: 3px; /* 设置顶部内边è·<C3A8> */
+    padding-bottom: 0px; /* 设置底部内边è·<C3A8> */
+}
+
+/* 没有边框的样å¼<C3A5> */
+.np {
+    border: none; /* 去除边框 */
+}
+
+/* 表格中æ¯<C3A6>一行的下边框 */
+.linerow {
+    border-bottom: 1px solid #ACACAC; /* 设置下边框为1pxç<78>°è‰²å®žçº¿ */
+}
+
+/* 按钮的样å¼<C3A5> */
+.coolbg {
+    border-right: 1px solid #ACACAC; /* 设置å<C2AE>³è¾¹æ¡† */
+    border-bottom: 1px solid #ACACAC; /* 设置底边框 */
+    background-color: #F1F8B4; /* 设置背景色 */
+    padding: 2px;
+    padding-right: 5px; /* 设置å<C2AE>³å†…è¾¹è·<C3A8> */
+    padding-left: 5px; /* 设置左内边è·<C3A8> */
+    background: url(allbtbg2.gif) #EFF7D0; /* 设置背景图片和背景色 */
+    cursor: pointer; /* 设置鼠标悬å<C2AC>œæ—¶çš„光标样å¼<C3A5>为手形 */
+}
+
+/* 按钮的样å¼<C3A5> */
+.coolbg2 {
+    border: 1px solid #000000; /* 设置边框为黑色 */
+    background-color: #DFDDD2; /* 设置背景色为浅ç<E280A6>°è‰² */
+    height: 18px; /* 设置高度 */
+}
+
+/* 列表项的样å¼<C3A5> */
+.ll {
+    border-right: 2px solid #ACACAC; /* 设置å<C2AE>³è¾¹æ¡† */
+    border-bottom: 2px solid #ACACAC; /* 设置底边框 */
+    background-color: #E6E6E6; /* 设置背景色 */
+}
+
+/* 具有虚线下边框的样å¼<C3A5> */
+.bline {
+    border-bottom: 1px dotted #BCBCBC; /* 设置虚线底边框 */
+    height: 28px; /* 设置高度 */
+    background-color: #FFFFFF; /* 设置背景色为白色 */
+}
+
+/* 上传字段的浮动样å¼<C3A5> */
+#uploadfield {
+    float: left; /* 设置浮动到左侧 */
+}
+
+/* 具有实线下边框的样å¼<C3A5> */
+.bline2 {
+    border-bottom: 1px solid #BCBCBC; /* 设置实线底边框 */
+}
+
+/* 按钮的样å¼<C3A5> */
+.coolbt {
+    border-left: 1px solid #EFEFEF; /* 设置左边框 */
+    border-top: 1px solid #EFEFEF; /* 设置上边框 */
+    border-right: 1px solid #ACACAC; /* 设置å<C2AE>³è¾¹æ¡† */
+    border-bottom: 1px solid #ACACAC; /* 设置底边框 */
+    background-color: #E4F7D7; /* 设置背景色 */
+    cursor: pointer; /* 设置鼠标悬å<C2AC>œæ—¶çš„光标样å¼<C3A5>为手形 */
+}
+
+/* å<>¦ä¸€ä¸ªæŒ‰é’®çš„æ ·å¼<C3A5> */
+.coolbt2 {
+    border-left: 1px solid #EFEFEF; /* 设置左边框 */
+    border-top: 1px solid #EFEFEF; /* 设置上边框 */
+    border-right: 1px solid #ACACAC; /* 设置å<C2AE>³è¾¹æ¡† */
+    border-bottom: 1px solid #ACACAC; /* 设置底边框 */
+    background-color: #F7FCDA; /* 设置背景色 */
+}
+
+/* å<>¦ä¸€ä¸ªæ ·å¼<C3A5>的按钮 */
+.coolbg3 {
+    border: 1px solid #BDC5B4; /* 设置边框 */
+    background-color: #DFDDD2; /* 设置背景色 */
+    height: 20px; /* 设置高度 */
+    width: 140px; /* 设置宽度 */
+    text-align: right; /* 设置文字å<E28094>³å¯¹é½<C3A9> */
+}
+
+/* æ ·å¼<C3A5>定义 */
+.coolbg61 {
+    line-height: 26px; /* 设置行高 */
+    width: 380px; /* 设置宽度 */
+    border-top: 1px solid #BDC5B4; /* 设置上边框 */
+    border-left: 1px solid #BDC5B4; /* 设置左边框 */
+    border-right: 1px solid #BDC5B4; /* 设置å<C2AE>³è¾¹æ¡† */
+    height: 26px; /* 设置高度 */
+    text-align: right; /* 设置文字å<E28094>³å¯¹é½<C3A9> */
+    background-color: #E7F3B1; /* 设置背景色 */
+}
+
+.coolbg62 {
+    border: 1px solid #BDC5B4; /* 设置边框 */
+    background-color: #F8FDF0; /* 设置背景色 */
+    height: 300px; /* 设置高度 */
+    width: 380px; /* 设置宽度 */
+    padding: 5px; /* 设置内边è·<C3A8> */
+}
+
+/* å<>¦ä¸€ç§<C3A7>背景样å¼<C3A5> */
+.coolbg4 {
+    border-bottom: 1px solid #C9CFC1; /* 设置底边框 */
+    background-color: #EDEBE5; /* 设置背景色 */
+    height: 20px; /* 设置高度 */
+    width: 190px; /* 设置宽度 */
+    text-align: right; /* 设置文字å<E28094>³å¯¹é½<C3A9> */
+}
+
+/* 背景颜色和边框的样å¼<C3A5> */
+.coolbg5 {
+    border-top: 1px solid #BDC5B4; /* 设置上边框 */
+    background-color: #EDEBE5; /* 设置背景色 */
+    font-size: 1pt; /* 设置字体大å°<C3A5> */
+    height: 6px; /* 设置高度 */
+    width: 190px; /* 设置宽度 */
+}
+
+/* 弹窗样å¼<C3A5> */
+.dlg {
+    border: 2px solid #749F4D; /* 设置边框 */
+    background-color: #F0FAEB; /* 设置背景色 */
+    padding: 2px; /* 设置内边è·<C3A8> */
+    width: 360px; /* 设置宽度 */
+    line-height: 160%; /* 设置行高 */
+}
+
+/* æ ·å¼<C3A5>定义 */
+.dlgws {
+    border: 2px solid #749F4D; /* 设置边框 */
+    background-color: #F0FAEB; /* 设置背景色 */
+    padding: 2px; /* 设置内边è·<C3A8> */
+    width: 280px; /* 设置宽度 */
+    line-height: 160%; /* 设置行高 */
+}
+
+.dlgws div {
+    width: 100%; /* 设置宽度 */
+}
+
+/* 测试标题样å¼<C3A5> */
+.dlgTesttitle {
+    border: 2px solid #749F4D; /* 设置边框 */
+    background-color: #F0FAEB; /* 设置背景色 */
+    padding: 2px; /* 设置内边è·<C3A8> */
+    width: 200px; /* 设置宽度 */
+    line-height: 150%; /* 设置行高 */
+}
+
+/* æ ·å¼<C3A5>定义 */
+#_mysource {
+    z-index: 5000; /* 设置z-index */
+}
+
+#_mywriter {
+    z-index: 6000; /* 设置z-index */
+}
+
+/* æ ·å¼<C3A5>定义 */
+.option1 {
+    background-color: #DCECA6; /* 设置背景色 */
+}
+
+.option2 {
+    background-color: #F7FBD2; /* 设置背景色 */
+}
+
+.option3 {
+    background-color: #FFFFFF; /* 设置背景色 */
+}
+
+/* 输入框样å¼<C3A5> */
+.ininput {
+    width: 96%; /* 设置宽度 */
+    height: 20px; /* 设置高度 */
+    border: 1px solid #ffffff; /* 设置白色边框 */
+}
+
+/* 按钮样å¼<C3A5> */
+.nbt {
+    padding: 1px; /* 设置内边è·<C3A8> */
+    background-image: url('allbtbg.gif'); /* 设置背景图片 */
+    background-color: #ffffff; /* 设置背景色 */
+    border: 1px solid #A5AF83; /* 设置边框 */
+}
+
+/* 设置表格标题 */
+.tdt {
+    padding-left: 6px; /* 设置左内边è·<C3A8> */
+}
+
+/* 页é<C2B5>¢ç­‰å¾…æ ·å¼<C3A5> */
+.waitpage {
+    top: 0; /* 设置顶部ä½<C3A4>ç½® */
+    left: 0; /* 设置左侧ä½<C3A4>ç½® */
+    filter: Alpha(opacity=70); /* 设置é€<C3A9>明度 */
+    -moz-opacity: 0.7; /* 设置é€<C3A9>明度 */
+    position: absolute; /* 设置ç»<C3A7>对定ä½<C3A4> */
+    z-index: 10000; /* 设置层级 */
+}
+
+/* æ ·å¼<C3A5>定义 */
+.divpre {
+    filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale); /* 设置é€<C3A9>明度 */
+}
+
+/* 自动输入框样å¼<C3A5> */
+.autoinput {
+    padding-left: 3px; /* 设置左内边è·<C3A8> */
+    width: 90%; /* 设置宽度 */
+    height: 22px; /* 设置高度 */
+}
+
+/* 标题样å¼<C3A5> */
+.bodytitle {
+    margin: auto; /* 设置自动外边è·<C3A8> */
+    height: 28px; /* 设置高度 */
+    border: 1px dotted #BFD67C; /* 设置虚线边框 */
+    background: url('wbg.gif'); /* 设置背景图片 */
+    margin-bottom: 6px; /* 设置底部外边è·<C3A8> */
+    width: 98%; /* 设置宽度 */
+    font-weight: bold; /* 设置字体加粗 */
+}
+
+.bodytitle div {
+    float: left; /* 设置浮动为左 */
+}
+
+/* 标题文本样å¼<C3A5> */
+.bodytitletxt {
+    padding-left: 6px; /* 设置左内边è·<C3A8> */
+    line-height: 28px; /* 设置行高 */
+}
+
+/* 设置表格标题 */
+.tbtitle td {
+    padding: 3px; /* 设置å<C2AE>•å…ƒæ ¼å†…è¾¹è·<C3A8> */
+}
+
+/* 列表样å¼<C3A5> */
+.tblist td {
+    background: #FFFFFF; /* 设置背景色为白色 */
+    padding: 6px; /* 设置内边è·<C3A8> */
+}
+
+.tblist td.tbsname {
+    background: #F9FFE6; /* 设置背景色 */
+    padding: 6px; /* 设置内边è·<C3A8> */
+}
+
+=======
+}
+>>>>>>> remotes/origin/wyp_branch
+.tblist td.tbsname{
+	background:#F9FFE6;
+	padding:6px;
+}

catelogAdd.jsp

@@ -0,0 +1,61 @@
+<%@ 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>

catelogMana.jsp

@@ -0,0 +1,70 @@
+<%@ 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)//确定删除？，确定后跳转界面，删除菜品类别的id
+           {
+               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>

cont.css

@@ -0,0 +1,241 @@
+/* CSS Document */
+
+<<<<<<< HEAD
+/* Bodyæ ·å¼<C3A5> */
+body{
+    padding:0px; /* 设置body的内边è·<C3A8>为0 */
+    margin:0px;  /* 设置body的外边è·<C3A8>为0 */
+    font-size:12px; /* 设置默认字体大å°<C3A5>为12px */
+}
+
+/*==========TOP部分（头部区域）==========*/
+.top_tab{
+    background-image:url(/dingcan/images/top_01.gif); /* 设置背景图片 */
+    background-repeat:repeat-x; /* 背景图片水平é‡<C3A9>å¤<C3A5> */
+    height:90px; /* 设置顶部高度为90px */
+    width:100%; /* 设置顶部宽度为100% */
+}
+
+.top_logo{
+    width:197px; /* 设置logo宽度为197px */
+    background-image:url(/dingcan/images/top_02.gif); /* 设置logo的背景图片 */
+}
+
+.top_tex{
+    background:url(/dingcan/images/top_03.gif) no-repeat; /* 设置top_tex区域的背景图片，且ä¸<C3A4>é‡<C3A9>å¤<C3A5> */
+}
+
+.top_r{
+    width:361px; /* 设置å<C2AE>³ä¾§åŒºåŸŸå®½åº¦ä¸º361px */
+    background:url(/dingcan/images/top_05.gif) no-repeat; /* 设置å<C2AE>³ä¾§åŒºåŸŸçš„背景图片，ä¸<C3A4>é‡<C3A9>å¤<C3A5> */
+}
+
+/*========== å<>³ä¾§éƒ¨åˆ†ï¼ˆå<CB86>³ä¾§å†…容区域）==========*/
+.right_body{
+    padding-left:5px; /* 设置å<C2AE>³ä¾§å†…容区左内边è·<C3A8>为5px */
+    padding-right:5px; /* 设置å<C2AE>³ä¾§å†…容区å<C2BA>³å†…è¾¹è·<C3A8>为5px */
+}
+
+.right_font{
+    font-size:13px; /* 设置字体大å°<C3A5>为13px */
+    cursor:hand; /* 设置鼠标悬å<C2AC>œæ—¶å<C2B6>˜ä¸ºæ‰‹å½¢ */
+}
+
+/*========== 内容区域样å¼<C3A5>（表格样å¼<C3A5>）==========*/
+.cont_tab{
+    background-color:#4374A3; /* 设置背景颜色为深è“<C3A8>色 */
+}
+
+.cont_tab_l{
+    background-image:url(/dingcan/images/r_14.gif); /* 设置左边区域的背景图片 */
+    background-repeat:no-repeat; /* 背景ä¸<C3A4>é‡<C3A9>å¤<C3A5> */
+    width:12px; /* 设置宽度为12px */
+    height:13px; /* 设置高度为13px */
+}
+
+.cont_tab_m{
+    background-image:url(/dingcan/images/r_16.gif); /* 设置中间区域的背景图片 */
+    background-repeat:repeat-x; /* 背景水平é‡<C3A9>å¤<C3A5> */
+    height:13px; /* 设置高度为13px */
+}
+
+.cont_tab_r{
+    background-image:url(/dingcan/images/r_14_r.gif); /* 设置å<C2AE>³è¾¹åŒºåŸŸçš„背景图片 */
+    background-repeat:no-repeat; /* 背景ä¸<C3A4>é‡<C3A9>å¤<C3A5> */
+    width:12px; /* 设置宽度为12px */
+    height:13px; /* 设置高度为13px */
+}
+
+.cont_tab_bl{
+    background-image:url(/dingcan/images/r_24.gif); /* 设置左下角区域的背景图片 */
+    background-repeat:no-repeat; /* 背景ä¸<C3A4>é‡<C3A9>å¤<C3A5> */
+    width:12px; /* 设置宽度为12px */
+    height:13px; /* 设置高度为13px */
+}
+
+.cont_tab_bm{
+    background-image:url(/dingcan/images/r_29.gif); /* 设置底部区域的背景图片 */
+    background-repeat:repeat-x; /* 背景水平é‡<C3A9>å¤<C3A5> */
+    height:13px; /* 设置高度为13px */
+}
+
+.cont_tab_br{
+    background-image:url(/dingcan/images/r_24_r.gif); /* 设置å<C2AE>³ä¸‹è§’区域的背景图片 */
+    background-repeat:no-repeat; /* 背景ä¸<C3A4>é‡<C3A9>å¤<C3A5> */
+    width:12px; /* 设置宽度为12px */
+    height:13px; /* 设置高度为13px */
+}
+
+/*========== 左侧è<C2A7>œå<C593>•éƒ¨åˆ†==========*/
+.left_b_m{
+    line-height:13px; /* 设置行高为13px */
+    font-size:1px; /* 设置字体大å°<C3A5>为1px */
+}
+
+.left_mid{
+    padding-left:2px; /* 设置左侧内边è·<C3A8>为2px */
+    padding-right:1px; /* 设置å<C2AE>³ä¾§å†…è¾¹è·<C3A8>为1px */
+}
+
+.menu_first_img{
+    background-image:url(/dingcan/images/l_b_05.gif); /* 设置è<C2AE>œå<C593>•ç¬¬ä¸€é¡¹çš„背景图片 */
+    background-repeat:no-repeat; /* 背景ä¸<C3A4>é‡<C3A9>å¤<C3A5> */
+}
+
+.menu_second_img{
+    background-image:url(/dingcan/images/l_b_03.gif); /* 设置è<C2AE>œå<C593>•ç¬¬äºŒé¡¹çš„背景图片 */
+    background-repeat:no-repeat; /* 背景ä¸<C3A4>é‡<C3A9>å¤<C3A5> */
+}
+
+.mouse{
+    cursor:hand; /* 鼠标悬å<C2AC>œæ—¶å<C2B6>˜ä¸ºæ‰‹å½¢ */
+    width:176px; /* 设置宽度为176px */
+    height:29px; /* 设置高度为29px */
+    line-height:29px; /* 设置行高为29px */
+}
+
+.left{
+    background-image:url(/dingcan/images/menu_26.gif); /* 设置左侧è<C2A7>œå<C593>•é¡¹çš„背景图片 */
+    height:29px; /* 设置高度为29px */
+    padding-bottom:4px; /* 设置底部内边è·<C3A8>为4px */
+}
+
+/*========== 页脚部分==========*/
+#foot{
+    background-color:#4374A3; /* 设置背景颜色为深è“<C3A8>色 */
+    height:17px; /* 设置高度为17px */
+    font-size:12px; /* 设置字体大å°<C3A5>为12px */
+    color:#ffffff; /* 设置字体颜色为白色 */
+    letter-spacing:3px; /* 设置字æ¯<C3A6>é—´è·<C3A8>为3px */
+    text-align:center; /* 设置文本居中 */
+    padding-top:3px; /* 设置顶部内边è·<C3A8>为3px */
+=======
+body{
+	padding:0px;
+	margin:0px;
+	font-size:12px;
+}
+/*==========TOPÒ³ÃæÉèÖÃ==========*/
+.top_tab{
+	background-image:url(/dingcan/images/top_01.gif);
+	background-repeat:repeat-x;
+	height:90px;
+	width:100%;
+}
+.top_logo{
+	width:197px;
+	background-image:url(/dingcan/images/top_02.gif);
+}
+.top_tex{
+	background:url(/dingcan/images/top_03.gif) no-repeat;
+}
+.top_r{
+	width:361px;
+	background:url(/dingcan/images/top_05.gif) no-repeat;
+}
+/*==========ÓÒ²àÒ³Ãæ(Ö÷ÄÚÈÝÏÔʾ²¿·Ö)ÉèÖÃ==========*/
+.right_body{
+	padding-left:5px;
+	padding-right:5px;
+}
+.right_font{
+	font-size:13px;
+	cursor:hand;
+}
+/*==========ËùÓеÄͼƬÏà¹ØÁ¬½ÓÈ«²¿Ð´ÔÚCSS,ÕâÑùÊÇΪÁËÖÆ×÷¶àÑÕÉ«°æ±¾==========*/
+.cont_tab{
+	background-color:#4374A3;
+}
+.cont_tab_l{
+	background-image:url(/dingcan/images/r_14.gif);
+	background-repeat:no-repeat;
+	width:12px;
+	height:13px;
+}
+.cont_tab_m{
+	background-image:url(/dingcan/images/r_16.gif);
+	background-repeat:repeat-x;
+	height:13px;
+	}
+.cont_tab_r{
+	background-image:url(/dingcan/images/r_14_r.gif);
+	background-repeat:no-repeat;
+	width:12px;
+	height:13px;
+}
+.cont_tab_bl{
+	background-image:url(/dingcan/images/r_24.gif);
+	background-repeat:no-repeat;
+	width:12px;
+	height:13px;
+}
+.cont_tab_bm{
+	background-image:url(/dingcan/images/r_29.gif);
+	background-repeat:repeat-x;
+	height:13px;
+}
+.cont_tab_br{
+	background-image:url(/dingcan/images/r_24_r.gif);
+	background-repeat:no-repeat;
+	width:12px;
+	height:13px;
+}
+/*==========LEFTÒ³ÃæÉèÖÃ==========*/
+.left_b_m{
+	line-height:13px;
+	font-size:1px;
+}
+.left_mid{
+	padding-left:2px;
+	padding-right:1px;
+}
+.menu_first_img{
+	background-image:url(/dingcan/images/l_b_05.gif);
+	background-repeat:no-repeat;
+}.menu_second_img{
+	background-image:url(/dingcan/images/l_b_03.gif);
+	background-repeat:no-repeat;
+}
+.mouse{
+	cursor:hand;
+	width:176px;
+	height:29px;
+	line-height:29px;
+
+}
+.left{
+	background-image:url(/dingcan/images/menu_26.gif);
+	height:29px;
+	padding-bottom:4px;
+}
+/*==========Foot==========*/
+#foot{
+	background-color:#4374A3;
+	height:17px;
+	font-size:12px;
+	color:#ffffff;
+	letter-spacing:3px;
+	text-align:center;
+	padding-top:3px;
+>>>>>>> remotes/origin/wyp_branch
+}

cont.jsp

@@ -0,0 +1,187 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8" %>
+<%
+   String path = request.getContextPath();
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml"> <!-- 管理员界面 -->
+  <head>
+<<<<<<< HEAD
+	<meta http-equiv="pragma" content="no-cache"/><%@ page language="java" import="java.util.*" pageEncoding="utf-8" %>
+  <%
+     // 获取当前请求的上下文路径，通常用于生成相对路径
+     String path = request.getContextPath();
+  %>
+  
+  <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+  <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"/>
+      
+      <!-- 引入外部CSS样式文件 -->
+      <link href="<%=path %>/css/cont.css" rel="stylesheet" type="text/css"/> <!-- CSS样式的路径是path/css/cont.css -->
+  
+      <!-- JavaScript部分，用于处理左侧栏的切换功能 -->
+      <script type="text/javascript">                       
+          function switchSysBar(){  
+              // 获取当前页面的URL地址，并去掉"/admin/cont.jsp"部分
+              var locate=location.href.replace('<%=path %>/admin/cont.jsp','');  
+              
+              // 获取图片路径，去掉域名部分，只保留文件路径
+              var ssrc=document.all("img1").src.replace(locate,''); 
+              
+              // 如果当前图片是/jiaju/images/cont_19.gif，则切换为/jiaju/images/cont_1_19.gif，并隐藏左侧栏
+              if (ssrc=="/jiaju/images/cont_19.gif") { 
+                  document.all("img1").src="/jiaju/images/cont_1_19.gif";  // 更新图片路径
+                  document.all("frmTitle").style.display="none";  // 隐藏左侧栏
+              } else { 
+                  // 否则，恢复图片为默认状态，并显示左侧栏
+                  document.all("img1").src="/jiaju/images/cont_19.gif";  
+                  document.all("frmTitle").style.display=""; 
+              } 
+          } 
+      </script>
+    </head>
+    
+    <body>
+        <!-- 设置页面样式，隐藏滚动条 -->
+        <body style="overflow:hidden"> 
+        
+        <!-- 页面结构，使用表格布局 -->
+        <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0" class="cont_tab"> 
+          <!-- 表格的行 -->
+          <tr>
+            <!-- 左侧栏，包含iframe加载的内容 -->
+            <td width="180" id="frmTitle" align="center" valign="top">
+              <!-- 左侧栏的iframe，加载路径为<%=path %>/admin/left.jsp -->
+              <iframe name="left" height="100%" width="180" src="<%=path %>/admin/left.jsp" frameborder="0" scrolling="no">
+                浏览器不支持嵌入式框架，或被配置为不显示嵌入式框架。
+              </iframe>
+            </td>
+  
+            <!-- 主内容区 -->
+            <td align="center" valign="top" style="padding-right:8px;">
+              <!-- 内部表格，用于分割页面内容 -->
+              <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0" style="table-layout:fixed;">
+                <tr>
+                  <td height="13" style="line-height:13px;">
+                    <!-- 边框的分隔行 -->
+                    <table width="100%" border="0" cellspacing="0" cellpadding="0" style="table-layout:fixed;">
+                        <tr>
+                          <td class="cont_tab_l">&nbsp;</td>
+                          <td class="cont_tab_m">&nbsp;</td>
+                          <td class="cont_tab_r">&nbsp;</td>
+                        </tr>
+                    </table>
+                  </td>
+                </tr>
+                <tr>
+                  <!-- 主内容区的iframe -->
+                  <td>
+                    <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0" style="table-layout:fixed;">
+                      <tr>
+                        <td>
+                          <!-- 右侧内容区的iframe，加载路径为<%=path %>/admin/right.jsp -->
+                          <iframe name="I1" height="100%" width="100%" src="<%=path %>/admin/right.jsp" border="0" frameborder="0" scrolling="auto">
+                            浏览器不支持嵌入式框架，或被配置为不显示嵌入式框架。
+                          </iframe>
+                        </td>
+                      </tr>
+                    </table>
+                  </td>
+                </tr>
+                <tr>
+                  <td height="13" style="line-height:13px;">
+                    <!-- 底部分隔行 -->
+                    <table width="100%" border="0" cellspacing="0" cellpadding="0" style="table-layout:fixed;">
+                        <tr>
+                          <td class="cont_tab_bl">&nbsp;</td>
+                          <td class="cont_tab_bm">&nbsp;</td>
+                          <td class="cont_tab_br">&nbsp;</td>
+                        </tr>
+                    </table>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+    </body>
+  
+  </html>
+  
+=======
+	<meta http-equiv="pragma" content="no-cache"/>
+>>>>>>> remotes/origin/wyp_branch
+	<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/cont.css" rel="stylesheet" type="text/css"/> <!-- 调用一个外部的CSS样式文件,css的链接路径是path/css/cont.css,调用的样式为stylesheet，类型是css -->
+    <!--脚本类型是JavaScript-->
+    <script type="text/javascript">                      
+        function switchSysBar(){  
+var locate=location.href.replace('<%=path %>/admin/cont.jsp','');  //定义一个变量locate，取得当前url地址，代替上述域名
+var ssrc=document.all("img1").src.replace(locate,''); //将所有name = img1的图片地址中去掉刚才上面得到的路径， 只留下类似images/*.gif的字符串
+if (ssrc=="/jiaju/images/cont_19.gif") //如果图片是/jiaju/images/cont_19.gif，则将它换成/jiaju/images/cont_1_19.gif，并隐藏frmTitle
+{ 
+document.all("img1").src="/jiaju/images/cont_1_19.gif";
+document.all("frmTitle").style.display="none" 
+} 
+else  
+{ 
+document.all("img1").src="/jiaju/images/cont_19.gif";
+document.all("frmTitle").style.display="" 
+} //否则将图片替换成/jiaju/images/cont_19.gif，并显示frmTitle
+} 
+    </script>
+  </head>
+  
+  <body>
+      <body style="overflow:hidden"> <!-- 隐藏滚动条 -->
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0" class="cont_tab"> <!--表格宽度为100% 高度为100% 表中小格子边框为0，小格子中文字距离小格子距离为0，小格子之间距离为0（小格子紧密的靠在一起）样式为css中的cont_tab-->
+  <tr>
+    <td width="180" id="frmTitle" align="center" valign="top">
+	<iframe name="left" height="100%" width="180" src="<%=path %>/admin/left.jsp" frameborder="0" scrolling="no">
+	浏览器不支持嵌入式框架，或被配置为不显示嵌入式框架。</iframe>	</td>
+<!--     <td width="8" valign="middle" onClick="switchSysBar()"><img src="/jiaju/images/cont_19.gif" width="8" height="64" name="img1" id="img1" title="打开/关闭左侧栏" style="cursor:hand;"></td> -->
+    <td align="center" valign="top" style="padding-right:8px;"><table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0" style="table-layout:fixed;">
+      <tr>
+        <td height="13" style=" line-height:13px;"><table width="100%" border="0" cellspacing="0" cellpadding="0" style="table-layout:fixed;">
+            <tr>
+              <td class="cont_tab_l">&nbsp;</td>
+              <td class="cont_tab_m">&nbsp;</td>
+              <td class="cont_tab_r">&nbsp;</td>
+            </tr>
+        </table></td>
+      </tr>
+      <tr>
+        <td><table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0" style="table-layout:fixed;">
+            <tr>
+              <td><iframe name="I1" height="100%" width="100%" src="<%=path %>/admin/right.jsp" border="0" frameborder="0" scrolling="auto"> 浏览器不支持嵌入式框架，或被配置为不显示嵌入式框架。</iframe></td>
+              </tr>
+        </table></td>
+      </tr>
+      <tr>
+        <td height="13" style="line-height:13px;"><table width="100%" border="0" cellspacing="0" cellpadding="0" style="table-layout:fixed;">
+            <tr>
+              <td class="cont_tab_bl">&nbsp;</td>
+              <td class="cont_tab_bm">&nbsp;</td>
+              <td class="cont_tab_br">&nbsp;</td>
+            </tr>
+        </table></td>
+      </tr>
+    </table></td>
+  </tr>
+</table>
+</body>
+
+</html>

fail.jsp

@@ -0,0 +1,23 @@
+<%@ 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><!-- 返回该网页的根urlrequest.getScheme()返回协议的名称http。request.getServerName()获取服务器的名称localhost，request.getServerPort()获取端口8080-->
+  <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>
+  <!--使用JSTL标签库-->
+  <body>
+      <center>账号或密码错误</center>
+  </body>
+</html>

foot.jsp

@@ -0,0 +1,45 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8" %>
+<%
+<<<<<<< HEAD
+   // 获取当前请求的上下文路径，用于生成相对路径
+=======
+>>>>>>> remotes/origin/wyp_branch
+   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>
+<<<<<<< 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"/>
+
+    <!-- 引入外部CSS样式文件 -->
+    <link href="<%=path %>/css/cont.css" rel="stylesheet" type="text/css" /> <!-- CSS文件路径为<%=path %>/css/cont.css -->
+  </head>
+  
+  <body>
+    <!-- 页面中的footer部分 -->
+    <div id="foot"></div> <!-- 这是一个div元素，作为页面的footer部分，div的id为"foot" -->
+
+    <!-- 这个div元素通常用于显示页面底部的信息或分割作用。通过设置其CSS样式，可以控制其显示效果，如颜色、大小等。 -->
+=======
+	<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/cont.css" rel="stylesheet" type="text/css" /> <!-- 调用一个外部的CSS样式文件,css的链接路径是path/css/cont.css,调用的样式为stylesheet，类型是css -->
+  </head>
+  
+  <body>
+     <div id="foot"></div> <!-- div起到分割作用，div的id=food 颜色为蓝色-->
+>>>>>>> remotes/origin/wyp_branch
+  </body>
+</html>

goodsAdd.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" %> 
+<%@ 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，内嵌iframe，关闭后不重新加载页面
+	            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,'')"/>
+						    	<!--插入菜品的价格框，onpropertychange当输入框属性变化时，触发onchange1属性，修改数据库菜品价格 下一句为按键之后触发将输入值为非数字的字符替换为空，粘贴之后触发将输入值为非数字的字符替换为空-->
+						    </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>

goodsDetailHou.jsp

@@ -0,0 +1,24 @@
+<%@ 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>

goodsMana.jsp

@@ -0,0 +1,118 @@
+<%@ 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)//删除之后，跳转到删除成功界面，并删除菜品的id，传入菜品删除的界面
+           {
+               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()//跳转到goodsAdd.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>

goodsPre.jsp

@@ -0,0 +1,159 @@
+<%@ 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，内嵌iframe，关闭后不重新加载页面
+	            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,'')"/>
+						        <!--插入菜品的价格框，onpropertychange当输入框属性变化时，触发onchange1属性，修改数据库菜品价格 下一句为按键之后触发将输入值为非数字的字符替换为空，粘贴之后触发将输入值为非数字的字符替换为空 -->
+						    </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>

huifuAdd.jsp

@@ -0,0 +1,62 @@
+<%@ 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.huifu.value=="")
+                {
+                    alert("请输入信息内容");
+                    return false;
+                }
+                
+                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>
+						<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"/>
+						    </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="id" value="<%=request.getParameter("id") %>"/>
+						       <input type="button" value="提交" onclick="c()"/>&nbsp; <!-- 提交时触发c函数，判断是否未回复内容 -->
+						       <input type="reset" value="重置"/>&nbsp;
+						    </td>
+						</tr>
+					 </table>
+			</form>
+   </body>
+</html>

index.css

@@ -0,0 +1,97 @@
+/* CSS Document */
+
+<<<<<<< HEAD
+/* Body部分样式 */
+body{
+    margin:0px; /* 设置页面的外边距为0，去除默认的外边距 */
+    padding:50px 0px 0px 0px; /* 设置页面的内边距，上边距为50px，其他边距为0 */
+    background-color:#5c86ad; /* 设置背景颜色为淡蓝色 */
+    font-size:12px; /* 设置字体大小为12px */
+    color:#133B61; /* 设置文字颜色为深蓝色 */
+}
+
+/* Index页面部分样式 */
+
+/* tab1的样式 */
+.tab1{
+    background-image:url(/dingcan/images/dx_01.gif); /* 设置背景图片 */
+    background-repeat:no-repeat; /* 背景不重复 */
+    height:160px; /* 设置高度为160px */
+    width:708px; /* 设置宽度为708px */
+}
+
+/* tab2的样式 */
+.tab2{
+    background-image:url(/dingcan/images/dx_02.gif); /* 设置背景图片 */
+    background-repeat:no-repeat; /* 背景不重复 */
+    width:273px; /* 设置宽度为273px */
+    height:200px; /* 设置高度为200px */
+    padding-left:335px; /* 设置左内边距为335px */
+    padding-right:90px; /* 设置右内边距为90px */
+    font-size:12px; /* 设置字体大小为12px */
+    letter-spacing: 3px; /* 设置字母间距为3px */
+    color:#18345A; /* 设置字体颜色为深蓝色 */
+    padding-top:10px; /* 设置顶部内边距为10px */
+}
+
+/* tab3的样式 */
+.tab3{
+    background-image:url(/dingcan/images/dx_03.gif); /* 设置背景图片 */
+    background-repeat:no-repeat; /* 背景不重复 */
+    width:708px; /* 设置宽度为708px */
+    height:216px; /* 设置高度为216px */
+}
+
+/* .id 样式，可能用于表单中的输入框或其他元素 */
+.id{
+    height:18px; /* 设置元素高度为18px */
+    border:1px solid #255FAD; /* 设置边框颜色为蓝色，宽度为1px，实线 */
+    filter: Alpha(Opacity=60); /* 设置透明度为60%，仅适用于IE浏览器 */
+}
+
+/* 输入框悬停效果 */
+input:hover{
+    background-color:#A0D1FF; /* 设置鼠标悬停时输入框的背景颜色为浅蓝色 */
+}
+=======
+body{
+	margin:0px;
+	padding:50px 0px 0px 0px;
+	background-color:#5c86ad;
+	font-size:12px;
+	color:#133B61;
+}
+/*indexҳ<78><D2B3>CSS<53><53><EFBFBD><EFBFBD>*/
+.tab1{
+	background-image:url(/dingcan/images/dx_01.gif);
+	background-repeat:no-repeat;
+	height:160px;
+	width:708px;
+}
+.tab2{
+	background-image:url(/dingcan/images/dx_02.gif);
+	background-repeat:no-repeat;
+	width:273px;
+	height:200px;
+	padding-left:335px;
+	padding-right:90px;
+	font-size:12px;
+	letter-spacing: 3px;
+	color:#18345A;
+	padding-top:10px;
+}
+.tab3{
+	background-image:url(/dingcan/images/dx_03.gif);
+	background-repeat:no-repeat;
+	width:708px;
+	height:216px;
+}
+.id{
+	height:18px;
+	border:1px solid #255FAD;
+	filter: Alpha(Opacity=60);
+}
+input:hover{
+	background-color:#A0D1FF;
+}
+>>>>>>> remotes/origin/wyp_branch

index.jsp

@@ -0,0 +1,23 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8" %>
+<%
+   String path = request.getContextPath();  //获得当前的项目根目录路径赋值给path
+%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"> <!-- XHTML namespace命名空间 通过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"/>    <!-- 清除浏览器中的缓存，它和其它几句合起来用，就可以使你再次进入曾经访问过的页面时，ie浏览器必须从服务端下载最新的内容，达到刷新的效果。 --> 
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/> <!-- 向搜索引擎说明你的网页的关键词 -->
+	<meta http-equiv="description" content="This is my page"/> <!-- 告诉搜索引擎你的站点的主要内容 -->
+
+  </head>
+  
+  <frameset rows="100,*,20" cols="*" framespacing="0" frameborder="no" border="0"> <!-- 设置浏览器划分成左右100像素，剩余，20像素，上下不分，框架与框架间保留的空白的距离为0，没有框架边框，框架边框厚度为0  -->
+	  <frame src="<%=path %>/admin/top.jsp" name="topFrame" scrolling="no" noresize="noresize" id="topFrame" frameborder="0" />
+	  <frame src="<%=path %>/admin/cont.jsp" name="mainFrame" id="mainFrame" frameborder="0" />
+	  <frame src="<%=path %>/admin/foot.jsp" name="footFrame" id="footFrame" frameborder="0" />
+  </frameset> <!--框架显示的界面分别是path的值/admin/top.jsp，cont.jsp，foot.jsp 框架没有滚动条 ，无法调整框架的大小，id="topframe",框架边框厚度为0-->
+  <noframes><body></body></noframes> <!--noframes 元素可为那些不支持框架的浏览器显示文本 body中无文本-->
+</html>

left.jsp

@@ -1,3 +1,424 @@
+<<<<<<< HEAD
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8" %>
+<%
+<<<<<<< HEAD
+   String path = request.getContextPath(); // 获取应用的上下文路径
+%>
+=======
+   String path = request.getContextPath();
+%> 
+>>>>>>> remotes/origin/wyp_branch
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+<<<<<<< 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/cont.css" rel="stylesheet" type="text/css"> <!-- 引入外部CSS样式文件 -->
+	<style type="text/css">
+	   .STYLE1 {color: #FFFFFF; font-size: 12px;} <!-- 样式定义 -->
+	</style>
+    
+    <script type="text/javascript">
+        // 展示子菜单功能
+        function show(str) {
+            var str1="td"+str; // 用于标识当前菜单项
+            var str="show"+str;  // 用于显示相应的子菜单
+            // 设置所有菜单项背景为默认
+            document.getElementById("td1").style.background="url('/dingcan/images/l_b_03.gif')";
+            document.getElementById("td2").style.background="url('/dingcan/images/l_b_03.gif')";
+            document.getElementById("td3").style.background="url('/dingcan/images/l_b_03.gif')";
+            document.getElementById("td4").style.background="url('/dingcan/images/l_b_03.gif')";
+            document.getElementById("td5").style.background="url('/dingcan/images/l_b_03.gif')";
+            document.getElementById("td6").style.background="url('/dingcan/images/l_b_03.gif')";
+            // 隐藏所有子菜单
+            document.getElementById("show1").style.display="none";
+            document.getElementById("show2").style.display="none";
+            document.getElementById("show3").style.display="none";
+            document.getElementById("show4").style.display="none";
+            document.getElementById("show5").style.display="none";
+            document.getElementById("show6").style.display="none";
+            // 显示当前点击的子菜单并改变背景色
+            document.getElementById(str1).style.background="url('/dingcan/images/l_b_05.gif')";
+            document.getElementById(str).style.display="block"; // 将子菜单设为块级元素显示
+        }
+
+        // 展示另一个菜单功能
+        function sho(str) {
+            var str1="t"+str; // 用于标识当前菜单项
+            var str="sho"+str;  // 用于显示相应的子菜单
+            // 设置所有菜单项背景为默认
+            document.getElementById("t1").style.background="url('/dingcan/images/2_14.gif')";
+            document.getElementById("t2").style.background="url('/dingcan/images/2_14.gif')";
+            document.getElementById("t3").style.background="url('/dingcan/images/2_14.gif')";
+            document.getElementById("t4").style.background="url('/dingcan/images/2_14.gif')";
+            document.getElementById("t5").style.background="url('/dingcan/images/2_14.gif')";
+            document.getElementById("t6").style.background="url('/dingcan/images/2_14.gif')";
+            // 隐藏所有子菜单
+            document.getElementById("sho1").style.display="none";
+            document.getElementById("sho2").style.display="none";
+            document.getElementById("sho3").style.display="none";
+            document.getElementById("sho4").style.display="none";
+            document.getElementById("sho5").style.display="none";
+            document.getElementById("sho6").style.display="none";
+            // 显示当前点击的子菜单并改变背景色
+            document.getElementById(str1).style.background="url('/dingcan/images/3_13.gif')";
+            document.getElementById(str).style.display="block"; // 将子菜单设为块级元素显示
+        }
+=======
+	<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/cont.css" rel="stylesheet" type="text/css"> <!-- 调用一个外部的CSS样式文件,css的链接路径是path/css/cont.css,调用的样式为stylesheet，类型是css -->
+	<style type="text/css">
+	   .STYLE1 {color: #FFFFFF;font-size: 12px;}
+	</style>
+    
+    <script type="text/javascript">
+        function show(str)
+		{
+			var str1="td"+str;
+			var str="show"+str;  
+			document.getElementById("td1").style.background="url('/dingcan/images/l_b_03.gif')";//每添加一个菜单，都要在这里添加。 getElementById得到id=td1的值，即修改登录密码
+			document.getElementById("td2").style.background="url('/dingcan/images/l_b_03.gif')";
+			document.getElementById("td3").style.background="url('/dingcan/images/l_b_03.gif')";
+			document.getElementById("td4").style.background="url('/dingcan/images/l_b_03.gif')";
+			document.getElementById("td5").style.background="url('/dingcan/images/l_b_03.gif')";
+			document.getElementById("td6").style.background="url('/dingcan/images/l_b_03.gif')";
+			document.getElementById("show1").style.display="none";
+			document.getElementById("show2").style.display="none";
+			document.getElementById("show3").style.display="none";
+			document.getElementById("show4").style.display="none";
+			document.getElementById("show5").style.display="none";
+			document.getElementById("show6").style.display="none";
+			document.getElementById(str1).style.background="url('/dingcan/images/l_b_05.gif')";
+			document.getElementById(str).style.display="block";//变成块级元素
+		}//迭代使用show函数，使用show函数完成叠菜单
+		function sho(str)
+		{
+			var str1="t"+str;
+			var str="sho"+str;
+			document.getElementById("t1").style.background="url('/dingcan/images/2_14.gif')";
+			document.getElementById("t2").style.background="url('/dingcan/images/2_14.gif')";
+			document.getElementById("t3").style.background="url('/dingcan/images/2_14.gif')";
+			document.getElementById("t4").style.background="url('/dingcan/images/2_14.gif')";
+			document.getElementById("t5").style.background="url('/dingcan/images/2_14.gif')";
+			document.getElementById("t6").style.background="url('/dingcan/images/2_14.gif')";
+			document.getElementById("sho1").style.display="none";
+			document.getElementById("sho2").style.display="none";
+			document.getElementById("sho3").style.display="none";
+			document.getElementById("sho4").style.display="none";
+			document.getElementById("sho5").style.display="none";
+			document.getElementById("sho6").style.display="none";
+			document.getElementById(str1).style.background="url('/dingcan/images/3_13.gif')";
+			document.getElementById(str).style.display="block";
+		}
+>>>>>>> remotes/origin/wyp_branch
+    </script>
+  </head>
+  
+  <body>
+<<<<<<< HEAD
+      <!-- 左侧导航菜单 -->
+      <table width="180" height="100%" border="0" cellpadding="0" cellspacing="0">
+  		 <tr>
+		    <td height="34">
+			    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+			      <tr>
+			        <td width="48"><img src="/dingcan/images/left_09.gif" width="48" height="34"></td>
+			        <td align="center" background="/dingcan/images/left_10.gif"><span class="STYLE1">导航菜单</span></td> <!-- 导航菜单标题 -->
+			        <td width="48"><img src="/dingcan/images/l_09.gif" width="48" height="34"></td>
+=======
+      <table width="180" height="100%" border="0" cellpadding="0" cellspacing="0"> <!--表格宽度为180 高度为100% 表中小格子边框为0（无边框），小格子中文字距离小格子距离为0，小格子之间距离为0（小格子紧密的靠在一起）-->
+  		 <tr>
+		    <td height="34">
+			    <table width="100%" border="0" cellspacing="0" cellpadding="0"> <!-- 在表中再建立一个表分成3部分放入图片组成一栏 -->
+			      <tr>
+			        <td width="48"><img src="/dingcan/images/left_09.gif" width="48" height="34"></td>
+			        <td align="center" background="/dingcan/images/left_10.gif"><span class="STYLE1">导航菜单</span></td> <!--定义行内元素导航菜单样式为STYLE1-->
+			        <td width="48"><img src="/dingcan/images/l_09.gif" width="48" height="34"></td> <!--在34高度上插入3个图片组成一栏 -->
+>>>>>>> remotes/origin/wyp_branch
+			      </tr>
+			    </table>
+		    </td>
+         </tr>
+         <tr>
+<<<<<<< HEAD
+            <td valign="top" background="/dingcan/images/left_bg_03.gif" class="left_mid">
+                <!-- 菜单项 -->
+	            <table width="100%" border="0" cellpadding="0" cellspacing="0">
+			        <!-- 修改登录密码 -->
+			        <tr>
+			            <td class="menu_first_img mouse" id="td1" onClick="show(1)">&nbsp;
+			               <span style="margin-left: 30px;font-family: 微软雅黑;color: white;font-size: 15px;">
+=======
+            <td valign="top" background="/dingcan/images/left_bg_03.gif" class="left_mid">  <!-- 放置顶端图片 为left_mid类型-->
+	            <table width="100%" border="0" cellpadding="0" cellspacing="0">			      
+			        <tr>
+			            <td class="menu_first_img mouse" id="td1" onClick="show(1)">&nbsp; <!-- 点击触发show（1），即打开下拉菜单 -->
+			               <span style="margin-left: 30px;font-family: 微软雅黑;color: white;font-size: 15px;">   <!-- 这一行左边距30px -->
+>>>>>>> remotes/origin/wyp_branch
+			                                                      修改登录密码
+			               </span>
+			            </td>
+			        </tr>
+<<<<<<< HEAD
+                    <!-- 子菜单1：修改登录密码 -->
+                    <tr>
+				        <td id="show1" style="display:none;">
+=======
+			        <!-- 1111 -->
+                    <tr>
+				        <td id="show1" style="display:none;"> 
+>>>>>>> remotes/origin/wyp_branch
+				            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+				               <tr>
+				                   <td class="left">
+					                  <table width="100%" height="24" border="0" cellpadding="0" cellspacing="0">
+							              <tr>
+							                <td width="140" align="center">
+							                    <span style="margin-left: 50px;font-family: 微软雅黑;font-size: 14px;">
+<<<<<<< HEAD
+							                        <a href="<%=path %>/admin/userinfo/userPw.jsp" target="I1" style="color: black;">修改登录密码</a>
+=======
+							                        <a href="<%=path %>/admin/userinfo/userPw.jsp" target="I1" style="color: black;">修改登录密码</a>  <!-- 点击修改密码，进入path/admin/userinfo/userPw.jsp界面 -->
+>>>>>>> remotes/origin/wyp_branch
+							                    </span>
+							                </td>
+							                <td>&nbsp;</td>
+							              </tr>
+							          </table>
+				                   </td>
+                               </tr>
+                            </table>
+                        </td>
+                    </tr>
+<<<<<<< HEAD
+                    <!-- 菜品类别管理 -->
+=======
+                    <!-- 1111 -->
+                    <!-- 1111 -->
+>>>>>>> remotes/origin/wyp_branch
+			        <tr>
+			            <td class="menu_first_img mouse" id="td2" onClick="show(2)">&nbsp;
+			               <span style="margin-left: 30px;font-family: 微软雅黑;color: white;font-size: 15px;">
+			                                                         菜品类别管理
+			               </span>
+			            </td>
+<<<<<<< HEAD
+			        </tr>
+                    <!-- 子菜单2：菜品类别管理和添加菜品类别 -->
+=======
+			        </tr>			        
+>>>>>>> remotes/origin/wyp_branch
+                    <tr>
+				        <td id="show2" style="display:none;">
+				            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+				               <tr>
+				                   <td class="left">
+					                  <table width="100%" height="24" border="0" cellpadding="0" cellspacing="0">
+							              <tr>
+							                <td width="140" align="center">
+							                    <span style="margin-left: 50px;font-family: 微软雅黑;font-size: 14px;">
+<<<<<<< HEAD
+							                        <a href="<%=path %>/catelog?type=catelogMana" target="I1" style="color: black;">菜品类别管理</a>
+=======
+							                        <a href="<%=path %>/catelog?type=catelogMana" target="I1" style="color: black;">菜品类别管理</a> <!-- ?是AJAX技术，？后面可以接传递的参数 -->
+>>>>>>> remotes/origin/wyp_branch
+							                    </span>
+							                </td>
+							                <td>&nbsp;</td>
+							              </tr>
+							          </table>
+				                   </td>
+<<<<<<< HEAD
+                               </tr>
+=======
+                               </tr>                              
+>>>>>>> remotes/origin/wyp_branch
+                               <tr>
+				                   <td class="left">
+					                  <table width="100%" height="24" border="0" cellpadding="0" cellspacing="0">
+							              <tr>
+							                <td width="140" align="center">
+							                    <span style="margin-left: 50px;font-family: 微软雅黑;font-size: 14px;">
+							                        <a href="<%=path %>/admin/catelog/catelogAdd.jsp" target="I1" style="color: black;">添加菜品类别</a>
+							                    </span>
+							                </td>
+							                <td>&nbsp;</td>
+							              </tr>
+							          </table>
+				                   </td>
+                               </tr>
+                            </table>
+                        </td>
+                    </tr>
+<<<<<<< HEAD
+                    <!-- 更多菜单项略... -->
+=======
+                    <!-- 1111 -->
+                    <!-- 1111 -->
+			        <tr>
+			            <td class="menu_first_img mouse" id="td3" onClick="show(3)">&nbsp;
+			               <span style="margin-left: 30px;font-family: 微软雅黑;color: white;font-size: 15px;">
+			                                                      菜品信息管理
+			               </span>
+			            </td>
+			        </tr>
+                    <tr>
+				        <td id="show3" style="display:none;">
+				            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+				               <tr>
+				                   <td class="left">
+					                  <table width="100%" height="24" border="0" cellpadding="0" cellspacing="0">
+							              <tr>
+							                <td width="140" align="center">
+							                    <span style="margin-left: 50px;font-family: 微软雅黑;font-size: 14px;">
+							                        <a href="<%=path %>/goods?type=goodsMana" target="I1" style="color: black;">菜品信息管理</a>
+							                    </span>
+							                </td>
+							                <td>&nbsp;</td>
+							              </tr>
+							          </table>
+				                   </td>
+                               </tr>
+                               <tr>
+				                   <td class="left">
+					                  <table width="100%" height="24" border="0" cellpadding="0" cellspacing="0">
+							              <tr>
+							                <td width="140" align="center">
+							                    <span style="margin-left: 50px;font-family: 微软雅黑;font-size: 14px;">
+							                        <a href="<%=path %>/admin/goods/goodsAdd.jsp" target="I1" style="color: black;">菜品信息添加</a>
+							                    </span>
+							                </td>
+							                <td>&nbsp;</td>
+							              </tr>
+							          </table>
+				                   </td>
+                               </tr>
+                            </table>
+                        </td>
+                    </tr>
+                    <!-- 1111 -->
+                    <!-- 1111 -->
+			        <tr>
+			            <td class="menu_first_img mouse" id="td4" onClick="show(4)">&nbsp;
+			               <span style="margin-left: 30px;font-family: 微软雅黑;color: white;font-size: 15px;">
+			                                                      会员信息管理
+			               </span>
+			            </td>
+			        </tr>
+                    <tr>
+				        <td id="show4" style="display:none;">
+				            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+				               <tr>
+				                   <td class="left">
+					                  <table width="100%" height="24" border="0" cellpadding="0" cellspacing="0">
+							              <tr>
+							                <td width="140" align="center">
+							                    <span style="margin-left: 50px;font-family: 微软雅黑;font-size: 14px;">
+							                        <a href="<%=path %>/user?type=userMana" target="I1" style="color: black;">会员信息管理</a>
+							                    </span>
+							                </td>
+							                <td>&nbsp;</td>
+							              </tr>
+							          </table>
+				                   </td>
+                               </tr>
+                            </table>
+                        </td>
+                    </tr>
+                    <!-- 1111 -->
+                    <!-- 1111 -->
+			        <tr>
+			            <td class="menu_first_img mouse" id="td5" onClick="show(5)">&nbsp;
+			               <span style="margin-left: 30px;font-family: 微软雅黑;color: white;font-size: 15px;">
+			                                                     订单信息管理
+			               </span>
+			            </td>
+			        </tr>
+                    <tr>
+				        <td id="show5" style="display:none;">
+				            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+				               <tr>
+				                   <td class="left">
+					                  <table width="100%" height="24" border="0" cellpadding="0" cellspacing="0">
+							              <tr>
+							                <td width="140" align="center">
+							                    <span style="margin-left: 50px;font-family: 微软雅黑;font-size: 14px;">
+							                        <a href="<%=path %>/order?type=orderMana" target="I1" style="color: black;">订单信息管理</a>
+							                    </span>
+							                </td>
+							                <td>&nbsp;</td>
+							              </tr>
+							          </table>
+				                   </td>
+                               </tr>
+                            </table>
+                        </td>
+                    </tr>
+                    <!-- 1111 -->
+                    
+                    <!-- 1111 -->
+			        <tr>
+			            <td class="menu_first_img mouse" id="td6" onClick="show(6)">&nbsp;
+			               <span style="margin-left: 30px;font-family: 微软雅黑;color: white;font-size: 15px;">
+			                                                    留言信息管理
+			               </span>
+			            </td>
+			        </tr>
+                    <tr>
+				        <td id="show6" style="display:none;">
+				            <table width="100%" border="0" cellspacing="0" cellpadding="0">
+				               <tr>
+				                   <td class="left">
+					                  <table width="100%" height="24" border="0" cellpadding="0" cellspacing="0">
+							              <tr>
+							                <td width="140" align="center">
+							                    <span style="margin-left: 50px;font-family: 微软雅黑;font-size: 14px;">
+							                         <a href="<%=path %>/liuyan?type=liuyanMana" target="I1" style="color: black;">留言信息管理</a>
+							                    </span>
+							                </td>
+							                <td>&nbsp;</td>
+							              </tr>
+							          </table>
+				                   </td>
+                               </tr>
+                            </table>
+                        </td>
+                    </tr>
+                    <!-- 1111 -->
+>>>>>>> remotes/origin/wyp_branch
+                </table>
+            </td>
+         </tr>
+		 <tr>
+<<<<<<< HEAD
+		    <td height="13">
+		        <!-- 底部区域 -->
+		        <table width="100%" border="0
+=======
+		    <td height="13"><table width="100%" border="0" cellspacing="0" cellpadding="0">
+		       <tr>
+		           <td width="48"><img src="/dingcan/images/left_31.gif" width="48" height="13"></td>
+		           <td background="/dingcan/images/left_32.gif" class="left_b_m">&nbsp;</td>
+		           <td width="48"><img src="/dingcan/images/left_31_l.gif" width="48" height="13"></td>
+		       </tr>
+		    </table></td>
+		  </tr>
+      </table>
+  </body>
+</html>
+>>>>>>> remotes/origin/wyp_branch
+=======
 <%@ 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"%>
@@ -45,3 +466,4 @@ String path = request.getContextPath();
 			</ul>
   </body>
 </html>
+>>>>>>> remotes/origin/wyc_branch

liuyanHuifu.jsp

@@ -0,0 +1,62 @@
+<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%>
+<%@ 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>
+	    <base target="_self"/>
+		<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.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">
+				     <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>
+					    </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"/>
+						    </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;
+						    </td>
+						</tr>
+					 </table>
+			</form>
+   </body>
+</html>

liuyanMana.jsp

@@ -0,0 +1,80 @@
+<%@ 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（id）-->
+						<input type="button" value="回复" onclick="liuyanHuifu(${liuyan.id })"/><!-- 执行liuyanHuifu（id）-->
+					</td>
+				</tr>
+			 </c:forEach>
+			</table>
+	</body>
+</html>

msg.jsp

@@ -0,0 +1,23 @@
+<%@ 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>
+	<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>
+      <div style="color: green;" align="left">${requestScope.msg}</div> <!-- 返回的request作用域里面的msg属性的值 -->
+  </body>
+</html>

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>

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>

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>

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>

orderMana.jsp

@@ -0,0 +1,121 @@
+<%@ 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，显示未受理，点击受理订单触发受理订单orderShouli（id）函数 --> 
+					         未受理&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（id）函数，来为用户进行消息回复，如几点过来取-->
+					</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>
+			<!-- 点击明细触发前面定义的订单明细orderDetail（id）-->		
+					<td><input value="查看用户" type="button" onclick="userDetail('${order.user_id}')"/></td> 
+			<!-- 点击查看用户触发前面定义的用户明细userDetail（id）-->
+					<td>
+					    <input type="button" onclick="orderDel(${order.id})" value="删除"/>
+					</td>
+				</tr>
+				</c:forEach>
+			</table>
+	</body>
+</html>

orm/TAdmin.java

@@ -0,0 +1,38 @@
+package com.itbaizhan.orm;
+
+public class TAdmin { // 管理员类
+
+	private int userId;   // 管理员用户ID
+	private String userName;  // 管理员用户名
+	private String userPw;  // 管理员密码
+
+	// 得到管理员用户名
+	public String getUserName() {
+		return userName;
+	}
+
+	// 设置管理员用户名
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	// 得到管理员密码
+	public String getUserPw() {
+		return userPw;
+	}
+
+	// 设置管理员密码
+	public void setUserPw(String userPw) {
+		this.userPw = userPw;
+	}
+
+	// 得到管理员用户ID
+	public int getUserId() {
+		return userId;
+	}
+
+	// 设置管理员用户ID
+	public void setUserId(int userId) {
+		this.userId = userId;
+	}
+}

orm/TLiuyan.java

@@ -0,0 +1,146 @@
+package com.itbaizhan.orm;
+
+/**
+ * TLiuyan - 留言实体类
+ *
+ * 这个类表示留言信息，包括留言的内容、留言时间、用户信息以及回复内容等。
+ * 该类通常用于留言板系统，存储和管理用户的留言和管理员的回复。
+ */
+public class TLiuyan implements java.io.Serializable {
+
+	private Integer id;         // 留言ID，唯一标识每一条留言
+	private String neirong;     // 留言内容，用户输入的留言文本
+	private String liuyanshi;   // 留言时间，记录用户留言的时间
+	private String user_id;     // 用户ID，标识留言所属的用户
+
+	private String huifu;       // 回复内容，管理员或用户对留言的回复
+	private String huifushi;    // 回复时间，记录回复的时间
+
+	private Tuser user;         // 用户信息，关联留言所属的用户对象（Tuser）
+
+	/**
+	 * 获取回复内容
+	 *
+	 * @return 回复内容
+	 */
+	public String getHuifu() {
+		return huifu;
+	}
+
+	/**
+	 * 设置回复内容
+	 *
+	 * @param huifu 回复内容
+	 */
+	public void setHuifu(String huifu) {
+		this.huifu = huifu;
+	}
+
+	/**
+	 * 获取回复时间
+	 *
+	 * @return 回复时间
+	 */
+	public String getHuifushi() {
+		return huifushi;
+	}
+
+	/**
+	 * 设置回复时间
+	 *
+	 * @param huifushi 回复时间
+	 */
+	public void setHuifushi(String huifushi) {
+		this.huifushi = huifushi;
+	}
+
+	/**
+	 * 获取留言ID
+	 *
+	 * @return 留言ID
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * 设置留言ID
+	 *
+	 * @param id 留言ID
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * 获取留言时间
+	 *
+	 * @return 留言时间
+	 */
+	public String getLiuyanshi() {
+		return liuyanshi;
+	}
+
+	/**
+	 * 设置留言时间
+	 *
+	 * @param liuyanshi 留言时间
+	 */
+	public void setLiuyanshi(String liuyanshi) {
+		this.liuyanshi = liuyanshi;
+	}
+
+	/**
+	 * 获取留言内容
+	 *
+	 * @return 留言内容
+	 */
+	public String getNeirong() {
+		return neirong;
+	}
+
+	/**
+	 * 设置留言内容
+	 *
+	 * @param neirong 留言内容
+	 */
+	public void setNeirong(String neirong) {
+		this.neirong = neirong;
+	}
+
+	/**
+	 * 获取留言所属用户信息
+	 *
+	 * @return 用户对象（Tuser）
+	 */
+	public Tuser getUser() {
+		return user;
+	}
+
+	/**
+	 * 设置留言所属用户信息
+	 *
+	 * @param user 用户对象（Tuser）
+	 */
+	public void setUser(Tuser user) {
+		this.user = user;
+	}
+
+	/**
+	 * 获取留言所属的用户ID
+	 *
+	 * @return 用户ID
+	 */
+	public String getUser_id() {
+		return user_id;
+	}
+
+	/**
+	 * 设置留言所属的用户ID
+	 *
+	 * @param user_id 用户ID
+	 */
+	public void setUser_id(String user_id) {
+		this.user_id = user_id;
+	}
+}

orm/Tcatelog.java

@@ -0,0 +1,34 @@
+package com.itbaizhan.orm;
+
+public class Tcatelog //菜品类别类
+{
+	private String id;//菜品类别ID
+	private String name;//菜品类别名称
+	private String del;//菜品类别是否删除标志
+	
+	public String getDel()//得到是否删除信息
+	{
+		return del;
+	}
+	public void setDel(String del)//设置是否删除信息
+	{
+		this.del = del;
+	}
+	public String getName()//得到菜品类别名信息
+	{
+		return name;
+	}
+	public void setName(String name)//设置菜品类别名信息
+	{
+		this.name = name;
+	}
+	public String getId()//得到菜品类别ID信息
+	{
+		return id;
+	}
+	public void setId(String id)//设置菜品类别ID信息
+	{
+		this.id = id;
+	}
+
+}

orm/Tgoods.java

@@ -0,0 +1,104 @@
+package com.itbaizhan.orm;
+
+public class Tgoods { // 菜品信息类
+
+	private String id;            // 菜品的ID
+	private String catelog_id;    // 菜品类别的ID
+	private String bianhao;      // 菜品的编号
+	private String mingcheng;    // 菜品的名称
+	private String jieshao;      // 菜品的介绍
+	private String fujian;       // 菜品的图片
+	private int shichangjia;     // 菜品的市场价
+	private int tejia;           // 菜品的特价
+	private String del;          // 菜品是否删除标志
+
+	// 获取菜品编号
+	public String getBianhao() {
+		return bianhao;
+	}
+
+	// 设置菜品编号
+	public void setBianhao(String bianhao) {
+		this.bianhao = bianhao;
+	}
+
+	// 获取菜品类别ID
+	public String getCatelog_id() {
+		return catelog_id;
+	}
+
+	// 设置菜品类别ID
+	public void setCatelog_id(String catelog_id) {
+		this.catelog_id = catelog_id;
+	}
+
+	// 获取菜品是否删除信息
+	public String getDel() {
+		return del;
+	}
+
+	// 设置菜品是否删除信息
+	public void setDel(String del) {
+		this.del = del;
+	}
+
+	// 获取菜品图片信息
+	public String getFujian() {
+		return fujian;
+	}
+
+	// 设置菜品图片信息
+	public void setFujian(String fujian) {
+		this.fujian = fujian;
+	}
+
+	// 获取菜品ID信息
+	public String getId() {
+		return id;
+	}
+
+	// 设置菜品ID信息
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	// 获取菜品介绍信息
+	public String getJieshao() {
+		return jieshao;
+	}
+
+	// 设置菜品介绍信息
+	public void setJieshao(String jieshao) {
+		this.jieshao = jieshao;
+	}
+
+	// 获取菜品名称信息
+	public String getMingcheng() {
+		return mingcheng;
+	}
+
+	// 设置菜品名称信息
+	public void setMingcheng(String mingcheng) {
+		this.mingcheng = mingcheng;
+	}
+
+	// 获取菜品市场价信息
+	public int getShichangjia() {
+		return shichangjia;
+	}
+
+	// 设置菜品市场价信息
+	public void setShichangjia(int shichangjia) {
+		this.shichangjia = shichangjia;
+	}
+
+	// 获取菜品特价信息
+	public int getTejia() {
+		return tejia;
+	}
+
+	// 设置菜品特价信息
+	public void setTejia(int tejia) {
+		this.tejia = tejia;
+	}
+}

orm/Torder.java

@@ -0,0 +1,186 @@
+package com.itbaizhan.orm;
+
+/**
+ * Torder - 订单实体类
+ *
+ * 该类表示一个订单对象，包含订单的各种信息，如订单编号、下单时间、订单状态、用户信息、付款方式等。
+ * 订单通常用于在线购物系统、餐饮服务系统等场景中，存储并管理与用户订单相关的各项数据。
+ */
+public class Torder implements java.io.Serializable {
+
+	private String id;             // 订单ID，唯一标识每一个订单
+	private String bianhao;        // 订单编号，订单的唯一标识符（通常为系统自动生成）
+	private String shijian;        // 下单时间，用户创建订单的时间
+	private String zhuangtai;      // 订单状态，例如：待支付、已支付、已发货、已完成、已取消等
+	private String huifu;          // 回复内容，可能用于管理员对订单的反馈或备注
+	private String songhuodizhi;   // 送货地址，用户填写的送货地址
+	private String fukuanfangshi;  // 付款方式，例如：信用卡、支付宝、现金等
+	private int jine = 0;          // 总金额，订单的总费用
+	private String user_id;        // 用户ID，表示该订单所属的用户
+
+	/** 默认构造函数 */
+	public Torder() {
+	}
+
+	/**
+	 * 获取订单编号
+	 *
+	 * @return 订单编号
+	 */
+	public String getBianhao() {
+		return bianhao;
+	}
+
+	/**
+	 * 设置订单编号
+	 *
+	 * @param bianhao 订单编号
+	 */
+	public void setBianhao(String bianhao) {
+		this.bianhao = bianhao;
+	}
+
+	/**
+	 * 获取付款方式
+	 *
+	 * @return 付款方式（如：支付宝、信用卡等）
+	 */
+	public String getFukuanfangshi() {
+		return fukuanfangshi;
+	}
+
+	/**
+	 * 设置付款方式
+	 *
+	 * @param fukuanfangshi 付款方式（如：支付宝、信用卡等）
+	 */
+	public void setFukuanfangshi(String fukuanfangshi) {
+		this.fukuanfangshi = fukuanfangshi;
+	}
+
+	/**
+	 * 获取订单ID
+	 *
+	 * @return 订单ID
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * 设置订单ID
+	 *
+	 * @param id 订单ID
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * 获取订单的总金额
+	 *
+	 * @return 订单总金额
+	 */
+	public int getJine() {
+		return jine;
+	}
+
+	/**
+	 * 获取订单的回复内容（例如管理员的备注或处理结果）
+	 *
+	 * @return 回复内容
+	 */
+	public String getHuifu() {
+		return huifu;
+	}
+
+	/**
+	 * 设置订单的回复内容
+	 *
+	 * @param huifu 回复内容
+	 */
+	public void setHuifu(String huifu) {
+		this.huifu = huifu;
+	}
+
+	/**
+	 * 设置订单的总金额
+	 *
+	 * @param jine 订单总金额
+	 */
+	public void setJine(int jine) {
+		this.jine = jine;
+	}
+
+	/**
+	 * 获取订单的下单时间
+	 *
+	 * @return 订单下单时间（通常为日期时间字符串）
+	 */
+	public String getShijian() {
+		return shijian;
+	}
+
+	/**
+	 * 设置订单的下单时间
+	 *
+	 * @param shijian 订单下单时间（通常为日期时间字符串）
+	 */
+	public void setShijian(String shijian) {
+		this.shijian = shijian;
+	}
+
+	/**
+	 * 获取订单的送货地址
+	 *
+	 * @return 送货地址
+	 */
+	public String getSonghuodizhi() {
+		return songhuodizhi;
+	}
+
+	/**
+	 * 设置订单的送货地址
+	 *
+	 * @param songhuodizhi 送货地址
+	 */
+	public void setSonghuodizhi(String songhuodizhi) {
+		this.songhuodizhi = songhuodizhi;
+	}
+
+	/**
+	 * 获取订单所属用户的ID
+	 *
+	 * @return 用户ID
+	 */
+	public String getUser_id() {
+		return user_id;
+	}
+
+	/**
+	 * 设置订单所属用户的ID
+	 *
+	 * @param user_id 用户ID
+	 */
+	public void setUser_id(String user_id) {
+		this.user_id = user_id;
+	}
+
+	/**
+	 * 获取订单的状态
+	 *
+	 * @return 订单状态（例如：待支付、已支付、已发货等）
+	 */
+	public String getZhuangtai() {
+		return zhuangtai;
+	}
+
+	/**
+	 * 设置订单的状态
+	 *
+	 * @param zhuangtai 订单状态（例如：待支付、已支付、已发货等）
+	 */
+	public void setZhuangtai(String zhuangtai) {
+		this.zhuangtai = zhuangtai;
+	}
+}

orm/TorderItem.java

@@ -0,0 +1,107 @@
+package com.itbaizhan.orm;
+
+/**
+ * TorderItem - 订单明细实体类
+ *
+ * 该类表示一个订单中的具体商品项，用于记录每个商品在订单中的明细信息，包括商品ID、商品数量、所属订单ID等。
+ * 订单明细通常用于记录订单中包含的所有商品及其数量等信息，是订单和商品之间的关联。
+ */
+public class TorderItem {
+
+	private String id;             // 订单明细ID，唯一标识每个订单明细项
+	private String order_id;       // 订单ID，表示该订单明细项所属的订单
+	private String goods_id;       // 商品ID，表示该明细项对应的商品
+	private int goods_quantity;    // 商品数量，表示该商品在该订单中的数量
+
+	private Tgoods goods;          // 商品对象，关联商品详细信息（额外的字段）
+
+	/**
+	 * 获取商品数量
+	 *
+	 * @return 商品数量
+	 */
+	public int getGoods_quantity() {
+		return goods_quantity;
+	}
+
+	/**
+	 * 设置商品数量
+	 *
+	 * @param goods_quantity 商品数量
+	 */
+	public void setGoods_quantity(int goods_quantity) {
+		this.goods_quantity = goods_quantity;
+	}
+
+	/**
+	 * 获取商品ID
+	 *
+	 * @return 商品ID
+	 */
+	public String getGoods_id() {
+		return goods_id;
+	}
+
+	/**
+	 * 设置商品ID
+	 *
+	 * @param goods_id 商品ID
+	 */
+	public void setGoods_id(String goods_id) {
+		this.goods_id = goods_id;
+	}
+
+	/**
+	 * 获取订单明细ID
+	 *
+	 * @return 订单明细ID
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * 设置订单明细ID
+	 *
+	 * @param id 订单明细ID
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * 获取订单ID
+	 *
+	 * @return 订单ID
+	 */
+	public String getOrder_id() {
+		return order_id;
+	}
+
+	/**
+	 * 设置订单ID
+	 *
+	 * @param order_id 订单ID
+	 */
+	public void setOrder_id(String order_id) {
+		this.order_id = order_id;
+	}
+
+	/**
+	 * 获取商品对象（详细信息）
+	 *
+	 * @return 商品对象
+	 */
+	public Tgoods getGoods() {
+		return goods;
+	}
+
+	/**
+	 * 设置商品对象（详细信息）
+	 *
+	 * @param goods 商品对象
+	 */
+	public void setGoods(Tgoods goods) {
+		this.goods = goods;
+	}
+}

orm/Tuser.java

@@ -0,0 +1,106 @@
+package com.itbaizhan.orm;
+
+/**
+ * Tuser - 用户实体类
+ *
+ * 该类表示系统中的用户信息，通常用于存储用户的基本信息，例如登录账号、密码、姓名等。
+ * 该类的字段和方法主要用于用户的管理和身份验证。
+ */
+public class Tuser {
+
+	private String id;         // 用户ID，唯一标识每个用户
+	private String loginname;  // 用户登录账号，用户用于登录系统的唯一账号
+	private String loginpw;    // 用户登录密码，用户登录系统时输入的密码
+	private String name;       // 用户姓名，用户的真实姓名或显示名
+	private String del;        // 是否删除标志，表示用户是否已被删除或禁用（逻辑删除）
+
+	/**
+	 * 获取用户ID
+	 *
+	 * @return 用户ID
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * 设置用户ID
+	 *
+	 * @param id 用户ID
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * 获取用户登录账号
+	 *
+	 * @return 用户登录账号
+	 */
+	public String getLoginname() {
+		return loginname;
+	}
+
+	/**
+	 * 设置用户登录账号
+	 *
+	 * @param loginname 用户登录账号
+	 */
+	public void setLoginname(String loginname) {
+		this.loginname = loginname;
+	}
+
+	/**
+	 * 获取用户登录密码
+	 *
+	 * @return 用户登录密码
+	 */
+	public String getLoginpw() {
+		return loginpw;
+	}
+
+	/**
+	 * 设置用户登录密码
+	 *
+	 * @param loginpw 用户登录密码
+	 */
+	public void setLoginpw(String loginpw) {
+		this.loginpw = loginpw;
+	}
+
+	/**
+	 * 获取用户是否删除标志
+	 *
+	 * @return 是否删除标志
+	 */
+	public String getDel() {
+		return del;
+	}
+
+	/**
+	 * 设置用户是否删除标志
+	 *
+	 * @param del 是否删除标志
+	 */
+	public void setDel(String del) {
+		this.del = del;
+	}
+
+	/**
+	 * 获取用户姓名
+	 *
+	 * @return 用户姓名
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * 设置用户姓名
+	 *
+	 * @param name 用户姓名
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+}

orm/Txinyong.java

@@ -0,0 +1,105 @@
+package com.itbaizhan.orm;
+
+/**
+ * Txinyong - 信用评价实体类
+ *
+ * 该类用于表示管理员对用户的信用评价。系统中，管理员可以根据用户的行为或表现给用户进行信用评分或评价。该类包括了评价的基本信息，如评价ID、评价属性、评价内容、评价时间以及用户ID等。
+ */
+public class Txinyong {
+
+	private String id;        // 评价ID，唯一标识每条评价
+	private String shuxing;   // 评价属性，管理员根据不同的标准对用户进行评价的属性（如信用、表现等）
+	private String neirong;   // 评价内容，具体的评价文字或描述
+	private String shijian;   // 评价时间，管理员进行评价的时间
+	private String user_id;   // 用户ID，标识被评价的用户
+
+	/**
+	 * 获取评价ID
+	 *
+	 * @return 评价ID
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * 设置评价ID
+	 *
+	 * @param id 评价ID
+	 */
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	/**
+	 * 获取评价属性
+	 *
+	 * @return 评价属性
+	 */
+	public String getShuxing() {
+		return shuxing;
+	}
+
+	/**
+	 * 设置评价属性
+	 *
+	 * @param shuxing 评价属性
+	 */
+	public void setShuxing(String shuxing) {
+		this.shuxing = shuxing;
+	}
+
+	/**
+	 * 获取评价内容
+	 *
+	 * @return 评价内容
+	 */
+	public String getNeirong() {
+		return neirong;
+	}
+
+	/**
+	 * 设置评价内容
+	 *
+	 * @param neirong 评价内容
+	 */
+	public void setNeirong(String neirong) {
+		this.neirong = neirong;
+	}
+
+	/**
+	 * 获取评价时间
+	 *
+	 * @return 评价时间
+	 */
+	public String getShijian() {
+		return shijian;
+	}
+
+	/**
+	 * 设置评价时间
+	 *
+	 * @param shijian 评价时间
+	 */
+	public void setShijian(String shijian) {
+		this.shijian = shijian;
+	}
+
+	/**
+	 * 获取用户ID
+	 *
+	 * @return 用户ID
+	 */
+	public String getUser_id() {
+		return user_id;
+	}
+
+	/**
+	 * 设置用户ID
+	 *
+	 * @param user_id 用户ID
+	 */
+	public void setUser_id(String user_id) {
+		this.user_id = user_id;
+	}
+}

qiantai.css

@@ -0,0 +1,748 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> remotes/origin/wyp_branch
+/*
+Design by Free CSS Templates
+http://www.freecsstemplates.org
+Released for free under a Creative Commons Attribution 2.5 License
+*/
+
+<<<<<<< HEAD
+/* Body <20>瑕<EFBFBD> */
+body {
+    margin: 0; /* <20>駁膄憭𤥁器頝<E599A8> */
+    padding: 0; /* <20>駁膄<E9A781><E88684>器頝<E599A8> */
+    background: url(/dingcan/images/img01.jpg) repeat-x left top; /* 霈曄蔭<E69B84>峕艶<E5B395>曄<EFBFBD>撟嗉悟<E59789>嗅銁璅芸<E79285>銝𠰴像<F0A0B0B4><E5838F> */
+    font-family: Arial, Helvetica, sans-serif; /* 霈曄蔭摮𦯀<E691AE>銝態rial<61><6C>elvetica<63>騯ans-serif */
+    font-size: 12px; /* 霈曄蔭摮𦯀<E691AE>憭批<E686AD>銝<EFBFBD>12px */
+    color: #66665E; /* 霈曄蔭摮𦯀<E691AE>憸𡏭𠧧銝箸<E98A9D><E7AEB8>啗𠧧 */
+}
+
+/* <20><><EFBFBD><EFBFBD>瑕<EFBFBD>嚗á1, h2, h3嚗<33> */
+h1, h2, h3 {
+    margin: 0; /* <20>駁膄憭𤥁器頝<E599A8> */
+    text-transform: uppercase; /* 撠<><E692A0>摮𡑒蓮<F0A19192>Ｖ蛹憭批<E686AD> */
+    font-family: "Trebuchet MS", Georgia, "Times New Roman", Times, serif; /* 霈曄蔭摮𦯀<E691AE>蝟餃<E89D9F> */
+    font-weight: normal; /* 霈曄蔭摮𦯀<E691AE><F0A6AF80>漤<EFBFBD>銝箸迤撣<E8BFA4> */
+    color: #0C95C9; /* 霈曄蔭摮𦯀<E691AE>憸𡏭𠧧銝箄<E98A9D><E7AE84><EFBFBD> */
+}
+
+/* <20><>漣<EFBFBD><E6BCA3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>雿枏之撠<E4B98B> */
+h1 { font-size: 44px; } /* h1<68><31><EFBFBD>霈曄蔭銝<E894AD>44px */
+h2 { font-size: 18px; } /* h2<68><32><EFBFBD>霈曄蔭銝<E894AD>18px */
+
+/* 畾菔氜<E88F94><E6B09C><EFBFBD>摨誩<E691A8>銵典<E98AB5><E585B8>匧<EFBFBD><E58CA7>𡑒”<F0A19192><E2809D>甅撘<E79485> */
+p, ul, ol {
+    margin-top: 0; /* <20>駁膄銝𡃏器頝<E599A8> */
+    line-height: 240%; /* 霈曄蔭銵屸<E98AB5>銝<EFBFBD>240% */
+    text-align: justify; /* 霈曄蔭<E69B84><E894AD>𧋦撖寥<E69296>銝箔舅蝡臬笆朣<E7AC86> */
+}
+
+ul, ol { } /* <20>删鸌摰𡁏甅撘<E79485> */
+
+/* 撘閧鍂<E996A7>瑕<EFBFBD> */
+blockquote { }
+
+/* <20>暹𦻖<E69AB9><F0A6BB96>甅撘<E79485> */
+a { color: #0C95C9; } /* 霈曄蔭<E69B84>暹𦻖<E69AB9><F0A6BB96><EFBFBD>摮烾<E691AE><E783BE>脖蛹<E88496>肽𠧧 */
+a:hover { text-decoration: none; } /* 曌䭾<E69B8C><E4ADBE>砍<EFBFBD><E7A08D>嗅縧<E59785>支<EFBFBD><E694AF>垍瑪 */
+a img { border: none; } /* <20>駁膄<E9A781>曄<EFBFBD>颲寞<E9A2B2> */
+
+/* <20>曄<EFBFBD>瘚桀𢆡<E6A180>瑕<EFBFBD> */
+img.left {
+    float: left; /* <20>曄<EFBFBD>瘚桀𢆡<E6A180>啣椰靘<E6A4B0> */
+    margin: 7px 30px 0 0; /* 霈曄蔭<E69B84>曄<EFBFBD><E69B84><EFBFBD><EFBFBD>颲寡<E9A2B2> */
+}
+
+img.right {
+    float: right; /* <20>曄<EFBFBD>瘚桀𢆡<E6A180>啣𢰧靘<F0A2B0A7> */
+    margin: 7px 0 0 30px; /* 霈曄蔭<E69B84>曄<EFBFBD><E69B84><EFBFBD><EFBFBD>颲寡<E9A2B2> */
+}
+
+/* <20>鞱<EFBFBD>瘞游像<E6B8B8><E5838F><EFBFBD>蝥<EFBFBD> */
+hr { display: none; }
+
+/* <20>𡑒”1<E2809D><31>甅撘<E79485> */
+.list1 { }
+
+.list1 li {
+    float: left; /* <20>𡑒”憿寞筑<E5AF9E>典<EFBFBD>撌虫儒 */
+    line-height: normal;
+}
+
+.list1 li img {
+    margin: 0 30px 30px 0; /* 霈曄蔭<E69B84>曄<EFBFBD><E69B84><EFBFBD><EFBFBD>颲寡<E9A2B2> */
+}
+
+.list1 li.alt img {
+    margin-right: 0; /* alt蝐餃<E89D90>銵券★<E588B8>唾器頝肽挽蝵桐蛹0 */
+}
+
+#wrapper { }
+
+/* Header <20>瑕<EFBFBD> */
+
+/* 憭湧<E686AD>摰孵膥 */
+#header-wrapper { }
+
+/* 憭湧<E686AD><E6B9A7>瑕<EFBFBD> */
+#header {
+    width: 920px; /* 霈曄蔭憭湧<E686AD><E6B9A7><EFBFBD>捐摨虫蛹920px */
+    height: 45px; /* 霈曄蔭憭湧<E686AD><E6B9A7><EFBFBD><EFBFBD>摨虫蛹45px */
+    margin: 0 auto; /* 瘞游像撅<E5838F>葉 */
+}
+
+/* <20>𨅯<EFBFBD><F0A885AF>典<EFBFBD><E585B8>瑕<EFBFBD> */
+#menu {
+    float: left; /* <20>𨅯<EFBFBD>瘚桀𢆡<E6A180>啣椰靘<E6A4B0> */
+    width: 540px; /* 霈曄蔭<E69B84>𨅯<EFBFBD><F0A885AF><EFBFBD>捐摨虫蛹540px */
+    height: 45px; /* 霈曄蔭<E69B84>𨅯<EFBFBD><F0A885AF><EFBFBD><EFBFBD>摨虫蛹45px */
+}
+
+#menu ul {
+    margin: 0;
+    padding: 10px 0px 0px 5px; /* 霈曄蔭<E69B84><E894AD>器頝<E599A8> */
+    list-style: none; /* <20>駁膄<E9A781>𡑒”憿寧<E686BF>暺䁅恕<E48185>瑕<EFBFBD> */
+    line-height: normal;
+}
+
+#menu li {
+    display: block;
+    float: left; /* <20>𡑒”憿寞筑<E5AF9E>典<EFBFBD>撌虫儒 */
+}
+
+#menu a {
+    display: block;
+    float: left; /* <20>暹𦻖瘚桀𢆡<E6A180>啣椰靘<E6A4B0> */
+    margin-right: 3px;
+    padding: 3px 8px 2px 8px; /* 霈曄蔭<E69B84>暹𦻖<E69AB9><F0A6BB96>器頝<E599A8> */
+    text-decoration: none; /* <20>駁膄銝见<E98A9D>蝥<EFBFBD> */
+    text-transform: capitalize; /* 撠<><E692A0>摮烾<E691AE>摮埈<E691AE>憭批<E686AD> */
+    font-family: Arial, Helvetica, sans-serif; /* 霈曄蔭摮𦯀<E691AE>蝟餃<E89D9F> */
+    font-size: 12px; /* 霈曄蔭摮𦯀<E691AE>憭批<E686AD>銝<EFBFBD>12px */
+    color: #FFFFFF; /* 霈曄蔭摮𦯀<E691AE>憸𡏭𠧧銝箇蒾<E7AE87><E892BE> */
+}
+
+#menu a:hover { text-decoration: underline; } /* 曌䭾<E69B8C><E4ADBE>砍<EFBFBD><E7A08D>嗆遬蝷箔<E89DB7><E7AE94>垍瑪 */
+
+#menu .current_page_item a {
+    height: 20px;
+    background: #FEC200 url(/dingcan/images/img02.jpg) repeat-x left top; /* 霈曄蔭敶枏<E695B6>憿菟𢒰憿寧<E686BF><E5AFA7>峕艶憸𡏭𠧧<F0A18FAD><F0A0A7A7>㦛<EFBFBD><E3A69B> */
+    color: #FFFFFF; /* 霈曄蔭摮𦯀<E691AE>憸𡏭𠧧銝箇蒾<E7AE87><E892BE> */
+}
+
+#menu .first {
+    background: none; /* 蝚砌<E89D9A>銝芾<E98A9D><E88ABE>閖★<E99696>㰘<EFBFBD><E3B098><EFBFBD> */
+}
+
+/* <20>𦦵揣獢<E68FA3>甅撘<E79485> */
+#search {
+    float: right; /* <20>𦦵揣獢<E68FA3>筑<EFBFBD>典<EFBFBD><E585B8>喃儒 */
+    width: 305px; /* 霈曄蔭<E69B84>𦦵揣獢<E68FA3><E78DA2>摰賢漲 */
+    height: 45px; /* 霈曄蔭<E69B84>𦦵揣獢<E68FA3><E78DA2>擃睃漲 */
+}
+
+#search form {
+    float: right; /* 銵典<E98AB5>瘚桀𢆡<E6A180>啣𢰧靘<F0A2B0A7> */
+    margin: 0;
+    padding: 12px 30px 0 0;
+}
+
+#search fieldset {
+    margin: 0;
+    padding: 0;
+    border: none; /* <20>駁膄fieldset<65><74>器獢<E599A8> */
+}
+
+#search input {
+    float: left; /* 颲枏<E9A2B2>獢<EFBFBD>筑<EFBFBD>典<EFBFBD>撌虫儒 */
+    font: 12px Georgia, "Times New Roman", Times, serif;
+    border: none; /* <20>駁膄颲寞<E9A2B2> */
+}
+
+#search-text {
+    width: 135px; /* 霈曄蔭颲枏<E9A2B2>獢<EFBFBD>捐摨<E68D90> */
+    height: 18px; /* 霈曄蔭擃睃漲 */
+    padding: 3px 0 0 5px; /* 霈曄蔭<E69B84><E894AD>器頝<E599A8> */
+    border: 1px solid #333333; /* 霈曄蔭颲寞<E9A2B2> */
+    background: #ECF9E4; /* 霈曄蔭<E69B84>峕艶<E5B395><E889B6> */
+    color: #000000; /* 霈曄蔭摮𦯀<E691AE>憸𡏭𠧧 */
+}
+
+#search-submit {
+    height: 21px; /* 霈曄蔭<E69B84>𣂷漱<F0A382B7>厰僼擃睃漲 */
+    margin-left: 10px; /* 霈曄蔭撌西器頝<E599A8> */
+    padding: 0px 5px; /* 霈曄蔭<E69B84><E894AD>器頝<E599A8> */
+    background: #000000; /* 霈曄蔭<E69B84>峕艶<E5B395>脖蛹暺𤏸𠧧 */
+    color: #FFFFFF; /* 霈曄蔭摮𦯀<E691AE>憸𡏭𠧧銝箇蒾<E7AE87><E892BE> */
+}
+
+/* Page<67>瑕<EFBFBD> */
+#page {
+    width: 920px; /* 霈曄蔭憿菟𢒰摰賢漲銝<E6BCB2>920px */
+    margin: 0 auto; /* 憿菟𢒰撅<F0A292B0>葉<EFBFBD>曄內 */
+}
+
+#page-bgtop {
+    padding-top: 30px; /* 霈曄蔭憿園<E686BF><E59C92><EFBFBD>器頝<E599A8> */
+}
+
+/* LOGO<47>典<EFBFBD><E585B8>瑕<EFBFBD> */
+#logo {
+    width: 860px; /* 霈曄蔭LOGO<47><4F>捐摨<E68D90> */
+    height: 134px; /* 霈曄蔭LOGO<47><4F><EFBFBD>摨<EFBFBD> */
+    margin: 0 auto; /* LOGO撅<4F>葉 */
+    background: url(/dingcan/images/img04.jpg) no-repeat right top; /* 霈曄蔭LOGO<47><4F><EFBFBD><EFBFBD>臬㦛<E887AC><E3A69B> */
+}
+
+#logo h1, #logo p {
+    margin: 0px;
+    line-height: normal;
+    text-transform: lowercase;
+    font-weight: normal;
+    color: #FFFFFF; /* 霈曄蔭LOGO<47><4F><EFBFBD><EFBFBD>峕<EFBFBD><E5B395>祉<EFBFBD>憸𡏭𠧧銝箇蒾<E7AE87><E892BE> */
+}
+
+#logo p {
+    text-transform: lowercase; /* 霈曄蔭<E69B84><E894AD>𧋦銝箏<E98A9D><E7AE8F><EFBFBD> */
+    font-size: 10px; /* 霈曄蔭摮𦯀<E691AE>憭批<E686AD> */
+}
+
+#logo h1 {
+    padding-top: 54px; /* 霈曄蔭LOGO<47><4F><EFBFBD><EFBFBD><EFBFBD>▲<EFBFBD>典<EFBFBD>颲寡<E9A2B2> */
+    font-size: 34px; /* 霈曄蔭LOGO<47><4F><EFBFBD><EFBFBD><EFBFBD><EFBFBD>雿枏之撠<E4B98B> */
+}
+
+#logo a {
+    text-decoration: none; /* <20>駁膄<E9A781>暹𦻖銝见<E98A9D>蝥<EFBFBD> */
+    color: #FFFFFF; /* 霈曄蔭<E69B84>暹𦻖憸𡏭𠧧銝箇蒾<E7AE87><E892BE> */
+}
+
+/* Content<6E>典<EFBFBD><E585B8>瑕<EFBFBD> */
+#content {
+    float: right; /* <20><>捆瘚桀𢆡<E6A180>啣𢰧靘<F0A2B0A7> */
+    width: 658px; /* 霈曄蔭<E69B84><E894AD>捆<EFBFBD>箏<EFBFBD><E7AE8F><EFBFBD>捐摨<E68D90> */
+    padding-top: 10px; /* 霈曄蔭憿園<E686BF><E59C92><EFBFBD>器頝<E599A8> */
+    padding-right: 30px; /* 霈曄蔭<E69B84>喃儒<E59683><E58492>器頝<E599A8> */
+}
+
+/* Post<73>典<EFBFBD><E585B8>瑕<EFBFBD> */
+.post {
+    background: url(/dingcan/images/img07.jpg) repeat-x left bottom; /* 霈曄蔭<E69B84>峕艶<E5B395>曄<EFBFBD> */
+    margin-bottom: 25px; /* 霈曄蔭摨閖<E691A8>憭𤥁器頝<E599A8> */
+}
+
+.post .title {
+    height: 30px;
+    color: #549900; /* 霈曄蔭<E69B84><E894AD><EFBFBD>憸𡏭𠧧銝箇遛<E7AE87><E9819B> */
+}
+
+.post .title a {
+    text-decoration: none; /* <20>駁膄<E9A781><E88684><EFBFBD><EFBFBD>暹𦻖銝见<E98A9D>蝥<EFBFBD> */
+    color: #585D60; /* 霈曄蔭<E69B84><E894AD><EFBFBD><EFBFBD>暹𦻖憸𡏭𠧧 */
+}
+
+.post .date { }
+
+.post .meta {
+    margin-top: -10px; /* 霈曄蔭meta<74>典<EFBFBD><E585B8><EFBFBD><EFBFBD>憭𤥁器頝<E599A8> */
+    padding: 2px 30px 2px 16px;
+    background: url(/dingcan/images/img03.gif) no-repeat left 8px; /* 霈曄蔭<E69B84>峕艶 */
+    font-family: Arial, Helvetica, sans-serif;
+    font-weight: normal;
+    font-size: 10px;
+    color: #66665E; /* 霈曄蔭meta摮𦯀<E691AE>憸𡏭𠧧 */
+}
+
+.post .meta span {
+    display: block; /* 霈曄蔭meta span銝箏<E98A9D>蝥批<E89DA5>蝝<EFBFBD> */
+    margin-top: -10px; /* 霈曄蔭銝𠰴<E98A9D>颲寡<E9A2B2> */
+}
+
+.post .entry {
+    padding: 10px 0; /* 霈曄蔭<E69B84>∠𤌍<E288A0><F0A48C8D>捆<EFBFBD><E68D86><EFBFBD>颲寡<E9A2B2> */
+}
+
+/* Sidebar<61>典<EFBFBD><E585B8>瑕<EFBFBD> */
+#sidebar {
+    float: left; /* 靘扯器<E689AF>𤩺筑<F0A4A9BA>典<EFBFBD>撌虫儒 */
+    width: 177px; /* 霈曄蔭靘扯器<E689AF>誩捐摨<E68D90> */
+    padding-left: 22px; /* 霈曄蔭撌血<E6928C>颲寡<E9A2B2> */
+    font-family: Arial, Helvetica, sans-serif; /* 霈曄蔭摮𦯀<E691AE> */
+    font-size: 11px; /* 霈曄蔭摮𦯀<E691AE>憭批<E686AD> */
+    color: #585D60; /* 霈曄蔭摮𦯀<E691AE>憸𡏭𠧧 */
+}
+
+#sidebar ul {
+    margin: 0;
+    padding: 0;
+    list-style: none; /* <20>駁膄暺䁅恕<E48185>𡑒”<F0A19192>瑕<EFBFBD> */
+    line-height: normal;
+}
+
+#sidebar li {
+    margin-bottom: 30px; /* 霈曄蔭<E69B84>𡑒”憿孵<E686BF><E5ADB5>典<EFBFBD>颲寡<E9A2B2> */
+    padding: 0 0 10px 0px;
+}
+
+#sidebar p {
+    margin: 0; /* <20>駁膄畾菔氜<E88F94><E6B09C><EFBFBD>颲寡<E9A2B2> */
+    padding: 0px 10px; /* 霈曄蔭<E69B84><E894AD>器頝<E599A8> */
+}
+
+#sidebar h2 {
+    height: 26px;
+    margin: 0 0 10px 0px;
+    padding: 12px 0 2px 7px; /* 霈曄蔭<E69B84><E894AD>器頝<E599A8> */
+    text-transform: capitalize; /* 霈曄蔭擐硋<E69390>瘥滚之<E6BB9A><E4B98B> */
+    font-size: 18px; /* 霈曄蔭摮𦯀<E691AE>憭批<E686AD> */
+    font-weight: normal;
+    color: #464F54; /* 霈曄蔭摮𦯀<E691AE>憸𡏭𠧧 */
+}
+
+/* Footer <20>瑕<EFBFBD> */
+#footer {
+    width: 920px; /* 霈曄蔭憿菔<E686BF>摰賢漲 */
+    height: 49px; /* 霈曄蔭憿菔<E686BF>擃睃漲 */
+    margin: 0 auto; /* 憿菔<E686BF>撅<EFBFBD>葉<EFBFBD>曄內 */
+    padding-top: 50px; /* 霈曄蔭憿菔<E686BF>憿園<E686BF><E59C92><EFBFBD>器頝<E599A8> */
+}
+
+#footer-bgcontent {
+    margin: 0px;
+    padding: 0px;
+    height: 99px; /* 霈曄蔭憿菔<E686BF><E88F94><EFBFBD>捆<EFBFBD><E68D86><EFBFBD>摨<EFBFBD> */
+    background: #394144; /* 霈曄蔭<E69B84>峕艶<E5B395><E889B6> */
+}
+
+#footer p {
+    margin: 0;
+    text-align: center; /* 霈曄蔭<E69B84><E894AD>𧋦撅<F0A78BA6>葉 */
+    line-height: normal;
+    text-transform: uppercase; /* 霈曄蔭<E69B84><E894AD><EFBFBD>憭批<E686AD> */
+    font-size: 10px; /* 霈曄蔭摮𦯀<E691AE>憭批<E686AD> */
+    color: #FFFFFF; /* 霈曄蔭摮𦯀<E691AE>憸𡏭𠧧 */
+}
+
+#footer a {
+    color: #E5FFC4; /* 霈曄蔭<E69B84>暹𦻖憸𡏭𠧧 */
+=======
+body {
+	margin: 0;
+	padding: 0;
+	background: url(/dingcan/images/img01.jpg) repeat-x left top;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #66665E;
+}
+
+h1, h2, h3 {
+	margin: 0;
+	text-transform: uppercase;
+	font-family: "Trebuchet MS", Georgia, "Times New Roman", Times, serif;
+	font-weight: normal;
+	color: #0C95C9;
+}
+
+h1 { font-size: 44px; }
+
+h2 { font-size: 18px; }
+
+h3 { }
+
+p, ul, ol {
+	margin-top: 0;
+	line-height: 240%;
+	text-align: justify;
+}
+
+ul, ol { }
+
+blockquote { }
+
+a { color: #0C95C9; }
+
+a:hover { text-decoration: none; }
+
+a img {
+	border: none;
+}
+
+img.left {
+	float: left;
+	margin: 7px 30px 0 0;
+}
+
+img.right {
+	float: right;
+	margin: 7px 0 0 30px;
+}
+
+hr { display: none; }
+
+.list1 {
+}
+
+.list1 li {
+	float: left;
+	line-height: normal;
+}
+
+.list1 li img {
+	margin: 0 30px 30px 0;
+}
+
+.list1 li.alt img {
+	margin-right: 0;
+}
+
+#wrapper {
+}
+
+/* Header */
+
+#header-wrapper {
+}
+
+#header {
+	width: 920px;
+	height: 45px;
+	margin: 0 auto;
+}
+
+/* Menu */
+
+#menu {
+	float: left;
+	width: 540px;
+	height: 45px;
+}
+
+#menu ul {
+	margin: 0;
+	padding: 10px 0px 0px 5px;
+	list-style: none;
+	line-height: normal;
+}
+
+#menu li {
+	display: block;
+	float: left;
+}
+
+#menu a {
+	display: block;
+	float: left;
+	margin-right: 3px;
+	padding: 3px 8px 2px 8px;
+	text-decoration: none;
+	text-transform: capitalize;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #FFFFFF;
+}
+
+#menu a:hover { text-decoration: underline; }
+
+#menu .current_page_item a {
+	height: 20px;
+	background: #FEC200 url(/dingcan/images/img02.jpg) repeat-x left top;
+	color: #FFFFFF;
+}
+
+#menu .first {
+	background: none;
+}
+/* Search */
+
+#search {
+	float: right;
+	width: 305px;
+	height: 45px;
+}
+
+#search form {
+	float: right;
+	margin: 0;
+	padding: 12px 30px 0 0;
+}
+
+#search fieldset {
+	margin: 0;
+	padding: 0;
+	border: none;
+}
+
+#search input {
+	float: left;
+	font: 12px Georgia, "Times New Roman", Times, serif;
+	border: none;
+}
+
+#search-text {
+	width: 135px;
+	height: 18px;
+	padding: 3px 0 0 5px;
+	border: 1px solid #333333;
+	background: #ECF9E4;
+	color: #000000;
+}
+
+#search-submit {
+	height: 21px;
+	margin-left: 10px;
+	padding: 0px 5px;
+	background: #000000;
+	color: #FFFFFF;
+}
+
+/* Page */
+
+#page {
+	width: 920px;
+	margin: 0 auto;
+}
+
+#page-bgtop {
+	padding-top: 30px;
+}
+
+	/** LOGO */
+
+#logo {
+	width: 860px;
+	height: 134px;
+	margin: 0 auto;
+	background: url(/dingcan/images/img04.jpg) no-repeat right top;
+}
+
+#logo h1, #logo p {
+	margin: 0px;
+	line-height: normal;
+	text-transform: lowercase;
+	font-weight: normal;
+	color: #FFFFFF;
+}
+
+#logo p {
+	text-transform: lowercase;
+	font-size: 10px;
+}
+
+#logo h1 {
+	padding-top: 54px;
+	font-size: 34px;
+}
+
+#logo a {
+	text-decoration: none;
+	color: #FFFFFF;
+}
+
+/* Content */
+
+#content {
+	float: right;
+	width: 658px;
+	padding-top: 10px;
+	padding-right: 30px;
+}
+
+/* 楷冞 */
+
+.post {
+	background: url(/dingcan/images/img07.jpg) repeat-x left bottom;
+	margin-bottom: 25px;
+}
+
+.post .title {
+	height: 30px;
+	color: #549900;
+}
+
+.post .title a {
+	text-decoration: none;
+	color: #585D60;
+}
+
+.post .date {
+}
+
+.post .meta {
+	margin-top: -10px;
+	padding: 2px 30px 2px 16px;
+	background: url(/dingcan/images/img03.gif) no-repeat left 8px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-weight: normal;
+	font-size: 10px;
+	color: #66665E;
+}
+
+.post .meta span {
+	display: block;
+	margin-top: -10px;
+}
+
+.post .meta a { }
+
+.post .entry {
+	padding: 10px 0;
+}
+
+.post .links {
+	margin: 0 250px 0 0;
+	padding: 0 0 0 0px;
+}
+
+.post .links .comments {
+}
+
+.post .links .permalink {
+	padding-left: 17px;
+}
+
+/* 耜晚戲 */
+
+#sidebar {
+	float: left;
+	width: 177px;
+	padding-left: 22px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #585D60;
+}
+
+#sidebar ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+	line-height: normal;
+}
+
+#sidebar li {
+	margin-bottom: 30px;
+	padding: 0 0 10px 0px;
+}
+
+#sidebar li ul {
+}
+
+#sidebar li li {
+	margin: 0;
+	padding: 7px 10px 10px 7px;
+	background: url(/dingcan/images/img07.jpg) repeat-x left bottom;
+}
+
+#sidebar p {
+	margin: 0;
+	padding: 0px 10px;
+}
+
+#sidebar h2 {
+	height: 26px;
+	margin: 0 0 10px 0px;
+	padding: 12px 0 2px 7px;
+	text-transform: capitalize;
+	font-size: 18px;
+	font-weight: normal;
+	color: #464F54;
+}
+
+
+#sidebar p {
+	line-height: 200%;
+}
+#sidebar a {
+	text-align: left;
+	text-decoration: none;
+	font-weight: normal;
+	color: #585D60;
+}
+
+/* ゜盪 */
+
+#calendar {
+}
+
+#calendar caption {
+	padding-bottom: 5px;
+	font-weight: bold;
+}
+
+#calendar table {
+	width: 100%;
+	border-collapse: collapse;
+	border-bottom: 1px solid #24130F;
+	border-left: 1px solid #24130F;
+	border-right: 1px solid #24130F;
+}
+
+#calendar thead th {
+	padding: 5px 0;
+	text-align: center;
+	border-top: 1px solid #24130F;
+	border-left: 1px solid #24130F;
+	background: #24130F;
+}
+
+#calendar tbody td {
+	padding: 5px 0;
+	text-align: center;
+	border-top: 1px solid #24130F;
+	border-left: 1px solid #24130F;
+	border-bottom: 1px solid #24130F;
+}
+
+#calendar tfoot td {
+	padding: 5px;
+	border-left: 1px solid #24130F;
+	border-bottom: 1px solid #24130F;
+}
+
+#calendar tfoot #next {
+	border-top: 1px solid #24130F;
+	text-align: right;
+}
+
+#calendar tfoot #prev {
+	border-top: 1px solid #24130F;
+}
+
+#calendar .pad {
+	border-bottom: 1px solid #24130F;
+}
+
+#calendar #today {
+	background: #24130F;
+}
+
+/* Footer */
+
+#footer {
+	width: 920px;
+	height: 49px;
+	margin: 0 auto;
+	padding-top: 50px;
+}
+
+#footer-bgcontent {
+	margin: 0px;
+	padding: 0px;
+	height: 99px;
+	background: #394144;
+}
+
+#footer p {
+	margin: 0;
+	text-align: center;
+	line-height: normal;
+	text-transform: uppercase;
+	font-size: 10px;
+	color: #FFFFFF;
+}
+
+#footer a {
+	color: #E5FFC4;
+>>>>>>> remotes/origin/wyp_branch
+}

right.jsp

@@ -0,0 +1,42 @@
+<%@ page language="java" import="java.util.*" pageEncoding="ISO-8859-1"%>
+<%
+<<<<<<< HEAD
+    // 获取当前请求的上下文路径，通常用于生成相对路径
+    String path = request.getContextPath();
+=======
+String path = request.getContextPath();
+>>>>>>> remotes/origin/wyp_branch
+%>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+<<<<<<< HEAD
+    <!-- 设置页面缓存相关的meta标签 -->
+    <meta http-equiv="pragma" content="no-cache"> <!-- 禁止浏览器缓存 -->
+    <meta http-equiv="cache-control" content="no-cache"> <!-- 禁止缓存控制 -->
+    <meta http-equiv="expires" content="0">    <!-- 设置过期时间为0，表示不缓存 -->
+    
+    <!-- 设置页面的关键词和描述，用于搜索引擎优化 -->
+    <meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+    <meta http-equiv="description" content="This is my page">
+=======
+    
+	<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">
+>>>>>>> remotes/origin/wyp_branch
+
+  </head>
+  
+  <body>
+<<<<<<< HEAD
+    <!-- 页面主体内容 -->
+    welcome. <br> <!-- 输出 "welcome" 文本并换行 -->
+=======
+    welcome. <br>
+>>>>>>> remotes/origin/wyp_branch
+  </body>
+</html>

service/cartService.java

@@ -0,0 +1,88 @@
+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";  // 返回成功标志
+	}
+}

service/liuService.java

@@ -0,0 +1,344 @@
+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; // 返回信用信息列表
+	}
+}

service/loginService.java

@@ -0,0 +1,166 @@
+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; // 返回菜品类别列表
+	}
+}

succ.jsp

@@ -0,0 +1,23 @@
+<%@ 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>
+	<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>
+      <center>通过验证,登录成功</center>
+  </body>
+</html>

success.jsp

@@ -0,0 +1,28 @@
+<%@ page language="java" pageEncoding="UTF-8"%>
+<%
+	String path = request.getAttribute("path").toString();
+	String message = request.getAttribute("message").toString();
+%>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<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>
+<html>
+<script language="javascript"> 
+    <% if(message != null) { %>
+		alert("<%=message%>"); //如果 message不为空，弹出message信息
+	<% } %>
+	<% if(path != null) { %>
+		document.location.href = "<%=path%>"; //如果路径不为空，跳转到取得的path路径
+	<% } else {%>
+		window.history.back(); //否则返回历史记录中上一界面
+	<% } %>
+</script>
+<body> 
+</body> 
+</html>

test

@@ -0,0 +1 @@
+Subproject commit 7ef20de6fbfb1a60e420462747344546a2e84615

top.jsp

@@ -0,0 +1,93 @@
+<%@ page language="java" import="java.util.*" pageEncoding="utf-8" %>
+<%
+<<<<<<< HEAD
+   // 获取当前请求的上下文路径，通常用于生成相对路径
+=======
+>>>>>>> remotes/origin/wyp_branch
+   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>
+<<<<<<< HEAD
+    <!-- 设置页面缓存相关的meta标签 -->
+    <meta http-equiv="pragma" content="no-cache"/>  <!-- 禁止浏览器缓存 -->
+    <meta http-equiv="cache-control" content="no-cache"/>  <!-- 禁止缓存控制 -->
+    <meta http-equiv="expires" content="0"/>  <!-- 设置过期时间为0，表示不缓存 -->
+    
+    <!-- 设置页面的关键词和描述，用于搜索引擎优化 -->
+    <meta http-equiv="keywords" content="keyword1,keyword2,keyword3"/>
+    <meta http-equiv="description" content="This is my page"/>
+    
+    <!-- 引入外部CSS样式文件 -->
+    <link href="<%=path %>/css/cont.css" rel="stylesheet" type="text/css" />
+    
+    <!-- JavaScript部分，用于处理用户操作 -->
+    <script type="text/javascript">
+      // 处理注销操作，弹出确认框
+      function logout() {
+         // 弹出确认框，确认退出系统
+         if(confirm("确定要退出本系统吗??")) {
+            // 如果确认退出，跳转到登录页面
+            window.parent.location="<%=path %>/login.jsp";  
+         } 
+      }
+      
+      // 返回首页的操作
+      function index() {
+         // 跳转到首页
+         window.parent.location="<%=path %>/site/default.jsp"; 
+      }
+    </script>
+  </head>
+  
+  <body style="background:url(/dingcan/images/top_05.jpg)">
+    <!-- 页面顶部的标题部分，字体白色，字号30px，距离左边20px，距离顶部30px -->
+    <span style="float:left;margin-left: 20px;color: white;font-size: 30px;margin-top: 30px;">
+      基于JSP的高校快餐店订餐系统
+    </span>
+
+    <!-- 页面右侧操作链接部分 -->
+    <span style="float:right;margin-right: 30px;margin-top: 30px;">
+      <!-- 注销退出链接 -->
+      <a href="#" style="color: white;font-size: 16px;font-family: 微软雅黑" onclick="logout()">注销退出</a>
+      
+      <!-- 返回首页链接 -->
+      <a href="#" style="color: white;font-size: 16px;font-family: 微软雅黑" onclick="index()">返回首页</a>
+    </span>
+=======
+	<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/cont.css" rel="stylesheet" type="text/css" /> <!-- 调用一个外部的CSS样式文件,css的链接路径是path/css/cont.css,调用的样式为stylesheet，类型是css -->
+    
+    <script type="text/javascript">
+	    function logout()
+		{
+		   if(confirm("确定要退出本系统吗??"))
+		   {
+			   window.parent.location="<%=path %>/login.jsp";  
+		   } //点击确定返回后台登录界面
+		}
+		
+		function index()
+		{
+			   window.parent.location="<%=path %>/site/default.jsp"; 
+		}//返回首页 
+	</script>
+	
+  </head>
+  
+  <body style="background:url(/dingcan/images/top_05.jpg)">
+      <span style="float:left;margin-left: 20px;color: white;font-size: 30px;margin-top: 30px;">基于JSP的高校快餐店订餐系统</span>
+      <!-- 标题向左浮动，距离左边20像素，白色，字体30像素，距离顶端30像素 -->
+	  <span style="float:right;margin-right: 30px;margin-top: 30px;">
+	     <a href="#" style="color: white;font-size: 16px;font-family: 微软雅黑" onclick="logout()">注销退出</a> <!-- 向右浮动 -->
+	     <a href="#" style="color: white;font-size: 16px;font-family: 微软雅黑" onclick="index()">返回首页</a>
+	  </span>
+>>>>>>> remotes/origin/wyp_branch
+  </body>
+</html>

userDetail.jsp

@@ -0,0 +1,285 @@
+<<<<<<< HEAD
+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
+{
+    public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException 
+    {
+        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);
+        }
+    }
+
+    public void userReg(HttpServletRequest req, HttpServletResponse res)
+    {
+        String id = String.valueOf(new Date().getTime());
+        String loginname = req.getParameter("loginname");
+        String loginpw = req.getParameter("loginpw");
+        String name = req.getParameter("name");
+        String del = "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(?,?,?,?,?)";
+            Object[] params = {id, loginname, loginpw, name, del};
+            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);
+        }
+    }
+
+    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);
+    }
+
+    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 = {};
+        DB mydb = new DB();
+        try
+        {
+            mydb.doPstm(sql, params);
+            ResultSet rs = mydb.getRs();
+            while(rs.next())
+            {
+                Tuser user = new Tuser();
+                user.setId(rs.getString("id"));
+                user.setLoginname(rs.getString("loginname"));
+                user.setLoginpw(rs.getString("loginpw"));
+                user.setLoginpw(rs.getString("loginpw"));
+                user.setName(rs.getString("name"));
+                userList.add(user);
+            }
+            rs.close();
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+        }
+        mydb.closed();
+        
+        req.setAttribute("userList", userList);
+        req.getRequestDispatcher("admin/user/userMana.jsp").forward(req, res);
+    }
+
+    public void userDel(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+    {
+        String id = req.getParameter("id");
+        String sql = "update t_user set del='yes' 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);
+    }
+
+    public void userDetail(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+    {
+        String id = req.getParameter("id");
+        
+        List userList = new ArrayList();
+        String sql = "select * from t_user where id=?";
+        Object[] params = {id};
+        DB mydb = new DB();
+        try
+        {
+            mydb.doPstm(sql, params);
+            ResultSet rs = mydb.getRs();
+            while(rs.next())
+            {
+                Tuser user = new Tuser();
+                user.setId(rs.getString("id"));
+                user.setLoginname(rs.getString("loginname"));
+                user.setLoginpw(rs.getString("loginpw"));
+                user.setLoginpw(rs.getString("loginpw"));
+                user.setName(rs.getString("name"));
+                userList.add(user);
+            }
+            rs.close();
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+        }
+        mydb.closed();
+        
+        req.setAttribute("userList", userList);
+        req.setAttribute("xinyongList", liuService.getxinyongList(id));
+        req.getRequestDispatcher("admin/user/userDetail.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();
+        }
+    }
+
+    public void init(ServletConfig config) throws ServletException 
+    {
+        super.init(config);
+    }
+
+    public void destroy() 
+    {
+    }
+}
+=======
+<%@ 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; //跳转到用户id的xinyongAdd.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>
+>>>>>>> remotes/origin/wyp_branch

userMana.jsp

@@ -0,0 +1,117 @@
+<%@ 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" %> 
+<%
+<<<<<<< HEAD
+String path = request.getContextPath(); // 获取应用的上下文路径
+=======
+String path = request.getContextPath();
+>>>>>>> remotes/origin/wyp_branch
+%>
+
+<!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" />
+
+<<<<<<< HEAD
+		<!-- 引入样式文件 -->
+		<link rel="stylesheet" type="text/css" href="<%=path %>/css/base.css" />
+		
+		<!-- 引入公共 JavaScript 文件 -->
+		<script language="JavaScript" src="<%=path %>/js/public.js" type="text/javascript"></script> 
+		
+        <!-- 用户删除操作的 JavaScript 函数 -->
+        <script language="javascript">
+           function userDel(id)
+           {
+               // 弹出确认框，确认是否删除
+               if(confirm('您确定删除吗？'))
+               {
+                   // 如果确认删除，跳转到对应的删除页面，并传递用户 ID
+                   window.location.href="<%=path %>/user?type=userDel&id="+id;
+=======
+		<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; //如果确认删除，则会跳转到这个界面，？后为传入的参数，提示用户信息删除完毕
+>>>>>>> remotes/origin/wyp_branch
+               }
+           }
+        </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">
+<<<<<<< HEAD
+				    <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">
+				<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">
+						<!-- 删除按钮，点击后会调用 userDel 函数 -->
+						<input type="button" value="删除" onclick="userDel(${user.id})"/>
+=======
+				    <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})"/> <!-- 删除时删除主键用户ID，完成对整个数据项的删除 -->
+>>>>>>> remotes/origin/wyp_branch
+					</td>
+				</tr>
+				</c:forEach>
+			</table>
+	</body>
+</html>

userPw.jsp

@@ -0,0 +1,96 @@
+<%@ 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}"; //从session范围里取得管理员的密码，赋值给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函数，原密码与新密码通过后执行callback，提示修改成功
+            {
+                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范围里取得管理员的用户名，disabled="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>

user_servlet.java

@@ -0,0 +1,199 @@
+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
+{
+    public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException 
+    {
+        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);
+        }
+    }
+
+    public void userReg(HttpServletRequest req, HttpServletResponse res)
+    {
+        String id = String.valueOf(new Date().getTime());
+        String loginname = req.getParameter("loginname");
+        String loginpw = req.getParameter("loginpw");
+        String name = req.getParameter("name");
+        String del = "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(?,?,?,?,?)";
+            Object[] params = {id, loginname, loginpw, name, del};
+            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);
+        }
+    }
+
+    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);
+    }
+
+    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 = {};
+        DB mydb = new DB();
+        try
+        {
+            mydb.doPstm(sql, params);
+            ResultSet rs = mydb.getRs();
+            while(rs.next())
+            {
+                Tuser user = new Tuser();
+                user.setId(rs.getString("id"));
+                user.setLoginname(rs.getString("loginname"));
+                user.setLoginpw(rs.getString("loginpw"));
+                user.setLoginpw(rs.getString("loginpw"));
+                user.setName(rs.getString("name"));
+                userList.add(user);
+            }
+            rs.close();
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+        }
+        mydb.closed();
+        
+        req.setAttribute("userList", userList);
+        req.getRequestDispatcher("admin/user/userMana.jsp").forward(req, res);
+    }
+
+    public void userDel(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+    {
+        String id = req.getParameter("id");
+        String sql = "update t_user set del='yes' 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);
+    }
+
+    public void userDetail(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException
+    {
+        String id = req.getParameter("id");
+        
+        List userList = new ArrayList();
+        String sql = "select * from t_user where id=?";
+        Object[] params = {id};
+        DB mydb = new DB();
+        try
+        {
+            mydb.doPstm(sql, params);
+            ResultSet rs = mydb.getRs();
+            while(rs.next())
+            {
+                Tuser user = new Tuser();
+                user.setId(rs.getString("id"));
+                user.setLoginname(rs.getString("loginname"));
+                user.setLoginpw(rs.getString("loginpw"));
+                user.setLoginpw(rs.getString("loginpw"));
+                user.setName(rs.getString("name"));
+                userList.add(user);
+            }
+            rs.close();
+        }
+        catch(Exception e)
+        {
+            e.printStackTrace();
+        }
+        mydb.closed();
+        
+        req.setAttribute("userList", userList);
+        req.setAttribute("xinyongList", liuService.getxinyongList(id));
+        req.getRequestDispatcher("admin/user/userDetail.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();
+        }
+    }
+
+    public void init(ServletConfig config) throws ServletException 
+    {
+        super.init(config);
+    }
+
+    public void destroy() 
+    {
+    }
+}

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")//账号密码错误，返回fail.jsp页面
+			    {			       
+			        var url="<%=path %>/common/fail.jsp";
+			        window.location.href=url;
+			    }
+			    if(data!="no")//返回的data就是用户的id，当账号密码正确时
+			    {			        
+			        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：indicator插入载入动画 -->
+		            </td>
+		          </tr>
+		      </table>
+	    </form>
+  </body>
+</html>

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>

xinyongAdd.jsp

@@ -1,3 +1,43 @@
+<<<<<<< HEAD
+<<<<<<< HEAD
+<%@page import="java.text.SimpleDateFormat"%> <!-- 引入 SimpleDateFormat 用于格式化日期 -->
+<%@page import="java.util.Date"%>  <!-- 引入 Date 类用于获取当前日期和时间 -->
+<%@ page language="java" pageEncoding="UTF-8"%> <!-- 设置页面的语言为 Java 和字符编码为 UTF-8 -->
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <!-- 引入 JSTL 核心标签库 -->
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <!-- 引入 JSTL 格式化标签库 -->
+<%@ page isELIgnored="false"%> <!-- 启用表达式语言 (EL) -->
+
+<%
+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"> <!-- 定义 HTML 文档的 XML 命名空间 -->
+	<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" />
+        
+        <!-- 定义 JavaScript 函数，用于验证表单内容 -->
+        <script language="javascript">
+            function c() 
+            {
+                // 如果评价内容为空，弹出提示框
+                if(document.formAdd.neirong.value=="") 
+                {
+                    alert("请输入评价内容");
+                    return false; // 阻止表单提交
+                }
+                
+                document.formAdd.submit(); // 提交表单
+=======
+=======
+>>>>>>> remotes/origin/wyc_branch
 <%@page import="java.text.SimpleDateFormat"%>
 <%@page import="java.util.Date"%>  
 <%@ page language="java" pageEncoding="UTF-8"%>
@@ -30,51 +70,123 @@ String path = request.getContextPath();
                 }
                 
                 document.formAdd.submit();  //如果不为空则提交信息
+<<<<<<< HEAD
+>>>>>>> remotes/origin/wyp_branch
+=======
+>>>>>>> remotes/origin/wyc_branch
             }
         </script>
 	</head>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'> <!-- 设置页面背景 -->
+			<form action="<%=path %>/xinyong?type=xinyongAdd" name="formAdd" method="post"> <!-- 表单提交地址和方法 -->
+=======
+	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'> <!-- 距离左边为2，距离上面为9，背景图片为。。 -->
+			<form action="<%=path %>/xinyong?type=xinyongAdd" name="formAdd" method="post"> <!--表单的方法为提交  -->
+>>>>>>> remotes/origin/wyp_branch
+=======
 	<body leftmargin="2" topmargin="9" background='<%=path %>/img/allbg.gif'> <!-- 距离左边为2，距离上面为9，背景图片为。。 -->
 			<form action="<%=path %>/xinyong?type=xinyongAdd" name="formAdd" method="post"> <!--表单的方法为提交  -->
+>>>>>>> remotes/origin/wyc_branch
 				     <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>
+<<<<<<< HEAD
+<<<<<<< HEAD
+						<!-- 评价属性选择 -->
+=======
+>>>>>>> remotes/origin/wyp_branch
+=======
+>>>>>>> remotes/origin/wyc_branch
 						<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">
+<<<<<<< HEAD
+<<<<<<< HEAD
+						        <!-- 评价属性的选择按钮 -->
+=======
+>>>>>>> remotes/origin/wyp_branch
+=======
+>>>>>>> remotes/origin/wyc_branch
 						        <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>
+<<<<<<< HEAD
+<<<<<<< HEAD
+						<!-- 评价内容输入框 -->
+=======
+>>>>>>> remotes/origin/wyp_branch
+=======
+>>>>>>> remotes/origin/wyc_branch
 						<tr align='center' bgcolor="#FFFFFF"  height="22">
 						    <td width="10%" bgcolor="#FFFFFF" align="right">
 						                         评价内容：
 						    </td>
 						    <td width="90%" bgcolor="#FFFFFF" align="left">
+<<<<<<< HEAD
+<<<<<<< HEAD
+						        <input type="text" name="neirong" size="40"/> <!-- 用户输入评价内容 -->
+						    </td>
+						</tr>
+						<!-- 自动填写当前时间 -->
+=======
 						        <input type="text" name="neirong" size="40"/>
 						    </td>
 						</tr>
+>>>>>>> remotes/origin/wyp_branch
+=======
+						        <input type="text" name="neirong" size="40"/>
+						    </td>
+						</tr>
+>>>>>>> remotes/origin/wyc_branch
 						<tr align='center' bgcolor="#FFFFFF"  height="22">
 						    <td width="10%" bgcolor="#FFFFFF" align="right">
 						                         评价时间：
 						    </td>
 						    <td width="90%" bgcolor="#FFFFFF" align="left">
+<<<<<<< HEAD
+<<<<<<< HEAD
+						        <input type="text" name="shijian" size="40" value="<%=new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date())%>"/> <!-- 使用 SimpleDateFormat 获取当前日期和时间 -->
+						    </td>
+						</tr>
+						<!-- 隐藏用户ID和表单操作按钮 -->
+=======
+=======
+>>>>>>> remotes/origin/wyc_branch
 						        <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>
+<<<<<<< HEAD
+>>>>>>> remotes/origin/wyp_branch
+=======
+>>>>>>> remotes/origin/wyc_branch
 						<tr align='center' bgcolor="#FFFFFF"  height="22">
 						    <td width="10%" bgcolor="#FFFFFF" align="right">
 						        &nbsp;
 						    </td>
 						    <td width="90%" bgcolor="#FFFFFF" align="left">
+<<<<<<< HEAD
+<<<<<<< HEAD
+						       <input type="hidden" name="user_id" value="<%=request.getParameter("user_id") %>"/> <!-- 获取传入的 user_id -->
+						       <input type="reset" value="重置"/>&nbsp; <!-- 重置按钮 -->
+=======
+						       <input type="hidden" name="user_id" value="<%=request.getParameter("user_id") %>"/> <!-- 插入隐藏域，获得用户的id -->
+						       <input type="button" value="提交" onclick="c()"/>&nbsp; 
+						       <input type="reset" value="重置"/>&nbsp;
+>>>>>>> remotes/origin/wyp_branch
+=======
 						       <input type="hidden" name="user_id" value="<%=request.getParameter("user_id") %>"/> <!-- 插入隐藏域，获得用户的id -->
 						       <input type="button" value="提交" onclick="c()"/>&nbsp; 
 						       <input type="reset" value="重置"/>&nbsp;
+>>>>>>> remotes/origin/wyc_branch
 						    </td>
 						</tr>
 					 </table>