diff --git a/base.css b/base.css index 93f220b..a5ce312 100644 --- a/base.css +++ b/base.css @@ -1,6 +1,10 @@ * { font-size: 12px; +<<<<<<< HEAD font-family: " "; +======= + font-family: ""; +>>>>>>> remotes/origin/wyp_branch } td { line-height: 1.5; } @@ -8,7 +12,11 @@ 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;} @@ -34,9 +42,15 @@ 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 { @@ -54,7 +68,11 @@ a strong{ } input { border: 1px solid #ababab; } +<<<<<<< HEAD /*.aΪ */ +======= +/*.aΪ*/ +>>>>>>> remotes/origin/wyp_branch .pubinputs { height: 22px; width:250px; @@ -281,6 +299,7 @@ border:1px solid #ffffff; .tblist td{ background:#FFFFFF; padding:6px; +<<<<<<< HEAD }/* 通用样式 */ * { font-size: 12px; /* 设置默认字体大小为12px */ @@ -685,6 +704,9 @@ input { padding: 6px; /* 设置内边距 */ } +======= +} +>>>>>>> remotes/origin/wyp_branch .tblist td.tbsname{ background:#F9FFE6; padding:6px; diff --git a/catelogAdd.jsp b/catelogAdd.jsp new file mode 100644 index 0000000..f3123b6 --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
  
+ 类别名称： + + +
+   + +   +   +
+
+ + diff --git a/catelogMana.jsp b/catelogMana.jsp new file mode 100644 index 0000000..ff2528b --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
序号类别名称操作
+ ${sta.index+1} + + ${catelog.name} + + +
+ + + + + +
+ +
+ + diff --git a/cont.css b/cont.css index 6c8cb93..396bc5f 100644 --- a/cont.css +++ b/cont.css @@ -1,5 +1,6 @@ /* CSS Document */ +<<<<<<< HEAD /* Body样式 */ body{ padding:0px; /* 设置body的内边距为0 */ @@ -128,4 +129,113 @@ body{ letter-spacing:3px; /* 设置字母间距为3px */ text-align:center; /* 设置文本居中 */ padding-top:3px; /* 设置顶部内边距为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 } diff --git a/cont.jsp b/cont.jsp index 7998dba..1842cd4 100644 --- a/cont.jsp +++ b/cont.jsp @@ -6,6 +6,7 @@ +<<<<<<< HEAD <%@ page language="java" import="java.util.*" pageEncoding="utf-8" %> <% // 获取当前请求的上下文路径，通常用于生成相对路径 @@ -116,6 +117,9 @@ +======= + +>>>>>>> remotes/origin/wyp_branch diff --git a/fail.jsp b/fail.jsp new file mode 100644 index 0000000..8c99466 --- /dev/null +++ b/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+"/"; +%> + + + + + + + + + + + + +
账号或密码错误
+ + diff --git a/foot.jsp b/foot.jsp index 869df2e..68441ea 100644 --- a/foot.jsp +++ b/foot.jsp @@ -1,12 +1,16 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8" %> <% +<<<<<<< HEAD // 获取当前请求的上下文路径，用于生成相对路径 +======= +>>>>>>> remotes/origin/wyp_branch String path = request.getContextPath(); %> +<<<<<<< HEAD @@ -25,5 +29,17 @@ +======= + + + + + + + + + + +>>>>>>> remotes/origin/wyp_branch diff --git a/goodsAdd.jsp b/goodsAdd.jsp new file mode 100644 index 0000000..041d55c --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
+ 类别： + + + + + + +
+ + + + +
+
+ 编号： + + +
+ 名称： + + +
+ 介绍： + + + +
+ 图片： + + + + +
+ 价格： + + + +
+   + +   +   +
+
+ + diff --git a/goodsDetailHou.jsp b/goodsDetailHou.jsp new file mode 100644 index 0000000..f405c49 --- /dev/null +++ b/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"%> + + + + + + + + + + + + + + + + +
+ +
+ + diff --git a/goodsMana.jsp b/goodsMana.jsp new file mode 100644 index 0000000..90dd123 --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
序号编号名称介绍图片价格操作
${sta.index+1}${goods.bianhao}${goods.mingcheng}商品描述
图片
${goods.shichangjia} + + +
+ + + + + + +
+ +
+ + + + diff --git a/goodsPre.jsp b/goodsPre.jsp new file mode 100644 index 0000000..986c10a --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
+ 类别： + + + + + + +
+ + + +
+
+ 编号： + + +
+ 名称： + + +
+ 介绍： + + + +
+ 图片： + + + + +
+ 价格： + + + +
+   + + +   +   +
+
+ + diff --git a/huifuAdd.jsp b/huifuAdd.jsp new file mode 100644 index 0000000..4919a81 --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
  
+ 信息内容： + + +
+   + + "/> +   +   +
+
+ + diff --git a/index.css b/index.css index a5c1bf7..cdf91d1 100644 --- a/index.css +++ b/index.css @@ -1,5 +1,6 @@ /* CSS Document */ +<<<<<<< HEAD /* Body部分样式 */ body{ margin:0px; /* 设置页面的外边距为0，去除默认的外边距 */ @@ -52,3 +53,45 @@ body{ input:hover{ background-color:#A0D1FF; /* 设置鼠标悬停时输入框的背景颜色为浅蓝色 */ } +======= +body{ + margin:0px; + padding:50px 0px 0px 0px; + background-color:#5c86ad; + font-size:12px; + color:#133B61; +} +/*indexҳCSS*/ +.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 diff --git a/left.jsp b/left.jsp index 9d77794..f15a32f 100644 --- a/left.jsp +++ b/left.jsp @@ -1,11 +1,17 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8" %> <% +<<<<<<< HEAD String path = request.getContextPath(); // 获取应用的上下文路径 %> +======= + String path = request.getContextPath(); +%> +>>>>>>> remotes/origin/wyp_branch +<<<<<<< HEAD @@ -63,10 +69,63 @@ document.getElementById(str1).style.background="url('/dingcan/images/3_13.gif')"; document.getElementById(str).style.display="block"; // 将子菜单设为块级元素显示 } +======= + + + + + + + + + + +<<<<<<< HEAD @@ -76,11 +135,22 @@ +======= +
导航菜单
+ + +<<<<<<< HEAD +<<<<<<< HEAD @@ -67,6 +85,30 @@ String path = request.getContextPath(); // 获取应用的上下文路径 + + + + + + + + + + + + diff --git a/xinyongAdd.jsp b/xinyongAdd.jsp index 887d778..28c1a47 100644 --- a/xinyongAdd.jsp +++ b/xinyongAdd.jsp @@ -1,3 +1,4 @@ +<<<<<<< HEAD <%@page import="java.text.SimpleDateFormat"%> <%@page import="java.util.Date"%> <%@ page language="java" pageEncoding="UTF-8"%> @@ -33,54 +34,121 @@ String path = request.getContextPath(); // 获取应用的上下文路径 } document.formAdd.submit(); // 提交表单 +======= +<%@page import="java.text.SimpleDateFormat"%> +<%@page import="java.util.Date"%> +<%@ page language="java" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ page isELIgnored="false"%> + +<% +String path = request.getContextPath(); +%> + + + + + + + + + + + + + +<<<<<<< HEAD +======= + + +>>>>>>> remotes/origin/wyp_branch
+ + + + + +>>>>>>> remotes/origin/wyp_branch
导航菜单
@@ -88,13 +158,26 @@ +<<<<<<< HEAD + +
+ + + +<<<<<<< HEAD + +<<<<<<< HEAD +======= + + +>>>>>>> remotes/origin/wyp_branch +<<<<<<< HEAD +======= + +>>>>>>> remotes/origin/wyp_branch +<<<<<<< HEAD +======= + +>>>>>>> remotes/origin/wyp_branch +<<<<<<< HEAD +======= + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +>>>>>>> remotes/origin/wyp_branch
@@ -156,11 +260,160 @@
+ + + + + +
 
+ + +>>>>>>> remotes/origin/wyp_branch diff --git a/liuyanHuifu.jsp b/liuyanHuifu.jsp new file mode 100644 index 0000000..9855dff --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + +
信息交流
+ 回复内容： + + +
+   + + "/> +   +   +
+
+ + diff --git a/liuyanMana.jsp b/liuyanMana.jsp new file mode 100644 index 0000000..9de707b --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
序号信息内容发布时间回复信息回复时间操作
+ ${sta.index+1 } + + ${liuyan.neirong } + + ${liuyan.liuyanshi } + + ${liuyan.huifu } + + ${liuyan.huifushi } + + + +
+ + diff --git a/msg.jsp b/msg.jsp new file mode 100644 index 0000000..60f3c85 --- /dev/null +++ b/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+"/"; +%> + + + + + + + + + + + + +
${requestScope.msg}
+ + diff --git a/orderMana.jsp b/orderMana.jsp new file mode 100644 index 0000000..96607b1 --- /dev/null +++ b/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(); +%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
序号订单编号下单时间状态排队计时送货地址付款方式总金额明细用户信息操作
${ss.index+1}${order.bianhao}${order.shijian} + + 未受理   受理订单 + + + 已受理 + + + ${order.huifu} +    计时 + + ${order.songhuodizhi}${order.fukuanfangshi}${order.jine} + +
+ + diff --git a/qiantai.css b/qiantai.css index 439b995..b27677a 100644 --- a/qiantai.css +++ b/qiantai.css @@ -1,9 +1,14 @@ +<<<<<<< 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 样式 */ body { margin: 0; /* 去除外边距 */ @@ -322,4 +327,422 @@ hr { display: none; } #footer a { color: #E5FFC4; /* 设置链接颜色 */ +======= +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 } diff --git a/right.jsp b/right.jsp index b59f7e0..ed6efa8 100644 --- a/right.jsp +++ b/right.jsp @@ -1,12 +1,17 @@ <%@ page language="java" import="java.util.*" pageEncoding="ISO-8859-1"%> <% +<<<<<<< HEAD // 获取当前请求的上下文路径，通常用于生成相对路径 String path = request.getContextPath(); +======= +String path = request.getContextPath(); +>>>>>>> remotes/origin/wyp_branch %> +<<<<<<< HEAD @@ -15,11 +20,23 @@ +======= + + + + + + +>>>>>>> remotes/origin/wyp_branch +<<<<<<< HEAD welcome.
+======= + welcome.
+>>>>>>> remotes/origin/wyp_branch diff --git a/succ.jsp b/succ.jsp new file mode 100644 index 0000000..bb028c5 --- /dev/null +++ b/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+"/"; +%> + + + + + + + + + + + + +
通过验证,登录成功
+ + diff --git a/success.jsp b/success.jsp new file mode 100644 index 0000000..01586f0 --- /dev/null +++ b/success.jsp @@ -0,0 +1,28 @@ +<%@ page language="java" pageEncoding="UTF-8"%> +<% + String path = request.getAttribute("path").toString(); + String message = request.getAttribute("message").toString(); +%> + + + + + + + + + + + + + + diff --git a/top.jsp b/top.jsp index f00e705..525d98c 100644 --- a/top.jsp +++ b/top.jsp @@ -1,12 +1,16 @@ <%@ page language="java" import="java.util.*" pageEncoding="utf-8" %> <% +<<<<<<< HEAD // 获取当前请求的上下文路径，通常用于生成相对路径 +======= +>>>>>>> remotes/origin/wyp_branch String path = request.getContextPath(); %> +<<<<<<< HEAD @@ -52,5 +56,38 @@ 返回首页 +======= + + + + + + + + + + + + + 基于JSP的高校快餐店订餐系统 + + + 注销退出 + 返回首页 + +>>>>>>> remotes/origin/wyp_branch diff --git a/userDetail.jsp b/userDetail.jsp index 153285c..e64f33d 100644 --- a/userDetail.jsp +++ b/userDetail.jsp @@ -1,3 +1,4 @@ +<<<<<<< HEAD package com.itbaizhan.action; import java.io.IOException; @@ -197,3 +198,88 @@ public class user_servlet extends HttpServlet { } } +======= +<%@ 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(); +%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
  
序号账号密 码姓名操作
+ ${ss.index+1} + + ${user.loginname} + + ${user.loginpw} + + ${user.name} + + +
+ + + +     +
+ + + + + + + + + + +
属性：${xinyong.shuxing}
评价内容：${xinyong.neirong}
评价时间：${xinyong.shijian}
+
+
+ + + +>>>>>>> remotes/origin/wyp_branch diff --git a/userMana.jsp b/userMana.jsp index 45f8de5..a8a162c 100644 --- a/userMana.jsp +++ b/userMana.jsp @@ -3,7 +3,11 @@ <%@ 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 %> @@ -15,6 +19,7 @@ String path = request.getContextPath(); // 获取应用的上下文路径 +<<<<<<< HEAD @@ -30,6 +35,18 @@ String path = request.getContextPath(); // 获取应用的上下文路径 { // 如果确认删除，跳转到对应的删除页面，并传递用户 ID window.location.href="<%=path %>/user?type=userDel&id="+id; +======= + + + + + @@ -41,6 +58,7 @@ String path = request.getContextPath(); // 获取应用的上下文路径 		  
序号 账号 密 码 +======= + 序号账号密 码姓名操作
+ ${ss.index+1} + + ${user.loginname} + + ${user.loginpw} + + ${user.name} + + +>>>>>>> remotes/origin/wyp_branch
+<<<<<<< HEAD +======= +>>>>>>> remotes/origin/wyp_branch +<<<<<<< HEAD +======= +>>>>>>> remotes/origin/wyp_branch +======= + + + +>>>>>>> remotes/origin/wyp_branch +======= + "/> + + + +>>>>>>> remotes/origin/wyp_branch
  
评价属性： +<<<<<<< HEAD +======= +>>>>>>> remotes/origin/wyp_branch 好评      差评
评价内容： +<<<<<<< HEAD
评价时间： +<<<<<<< HEAD "/>
  +<<<<<<< HEAD "/>   +======= + "/> +   +   +>>>>>>> remotes/origin/wyp_branch