diff --git a/daohang.jsp b/daohang.jsp new file mode 100644 index 0000000..4710547 --- /dev/null +++ b/daohang.jsp @@ -0,0 +1,81 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ page isELIgnored="false" %> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + + + + + + + + + diff --git a/db_dingcan.sql b/db_dingcan.sql new file mode 100644 index 0000000..bda1297 --- /dev/null +++ b/db_dingcan.sql @@ -0,0 +1,158 @@ +SET FOREIGN_KEY_CHECKS=0; + +-- ---------------------------- +-- Table structure for `t_admin` +-- ---------------------------- +DROP TABLE IF EXISTS `t_admin`; +CREATE TABLE `t_admin` ( + `userId` int(11) NOT NULL, + `userName` varchar(50) default NULL, + `userPw` varchar(50) default NULL, + PRIMARY KEY (`userId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_admin +-- ---------------------------- +INSERT INTO `t_admin` VALUES ('1', 'a', 'a'); + +-- ---------------------------- +-- Table structure for `t_catelog` +-- ---------------------------- +DROP TABLE IF EXISTS `t_catelog`; +CREATE TABLE `t_catelog` ( + `id` varchar(50) NOT NULL, + `name` varchar(50) default NULL, + `del` varchar(50) default NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_catelog +-- ---------------------------- +INSERT INTO `t_catelog` VALUES ('1393654966130', '', 'no'); +INSERT INTO `t_catelog` VALUES ('1393654973698', 'ȳ', 'no'); +INSERT INTO `t_catelog` VALUES ('1393654982744', '', 'no'); + +-- ---------------------------- +-- Table structure for `t_goods` +-- ---------------------------- +DROP TABLE IF EXISTS `t_goods`; +CREATE TABLE `t_goods` ( + `id` varchar(50) NOT NULL, + `catelog_id` varchar(50) default NULL, + `bianhao` varchar(500) default NULL, + `mingcheng` varchar(500) default NULL, + `jieshao` varchar(500) default NULL, + `fujian` varchar(500) default NULL, + `shichangjia` int(11) default NULL, + `tejia` int(11) default NULL, + `del` varchar(50) default NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_goods +-- ---------------------------- +INSERT INTO `t_goods` VALUES ('1393655526789', '1393654966130', '0001', '빽', 'üȥ빽ĸٲ֣ٷϴɾϳĽ빽ԴмԷʳã콷ȥϸмˮ1Σտ빽ͺ콷˿1ӣػ——ֻ1ӣ빽죬ʱ˷', '/upload/1393655525402.jpg', '100', '100', 'no'); +INSERT INTO `t_goods` VALUES ('1393655887280', '1393654982744', '0002', 'ʶ', 'ϴгСжʱԴӺǰУеͬʱѹסͲճڵ˴ϺֻȡϺʣСϺϻȡϺߣõϺϺ', '/upload/1393655885962.jpg', '100', '100', 'no'); +INSERT INTO `t_goods` VALUES ('1393655949576', '1393654982744', '0003', '޲', '޲ϴˮнһСʱϴáȥƤгɿȥϴÿжκͽƬϾƣĻ50', '/upload/1393655948031.jpg', '100', '100', 'no'); +INSERT INTO `t_goods` VALUES ('1393656014209', '1393654973698', '0004', 'ǴŹ', 'ŹǶɳԼ5׵ĶΣȻϴɾмˮûŽտȻӽĸĭƲɾôտĭƮ׽ĭƲĺܸɷɵ飬ټϰ˽ǡϾơһСϹ40ӣŹ', '/upload/1393656012959.jpg', '100', '100', 'no'); + +-- ---------------------------- +-- Table structure for `t_liuyan` +-- ---------------------------- +DROP TABLE IF EXISTS `t_liuyan`; +CREATE TABLE `t_liuyan` ( + `id` int(11) NOT NULL auto_increment, + `neirong` varchar(200) default NULL, + `liuyanshi` varchar(2000) default NULL, + `user_id` varchar(50) default NULL, + `huifu` varchar(50) default NULL, + `huifushi` varchar(50) default NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_liuyan +-- ---------------------------- + +-- ---------------------------- +-- Table structure for `t_order` +-- ---------------------------- +DROP TABLE IF EXISTS `t_order`; +CREATE TABLE `t_order` ( + `id` varchar(200) NOT NULL, + `bianhao` varchar(200) default NULL, + `shijian` varchar(200) default NULL, + `zhuangtai` varchar(200) default NULL, + `huifu` varchar(255) default NULL, + `songhuodizhi` varchar(200) default NULL, + `fukuanfangshi` varchar(200) default NULL, + `jine` int(11) default NULL, + `user_id` varchar(200) default NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_order +-- ---------------------------- + + +-- ---------------------------- +-- Table structure for `t_orderitem` +-- ---------------------------- +DROP TABLE IF EXISTS `t_orderitem`; +CREATE TABLE `t_orderitem` ( + `id` varchar(200) NOT NULL, + `order_id` varchar(200) default NULL, + `goods_id` varchar(50) default NULL, + `goods_quantity` int(11) default NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_orderitem +-- ---------------------------- +INSERT INTO `t_orderitem` VALUES ('1393657633435', '1393657633280', '1393655303399', '1'); +INSERT INTO `t_orderitem` VALUES ('1393657943847', '1393657943777', '1393655887280', '1'); +INSERT INTO `t_orderitem` VALUES ('1393658063119', '1393658063033', '1393655949576', '1'); +INSERT INTO `t_orderitem` VALUES ('1393658148327', '1393658147936', '1393655887280', '1'); +INSERT INTO `t_orderitem` VALUES ('1393658173125', '1393658172985', '1393655949576', '1'); +INSERT INTO `t_orderitem` VALUES ('1393658262440', '1393658262399', '1393655949576', '1'); +INSERT INTO `t_orderitem` VALUES ('1393658284297', '1393658284160', '1393655949576', '1'); +INSERT INTO `t_orderitem` VALUES ('1395033001797', '1395033001698', '1393655171464', '1'); +INSERT INTO `t_orderitem` VALUES ('1395033002062', '1395033001698', '1393655526789', '1'); + +-- ---------------------------- +-- Table structure for `t_user` +-- ---------------------------- +DROP TABLE IF EXISTS `t_user`; +CREATE TABLE `t_user` ( + `id` varchar(50) NOT NULL, + `loginname` varchar(50) default NULL, + `loginpw` varchar(50) default NULL, + `name` varchar(50) default NULL, + `del` varchar(50) default NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_user +-- ---------------------------- +INSERT INTO `t_user` VALUES ('1349561912257', 'a', 'a', 'ch', 'no'); +-- ---------------------------- +-- Table structure for `t_xinyong` +-- ---------------------------- +DROP TABLE IF EXISTS `t_xinyong`; +CREATE TABLE `t_xinyong` ( + `id` varchar(50) NOT NULL, + `shuxing` varchar(50) default NULL, + `neirong` varchar(50) default NULL, + `shijian` varchar(50) default NULL, + `user_id` varchar(50) default NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +-- ---------------------------- +-- Records of t_xinyong +-- ---------------------------- diff --git a/goodsByCatelog.jsp b/goodsByCatelog.jsp new file mode 100644 index 0000000..543ad48 --- /dev/null +++ b/goodsByCatelog.jsp @@ -0,0 +1,93 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ page isELIgnored="false" %> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+

菜品信息

+
+ + + + + + + + + +
+ + + + +
+

+ + +

${goods.mingcheng }
+

+
+
+
+
+
+ + + + + +
 
+
+
+ + +
+ + diff --git a/goodsDetailQian.jsp b/goodsDetailQian.jsp new file mode 100644 index 0000000..e301c0c --- /dev/null +++ b/goodsDetailQian.jsp @@ -0,0 +1,110 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ page isELIgnored="false" %> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+

菜品详细信息

+
+
+ + + + + + + + + + + + + + + + + + + +
商品编号：${requestScope.goods.bianhao }
商品名称：${requestScope.goods.mingcheng }
商品描述：
价格：${requestScope.goods.shichangjia }
+ 数量： + + + +
+
+
+
+
+ + + + +
 
+
+
+ + +
+ + diff --git a/goodsNew.jsp b/goodsNew.jsp new file mode 100644 index 0000000..caac8d0 --- /dev/null +++ b/goodsNew.jsp @@ -0,0 +1,93 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ page isELIgnored="false" %> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+

菜品信息

+
+ + + + + + + + + +
+ + + + +
+

+ + +

${goods.mingcheng }
+

+
+
+
+
+
+ + + + + +
 
+
+
+ + +
+ + diff --git a/goodsRes.jsp b/goodsRes.jsp new file mode 100644 index 0000000..78a7944 --- /dev/null +++ b/goodsRes.jsp @@ -0,0 +1,92 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ page isELIgnored="false" %> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+

菜品信息

+
+ + + + + + + + + +
+ + + + +
+

+ + +

${goods.mingcheng }
+

+
+
+
+
+
+ + + + +
 
+
+
+ + +
+ + diff --git a/goodsSea.jsp b/goodsSea.jsp new file mode 100644 index 0000000..9ce52f6 --- /dev/null +++ b/goodsSea.jsp @@ -0,0 +1,90 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ page isELIgnored="false" %> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+ +
+
+ + + + + + + + + +
+ 菜品名称： + + + +
+   +   +
+
+
+
+
+ + + + +
 
+
+
+ + +
+ + diff --git a/left.jsp b/left.jsp index f15a32f..ebfcccc 100644 --- a/left.jsp +++ b/left.jsp @@ -1,3 +1,4 @@ +<<<<<<< HEAD <%@ page language="java" import="java.util.*" pageEncoding="utf-8" %> <% <<<<<<< HEAD @@ -417,3 +418,52 @@ >>>>>>> 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"%> +<%@ page isELIgnored="false" %> + +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + + + + + + +>>>>>>> remotes/origin/wyc_branch diff --git a/login.jsp b/login.jsp new file mode 100644 index 0000000..f13958f --- /dev/null +++ b/login.jsp @@ -0,0 +1,111 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<% + String path = request.getContextPath();//获得当前的项目根目录路径赋值给path +%> + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + +
基于JSP的高校快餐店订餐系统 + + + +
账号：
密码：
  + +      + + +
+
+
+ + diff --git a/loginSuccess.jsp b/loginSuccess.jsp new file mode 100644 index 0000000..6bc2af7 --- /dev/null +++ b/loginSuccess.jsp @@ -0,0 +1,28 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + +








+
+ + diff --git a/mycart.jsp b/mycart.jsp new file mode 100644 index 0000000..2438053 --- /dev/null +++ b/mycart.jsp @@ -0,0 +1,157 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ page isELIgnored="false" %> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+

我的购物车

+
+ + + + + + + + + + + + + + + + + + + + + + +
商品名称购买价格购买数量总金额操作
${item.value.goods.mingcheng}￥:${item.value.goods.tejia}${item.value.goods.tejia * item.value.goods_quantity} + +
+
+ 总金额：${sessionScope.cart.totalPrice} +      + +
+ + + + + + + + +
+ + + + + +
+
+
+
+ + + + +
 
+
+
+ + +
+ + diff --git a/myorder.jsp b/myorder.jsp new file mode 100644 index 0000000..535a196 --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+

我的订单

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
订单编号：${order.bianhao}
下单时间：${order.shijian}
+ 订单状态： + + 未受理 + + + 已受理 + +
排队计时：${order.huifu}
送货地址：${order.songhuodizhi}
付款方式：${order.fukuanfangshi}
总金额：${order.jine}  + 订单明细 +
+
+
+ +
+
+
+ + + + +
 
+
+
+ + +
+ + diff --git a/orderDetail.jsp b/orderDetail.jsp new file mode 100644 index 0000000..8b19261 --- /dev/null +++ b/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+"/"; +%> + + + + + + My JSP 'orderDetail.jsp' starting page + + + + + + + + + + + + + + + + + + + + + + + + +
商品名称购买数量购买价格
${orderItem.goods.mingcheng}${orderItem.goods_quantity}${orderItem.goods.tejia}
+ + diff --git a/orderQueren.jsp b/orderQueren.jsp new file mode 100644 index 0000000..b7a446b --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+

填写订单

+
+
+ + + + + + + + + + + + + + + + + +
+ 收货人帐号： + + +
+ 收货人姓名： + + +
+ 送货地址： + + +
+ 付款方式： + + +
+ + + + + + + +
+ + + +
+
+
+
+
+ + + + +
 
+
+
+ + +
+ + diff --git a/orderSubmit.jsp b/orderSubmit.jsp new file mode 100644 index 0000000..90cd248 --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+

+
+ + + + + + + + + + + + + + + + + + + + +
恭喜您，订单提交成功！
订单编号：${requestScope.order.bianhao }
总金额：${requestScope.order.jine }
下单日期:${requestScope.order.shijian }
送货地址:${requestScope.order.songhuodizhi }
付款方式:${requestScope.order.fukuanfangshi }
+
+
+
+ + + + +
 
+
+
+ + +
+ + diff --git a/popup.js b/popup.js new file mode 100644 index 0000000..908b32f --- /dev/null +++ b/popup.js @@ -0,0 +1,188 @@ +var tcolor={ + cColor:"#EEEEEE", //蒙皮颜色 + bColor:"#FFFFFF", //背景颜色 + tColor:"#9C9E9C", //标题背景颜色，边框颜色 + wColor:"#FFFFFF" //标题文字颜色 + }; + +function popclose() +{ +var a = parent.document.getElementById("dialogBoxClose"); +a.click(); +} + +if(!Array.prototype.push){ +Array.prototype.push=function(){ + var startLength=this.length; + for(var i=0;i'; + var close=''; + var cB='filter: alpha(opacity='+this.info.coverOpacity+');opacity:'+this.info.coverOpacity/100+';'; + var cover=''; + var mainBox=''+''; + if(!this.config.isBackgroundCanClick){G('dialogCase').innerHTML=cover+mainBox;G('dialogBoxBG').style.height=document.body.scrollHeight} + else G('dialogCase').innerHTML=mainBox;Event.observe(G('dialogBoxClose'),"click",this.reset.bindAsEventListener(this),false); + if(this.config.isSupportDraging){dropClass=new Dragdrop(this.config.width,this.config.height,this.info.shadowWidth,this.config.isSupportDraging,this.config.contentType);G("dialogBoxTitle").style.cursor="move"};this.lastBuild()},lastBuild:function(){var confirm='
'+this.info.confirmCon+'
 
'; + var alert='
'+this.info.alertCon+'
'; + var baseZIndex=10001+this.info.overlay*10;var coverIfZIndex=baseZIndex+4; + if(this.config.contentType==1){var openIframe=""; + var coverIframe="
";G("dialogBody").innerHTML=openIframe+coverIframe} + else if(this.config.contentType==2){G("dialogBody").innerHTML=this.info.contentHtml}else if(this.config.contentType==3){G("dialogBody").innerHTML=confirm;Event.observe(G('dialogOk'),"click",this.forCallback.bindAsEventListener(this),false); + Event.observe(G('dialogCancel'),"click",this.close.bindAsEventListener(this),false)}else if(this.config.contentType==4){G("dialogBody").innerHTML=alert;Event.observe(G('dialogYES'),"click",this.close.bindAsEventListener(this),false)}},reBuild:function(){G('dialogBody').height=G('dialogBody').clientHeight;this.lastBuild()},show:function(){this.hiddenSome();this.middle();if(this.config.isShowShadow)this.shadow()},forCallback:function(){return this.info.callBack(this.info.parameter)},shadow:function(){var oShadow=G('dialogBoxShadow');var oDialog=G('dialogBox');oShadow['style']['position']="absolute";oShadow['style']['background']="#000";oShadow['style']['display']="";oShadow['style']['opacity']="0.2";oShadow['style']['filter']="alpha(opacity=20)";oShadow['style']['top']=oDialog.offsetTop+this.info.shadowWidth;oShadow['style']['left']=oDialog.offsetLeft+this.info.shadowWidth;oShadow['style']['width']=oDialog.offsetWidth;oShadow['style']['height']=oDialog.offsetHeight},middle:function(){if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display=''; + var oDialog=G('dialogBox'); + oDialog['style']['position']="absolute"; + oDialog['style']['display']=''; + //取得页面的宽度和高度 + var sClientWidth=document.body.clientWidth; + var sClientHeight=document.body.clientHeight; + var sScrollTop=document.body.scrollTop; + // + var sleft=(sClientWidth/2)-(oDialog.offsetWidth/2); + var iTop=-80+(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2); + var sTop=iTop>0?iTop:(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2); + if(sTop<1)sTop="20";if(sleft<1)sleft="20"; + oDialog['style']['left']=sleft+"px"; //左侧位置 + oDialog['style']['top']=220+"px" //顶部位置 + }, + reset:function(){if(this.config.isReloadOnClose){top.location.reload()};this.close()},close:function(){G('dialogBox').style.display='none'; + if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display='none'; + if(this.config.isShowShadow)G('dialogBoxShadow').style.display='none';G('dialogBody').innerHTML=''; + this.showSome()},hiddenSome:function(){var tag=this.info.someHiddenTag.split(","); + if(tag.length==1&&tag[0]=="")tag.length=0; + for(var i=0;iparseInt(this.oObj.style.top)+25)iTop=iTop+12;this.oObj.style.left=iLeft;this.oObj.style.top=iTop;if(this.showShadow){G('dialogBoxShadow').style.left=iLeft+this.shadowWidth;G('dialogBoxShadow').style.top=iTop+this.shadowWidth};this.dragData={x:Event.pointerX(event),y:Event.pointerY(event)};document.body.style.cursor="move"},mouseup:function(event){if(!this.IsDraging)return;if(this.contentType==1)G("iframeBG").style.display="none";document.onmousemove=null;document.onmouseup=null;var mousX=Event.pointerX(event)-(document.documentElement.scrollLeft||document.body.scrollLeft);var mousY=Event.pointerY(event)-(document.documentElement.scrollTop||document.body.scrollTop);if(mousX<1||mousY<1||mousX>document.body.clientWidth||mousY>document.body.clientHeight){this.oObj.style.left=this.backData["x"];this.oObj.style.top=this.backData["y"];if(this.showShadow){G('dialogBoxShadow').style.left=this.backData.x+this.shadowWidth;G('dialogBoxShadow').style.top=this.backData.y+this.shadowWidth}};this.IsDraging=false;document.body.style.cursor="";Event.stopObserving(document,"selectstart",this.returnFalse,false)},returnFalse:function(){return false}}; + + + diff --git a/popup_shuaxin.js b/popup_shuaxin.js new file mode 100644 index 0000000..c298f21 --- /dev/null +++ b/popup_shuaxin.js @@ -0,0 +1,188 @@ +var tcolor={ + cColor:"#EEEEEE", //蒙皮颜色 + bColor:"#FFFFFF", //背景颜色 + tColor:"#9C9E9C", //标题背景颜色，边框颜色 + wColor:"#FFFFFF" //标题文字颜色 + }; + +function popclose() +{ +var a = parent.document.getElementById("dialogBoxClose"); +a.click(); +} + +if(!Array.prototype.push){ +Array.prototype.push=function(){ + var startLength=this.length; + for(var i=0;i'; + var close=''; + var cB='filter: alpha(opacity='+this.info.coverOpacity+');opacity:'+this.info.coverOpacity/100+';'; + var cover=''; + var mainBox=''+''; + if(!this.config.isBackgroundCanClick){G('dialogCase').innerHTML=cover+mainBox;G('dialogBoxBG').style.height=document.body.scrollHeight} + else G('dialogCase').innerHTML=mainBox;Event.observe(G('dialogBoxClose'),"click",this.reset.bindAsEventListener(this),false); + if(this.config.isSupportDraging){dropClass=new Dragdrop(this.config.width,this.config.height,this.info.shadowWidth,this.config.isSupportDraging,this.config.contentType);G("dialogBoxTitle").style.cursor="move"};this.lastBuild()},lastBuild:function(){var confirm='
'+this.info.confirmCon+'
 
'; + var alert='
'+this.info.alertCon+'
'; + var baseZIndex=10001+this.info.overlay*10;var coverIfZIndex=baseZIndex+4; + if(this.config.contentType==1){var openIframe=""; + var coverIframe="
";G("dialogBody").innerHTML=openIframe+coverIframe} + else if(this.config.contentType==2){G("dialogBody").innerHTML=this.info.contentHtml}else if(this.config.contentType==3){G("dialogBody").innerHTML=confirm;Event.observe(G('dialogOk'),"click",this.forCallback.bindAsEventListener(this),false); + Event.observe(G('dialogCancel'),"click",this.close.bindAsEventListener(this),false)}else if(this.config.contentType==4){G("dialogBody").innerHTML=alert;Event.observe(G('dialogYES'),"click",this.close.bindAsEventListener(this),false)}},reBuild:function(){G('dialogBody').height=G('dialogBody').clientHeight;this.lastBuild()},show:function(){this.hiddenSome();this.middle();if(this.config.isShowShadow)this.shadow()},forCallback:function(){return this.info.callBack(this.info.parameter)},shadow:function(){var oShadow=G('dialogBoxShadow');var oDialog=G('dialogBox');oShadow['style']['position']="absolute";oShadow['style']['background']="#000";oShadow['style']['display']="";oShadow['style']['opacity']="0.2";oShadow['style']['filter']="alpha(opacity=20)";oShadow['style']['top']=oDialog.offsetTop+this.info.shadowWidth;oShadow['style']['left']=oDialog.offsetLeft+this.info.shadowWidth;oShadow['style']['width']=oDialog.offsetWidth;oShadow['style']['height']=oDialog.offsetHeight},middle:function(){if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display=''; + var oDialog=G('dialogBox'); + oDialog['style']['position']="absolute"; + oDialog['style']['display']=''; + //取得页面的宽度和高度 + var sClientWidth=document.body.clientWidth; + var sClientHeight=document.body.clientHeight; + var sScrollTop=document.body.scrollTop; + // + var sleft=(sClientWidth/2)-(oDialog.offsetWidth/2); + var iTop=-80+(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2); + var sTop=iTop>0?iTop:(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2); + if(sTop<1)sTop="20";if(sleft<1)sleft="20"; + oDialog['style']['left']=sleft+"px"; //左侧位置 + oDialog['style']['top']=220+"px" //顶部位置 + }, + reset:function(){if(this.config.isReloadOnClose){top.location.reload()};this.close()},close:function(){G('dialogBox').style.display='none';window.location.reload(); + if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display='none'; + if(this.config.isShowShadow)G('dialogBoxShadow').style.display='none';G('dialogBody').innerHTML=''; + this.showSome()},hiddenSome:function(){var tag=this.info.someHiddenTag.split(","); + if(tag.length==1&&tag[0]=="")tag.length=0; + for(var i=0;iparseInt(this.oObj.style.top)+25)iTop=iTop+12;this.oObj.style.left=iLeft;this.oObj.style.top=iTop;if(this.showShadow){G('dialogBoxShadow').style.left=iLeft+this.shadowWidth;G('dialogBoxShadow').style.top=iTop+this.shadowWidth};this.dragData={x:Event.pointerX(event),y:Event.pointerY(event)};document.body.style.cursor="move"},mouseup:function(event){if(!this.IsDraging)return;if(this.contentType==1)G("iframeBG").style.display="none";document.onmousemove=null;document.onmouseup=null;var mousX=Event.pointerX(event)-(document.documentElement.scrollLeft||document.body.scrollLeft);var mousY=Event.pointerY(event)-(document.documentElement.scrollTop||document.body.scrollTop);if(mousX<1||mousY<1||mousX>document.body.clientWidth||mousY>document.body.clientHeight){this.oObj.style.left=this.backData["x"];this.oObj.style.top=this.backData["y"];if(this.showShadow){G('dialogBoxShadow').style.left=this.backData.x+this.shadowWidth;G('dialogBoxShadow').style.top=this.backData.y+this.shadowWidth}};this.IsDraging=false;document.body.style.cursor="";Event.stopObserving(document,"selectstart",this.returnFalse,false)},returnFalse:function(){return false}}; + + + diff --git a/popup_shuaxin_no.js b/popup_shuaxin_no.js new file mode 100644 index 0000000..908b32f --- /dev/null +++ b/popup_shuaxin_no.js @@ -0,0 +1,188 @@ +var tcolor={ + cColor:"#EEEEEE", //蒙皮颜色 + bColor:"#FFFFFF", //背景颜色 + tColor:"#9C9E9C", //标题背景颜色，边框颜色 + wColor:"#FFFFFF" //标题文字颜色 + }; + +function popclose() +{ +var a = parent.document.getElementById("dialogBoxClose"); +a.click(); +} + +if(!Array.prototype.push){ +Array.prototype.push=function(){ + var startLength=this.length; + for(var i=0;i'; + var close=''; + var cB='filter: alpha(opacity='+this.info.coverOpacity+');opacity:'+this.info.coverOpacity/100+';'; + var cover=''; + var mainBox=''+''; + if(!this.config.isBackgroundCanClick){G('dialogCase').innerHTML=cover+mainBox;G('dialogBoxBG').style.height=document.body.scrollHeight} + else G('dialogCase').innerHTML=mainBox;Event.observe(G('dialogBoxClose'),"click",this.reset.bindAsEventListener(this),false); + if(this.config.isSupportDraging){dropClass=new Dragdrop(this.config.width,this.config.height,this.info.shadowWidth,this.config.isSupportDraging,this.config.contentType);G("dialogBoxTitle").style.cursor="move"};this.lastBuild()},lastBuild:function(){var confirm='
'+this.info.confirmCon+'
 
'; + var alert='
'+this.info.alertCon+'
'; + var baseZIndex=10001+this.info.overlay*10;var coverIfZIndex=baseZIndex+4; + if(this.config.contentType==1){var openIframe=""; + var coverIframe="
";G("dialogBody").innerHTML=openIframe+coverIframe} + else if(this.config.contentType==2){G("dialogBody").innerHTML=this.info.contentHtml}else if(this.config.contentType==3){G("dialogBody").innerHTML=confirm;Event.observe(G('dialogOk'),"click",this.forCallback.bindAsEventListener(this),false); + Event.observe(G('dialogCancel'),"click",this.close.bindAsEventListener(this),false)}else if(this.config.contentType==4){G("dialogBody").innerHTML=alert;Event.observe(G('dialogYES'),"click",this.close.bindAsEventListener(this),false)}},reBuild:function(){G('dialogBody').height=G('dialogBody').clientHeight;this.lastBuild()},show:function(){this.hiddenSome();this.middle();if(this.config.isShowShadow)this.shadow()},forCallback:function(){return this.info.callBack(this.info.parameter)},shadow:function(){var oShadow=G('dialogBoxShadow');var oDialog=G('dialogBox');oShadow['style']['position']="absolute";oShadow['style']['background']="#000";oShadow['style']['display']="";oShadow['style']['opacity']="0.2";oShadow['style']['filter']="alpha(opacity=20)";oShadow['style']['top']=oDialog.offsetTop+this.info.shadowWidth;oShadow['style']['left']=oDialog.offsetLeft+this.info.shadowWidth;oShadow['style']['width']=oDialog.offsetWidth;oShadow['style']['height']=oDialog.offsetHeight},middle:function(){if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display=''; + var oDialog=G('dialogBox'); + oDialog['style']['position']="absolute"; + oDialog['style']['display']=''; + //取得页面的宽度和高度 + var sClientWidth=document.body.clientWidth; + var sClientHeight=document.body.clientHeight; + var sScrollTop=document.body.scrollTop; + // + var sleft=(sClientWidth/2)-(oDialog.offsetWidth/2); + var iTop=-80+(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2); + var sTop=iTop>0?iTop:(sClientHeight/2+sScrollTop)-(oDialog.offsetHeight/2); + if(sTop<1)sTop="20";if(sleft<1)sleft="20"; + oDialog['style']['left']=sleft+"px"; //左侧位置 + oDialog['style']['top']=220+"px" //顶部位置 + }, + reset:function(){if(this.config.isReloadOnClose){top.location.reload()};this.close()},close:function(){G('dialogBox').style.display='none'; + if(!this.config.isBackgroundCanClick)G('dialogBoxBG').style.display='none'; + if(this.config.isShowShadow)G('dialogBoxShadow').style.display='none';G('dialogBody').innerHTML=''; + this.showSome()},hiddenSome:function(){var tag=this.info.someHiddenTag.split(","); + if(tag.length==1&&tag[0]=="")tag.length=0; + for(var i=0;iparseInt(this.oObj.style.top)+25)iTop=iTop+12;this.oObj.style.left=iLeft;this.oObj.style.top=iTop;if(this.showShadow){G('dialogBoxShadow').style.left=iLeft+this.shadowWidth;G('dialogBoxShadow').style.top=iTop+this.shadowWidth};this.dragData={x:Event.pointerX(event),y:Event.pointerY(event)};document.body.style.cursor="move"},mouseup:function(event){if(!this.IsDraging)return;if(this.contentType==1)G("iframeBG").style.display="none";document.onmousemove=null;document.onmouseup=null;var mousX=Event.pointerX(event)-(document.documentElement.scrollLeft||document.body.scrollLeft);var mousY=Event.pointerY(event)-(document.documentElement.scrollTop||document.body.scrollTop);if(mousX<1||mousY<1||mousX>document.body.clientWidth||mousY>document.body.clientHeight){this.oObj.style.left=this.backData["x"];this.oObj.style.top=this.backData["y"];if(this.showShadow){G('dialogBoxShadow').style.left=this.backData.x+this.shadowWidth;G('dialogBoxShadow').style.top=this.backData.y+this.shadowWidth}};this.IsDraging=false;document.body.style.cursor="";Event.stopObserving(document,"selectstart",this.returnFalse,false)},returnFalse:function(){return false}}; + + + diff --git a/public.js b/public.js new file mode 100644 index 0000000..e738129 --- /dev/null +++ b/public.js @@ -0,0 +1,474 @@ +/* + * 打开新窗口 f:链接地址 n:窗口的名称 w:窗口的宽度 h:窗口的高度 s:窗口是否有滚动条，1：有滚动条；0：没有滚动条 + */ + + + +function openWin(f, n, w, h, s) +{ + var result=window.open(f,n,"dialogHeight:"+h+";dialogWidth:"+w+";"+s); + if(result==true) + { + window.location.reload(true); + } + else + { + //window.location.reload(true); + } + +} + + + + + +/* + * 删除记录 + */ +function del(url, info) +{ + //if (openDeleteDialog(url, info)) + //{ + //window.location.reload(true); + //} + if (confirm(info)) + { + var result=window.open(url,"window123","dialogHeight:234px;dialogWidth:271px;resizable:no;help:no;status:no;scroll:no"); + if(result==true) + { + window.location.reload(true); + } + else + { + + } + } + else + { + + } +} + + + +/* + * 校验checkbox + */ +function checkAll(chkName, checkboxName, pageSize) { + var src = event.srcElement; + var chkN = eval("document.all." + chkName); + + if (src.checked) { + chkN[0].checked = true; + chkN[1].checked = true; + for (var i = 0; i < pageSize; i++) { + var chk = eval("document.all." + checkboxName + i); + if (chk) { + chk.checked = true; + } + } + } else { + chkN[0].checked = false; + chkN[1].checked = false; + for (var i = 0; i < pageSize; i++) { + var chk = eval("document.all." + checkboxName + i); + if (chk) { + chk.checked = false; + } + } + } +} + +/* + * + */ +function makePages(maxPage, selectedPage, selectName) { + var sel = eval("document.all." + selectName); + sel.length = 0; + for (var i = 1; i <= maxPage; i++) { + sel.options[i] = new Option(i, i); + if (sel.options[i] == selectedPage) { + sel.options[i].selected = true; + } + } +} + + + +/* + * 替换字符串 + */ +function replaceStr(str) { + var re = "/( )/gi"; + str = str.replace(re, ""); + re = "/\= 0 && whitespace.indexOf(s.charAt(i)) != -1) { + i--; + } + s = s.substring(0, i + 1); + } + return s; +} + +/* + * 去掉两边空格 + */ +function Trim(str) { + return RTrim(LTrim(str)); +} + + + + +/* + * + */ +function exeOperation(exePath) { + var obj = new ActiveXObject("Microsoft.XMLHTTP"); + obj.open("post", exePath, false); + obj.send(); + var res = obj.responseText; + var rs = Trim(res); + if (rs.indexOf('true', 0) != -1) { + return true; + } else { + return false; + } +} + +/* + * + */ +function exeValidate(exePath) { + var obj = new ActiveXObject("Microsoft.XMLHTTP"); + obj.open("post", exePath, false); + obj.send(); + var res = obj.responseText; + var rs = Trim(res); + if (rs.indexOf('validate_login_user', 0) != -1) { + return true; + } else { + return false; + } +} + + + +/* + * 显示 + */ +function validate_date(exePath) { + var obj = new ActiveXObject("Microsoft.XMLHTTP"); + obj.open("post", exePath, false); + obj.send(); + var res = obj.responseText; + var rs = Trim(res); + var begin_str = ""; + var beginIndex = rs.indexOf(begin_str) + begin_str.length; + var endIndex = rs.indexOf(""); + rs = ((beginIndex >= 0) && (endIndex >= 0)) ? rs.substring(beginIndex, + endIndex) : ""; + return Trim(rs); +} + +/* + * 校验是否数字 + */ +function checkNumber(name, TempS) { + for (Count = 0; Count < TempS.length; Count++) { + TempChar = TempS.substring(Count, Count + 1); + RefString = "0123456789"; + if (RefString.indexOf(TempChar, 0) == -1) { + alert("请输入数字"); + eval("document.all." + name).focus(); + return false; + } + } +} + + + +/* + * 是否有非法字符 + */ +function chksafe(a) { + fibdn = new Array("'", "\\"); + i = fibdn.length; + j = a.length; + for (ii = 0; ii < i; ii++) { + for (jj = 0; jj < j; jj++) { + temp1 = a.charAt(jj); + temp2 = fibdn[ii]; + if (temp1 == temp2) { + return false; + } + } + } + return true; +} + +/* + * + */ +function fucCheckNUM(NUM) { + var i, j, strTemp; + strTemp = "0123456789"; + if (NUM.length == 0) + return false; + for (i = 0; i < NUM.length; i++) { + j = strTemp.indexOf(NUM.charAt(i)); + if (j == -1) { + return false; + } + } + return true; +} + + + +/* + * + */ +function fucCheckLength(strTemp) { + var i, sum; + sum = 0; + for (i = 0; i < strTemp.length; i++) { + if ((strTemp.charCodeAt(i) >= 0) && (strTemp.charCodeAt(i) <= 255)) { + sum = sum + 1; + } else { + sum = sum + 2; + } + } + return sum; +} + +/* + * + */ +function chkElements(name, errMsg, max_length, lengthMsg) { + var el_name = eval("document.all." + name); + var v = el_name.value; + if (!chksafe(v)) { + el_name.focus(); + alert(errMsg); + return false; + } else if (fucCheckLength(v) > max_length) { + el_name.focus(); + alert(lengthMsg); + return false; + } + return true; +} + + + +/* + * 校验空字符串 + */ +function checkNullStr(name, msg) { + var el_name = eval("document.all." + name); + if (Trim(el_name.value).length == 0) { + alert(msg); + el_name.focus(); + return false; + } + return true; +} + + + + +/* + * 显示日期控jian + */ +function GetDate(nText, para) { + var v_url = para == "1" ? "./common/data.html" : "../../common/data.html"; + var reVal = window + .open( + v_url, + 'data', + "status:no;center:yes;scroll:no;resizable:no;dialogWidth:255px;dialogHeight:260px"); + if (reVal != null) { + var n = eval("document.all." + nText); + n.value = reVal; + } +} + + + +/* + * 按比例缩小图片 + */ +function DrawImage(ImgD, iwidth, iheight) { + var flag = false; + var image = new Image(); + image.src = ImgD.src; + if (image.width > 0 && image.height > 0) { + flag = true; + if (image.width / image.height >= iwidth / iheight) { + if (image.width > iwidth) { + ImgD.width = iwidth; + ImgD.height = (image.height * iwidth) / image.width; + } else { + ImgD.width = image.width; + ImgD.height = image.height; + } + // ImgD.alt=image.width+"×"+image.height; + } else { + if (image.height > iheight) { + ImgD.height = iheight; + ImgD.width = (image.width * iheight) / image.height; + } else { + ImgD.width = image.width; + ImgD.height = image.height; + } + // ImgD.alt=image.width+"×"+image.height; + } + } + ImgD.style.visibility = "visible"; +} + + + +/* + * 回车键转为Tab键 + */ +function enterTab() { + if (event.keyCode == 13) { + oElement = document.activeElement; + if (oElement.tagName != "TEXTAREA" && oElement.type != "button") + event.keyCode = 9; + return; + } +} + +/* + * + */ +function objectEval(text) { + text = text.replace(/\n/g, " "); + text = text.replace(/\r/g, " "); + if (text.match(/^\s*\{.*\}\s*$/)) { + text = "[" + text + "]"; + } + return eval(text)[0]; +} + + + +/* + * 打开领导查询页面 action - 查询的Action method - 调用的方法 title - 标题message name - + * 员工选择域的name + */ +function openLeaderQuery(action, method, title, name) { + openWin("../../common/selectStaff.jsp?action=" + action + "&method=" + + method + "&title=" + title + "&name=" + name, + "public_leader_find_page", "400", "150"); +} + +/* + * 第一行变色 + */ +function chgColor() { + var v_table = document.all["PowerTable"]; + var v_row = v_table.rows[1]; + var len = v_row.cells.length; + for (var i = 0; i < len; i++) { + var v_cell = v_row.cells[i]; + v_cell.style.backgroundColor = "yellow"; + } +} + +/* + * 第一行变色 + */ +function chgColor2() { + var v_table = document.all["PowerTable"]; + var rows_count = v_table.rows.length; + var v_row, v_cell, temp_len, len; + var rowspan = 0; + + // get rowspan + if (v_table.rows.length > 1) { + len = v_table.rows[1].cells.length; + for (var r = 2; r < rows_count; r++) { + v_row = v_table.rows[r]; + temp_len = v_row.cells.length; + if (temp_len == len) { + rowspan = r - 1; + break; + } + } + + rowspan = (rowspan > 0) ? (rowspan + 1) : rows_count; + for (var r = 1; r < rowspan; r++) { + v_row = v_table.rows[r]; + for (var t = 0; t < v_row.cells.length; t++) { + v_cell = v_row.cells[t]; + v_cell.style.backgroundColor = "yellow"; + } + } + } +} + + + +/* + * 添加页面载入后触发的shijian + */ +function addLoadEvent(func) { + var oldonload = window.onload; + if (typeof(window.onload) != "function") { + window.onload = func; + } else { + window.onload = function() { + oldonload(); + func(); + } + } +} + + + +// adsName:名称,adsUrl:地址,sTime:时间(小时) add by wujie 2005.12.12 +function PopAds(adsName, adsUrl, sTime, number, w, h, s) { + if (document.cookie.indexOf(adsName) == -1) { + window.open(adsUrl, adsName); + self.focus(); + var expireDate = new Date(); + var lefttime = 1000 * (3600 * sTime); + expireDate.setTime(expireDate.getTime() + lefttime); + document.cookie = adsName + "=yes" + "; expires=" + + expireDate.toGMTString() + ";"; + } + openWin(adsUrl, number, w, h, s); +} diff --git a/updown.jsp b/updown.jsp new file mode 100644 index 0000000..17aaf14 --- /dev/null +++ b/updown.jsp @@ -0,0 +1,49 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<%@ page import="com.jspsmart.upload.*" %> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + <% + try + { + String fujianPath=request.getParameter("fujianPath");//获得图片路径 + String fujianYuashiMing=request.getParameter("fujianYuashiMing");//获得图片的原始名 + fujianYuashiMing=java.net.URLDecoder.decode(fujianYuashiMing,"UTF-8");//图片原始名的编码方式 + System.out.println(fujianYuashiMing+fujianPath);//输出图片的原始名和路径 + + SmartUpload su = new SmartUpload(); // 新建一个SmartUpload对象 + + su.initialize(pageContext); // 初始化 + + su.setContentDisposition(null); + // 设定contentDisposition为null以禁止浏览器自动打开文件， + //保证点击链接后是下载文件。若不设定，则下载的文件扩展名为 + //doc时，浏览器将自动用word打开它。扩展名为pdf时，将用acrobat打开 + su.downloadFile(fujianPath, null, new String(fujianYuashiMing.getBytes(), "ISO8859-1")); // 下载中文文件 + out.clear(); + out=pageContext.pushBody(); + } + catch(Exception e) + {%> + + <%} + %> + + + + diff --git a/userreg.jsp b/userreg.jsp new file mode 100644 index 0000000..98753b4 --- /dev/null +++ b/userreg.jsp @@ -0,0 +1,122 @@ +<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%> +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + + + + +
+ +
+ + + + + +
+
+ +
+
+

  会员注册

+
+
+ + + + + + + + + + + + + + + + + +
+ 账号： + +   + +
+ 密码： + +   + +
+ 姓名： + +   + +
+   + +   + + +
+
+
+
+
+ + + + +
 
+
+
+ + +
+ + diff --git a/xinyongAdd.jsp b/xinyongAdd.jsp index 28c1a47..b8dbb07 100644 --- a/xinyongAdd.jsp +++ b/xinyongAdd.jsp @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD <%@page import="java.text.SimpleDateFormat"%> <%@page import="java.util.Date"%> <%@ page language="java" pageEncoding="UTF-8"%> @@ -35,6 +36,8 @@ String path = request.getContextPath(); // 获取应用的上下文路径 document.formAdd.submit(); // 提交表单 ======= +======= +>>>>>>> remotes/origin/wyc_branch <%@page import="java.text.SimpleDateFormat"%> <%@page import="java.util.Date"%> <%@ page language="java" pageEncoding="UTF-8"%> @@ -67,11 +70,15 @@ String path = request.getContextPath(); } document.formAdd.submit(); //如果不为空则提交信息 +<<<<<<< HEAD >>>>>>> remotes/origin/wyp_branch +======= +>>>>>>> remotes/origin/wyc_branch } +<<<<<<< HEAD <<<<<<< HEAD
@@ -79,37 +86,51 @@ String path = request.getContextPath(); >>>>>>> remotes/origin/wyp_branch +======= + + +>>>>>>> remotes/origin/wyc_branch +<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> remotes/origin/wyp_branch +======= +>>>>>>> remotes/origin/wyc_branch +<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> remotes/origin/wyp_branch +======= +>>>>>>> remotes/origin/wyc_branch @@ -120,27 +141,39 @@ String path = request.getContextPath(); >>>>>>> remotes/origin/wyp_branch +======= + + + +>>>>>>> remotes/origin/wyc_branch ======= +======= +>>>>>>> remotes/origin/wyc_branch "/> +<<<<<<< HEAD >>>>>>> remotes/origin/wyp_branch +======= +>>>>>>> remotes/origin/wyc_branch
  
评价属性： +<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> remotes/origin/wyp_branch +======= +>>>>>>> remotes/origin/wyc_branch 好评      差评
评价内容： +<<<<<<< HEAD <<<<<<< HEAD
评价时间： +<<<<<<< HEAD <<<<<<< HEAD "/>
  +<<<<<<< HEAD <<<<<<< HEAD "/>   @@ -149,6 +182,11 @@ String path = request.getContextPath();     >>>>>>> remotes/origin/wyp_branch +======= + "/> +   +   +>>>>>>> remotes/origin/wyc_branch