diff --git a/src/main/java/com/phy/ebuy/controller/EbuyController.java b/src/main/java/com/phy/ebuy/controller/EbuyController.java index b4c7fea..c0fe91f 100644 --- a/src/main/java/com/phy/ebuy/controller/EbuyController.java +++ b/src/main/java/com/phy/ebuy/controller/EbuyController.java @@ -101,6 +101,12 @@ public class EbuyController { return "/account/personalHomepage/toBeEvaluated.html"; } + //购物车页面 + @RequestMapping("/cart") + public String cart() { + return "/cart.html"; + } + //验证登录 @ResponseBody @RequestMapping("/verifyLogin") @@ -139,8 +145,19 @@ public class EbuyController { //获取全部订单 @RequestMapping("/allOrderTable") @ResponseBody - public List> allOrderTable() { - List> result = ebuyService.allOrderTable(); + public List> allOrderTable(@RequestParam("orderStatus") String orderStatus) { + List> result = ebuyService.allOrderTable(orderStatus); + return result; + } + + //获取商品分类 + @RequestMapping("/commodityType") + @ResponseBody + public List> commodityType(String typeDowns) { + String str = typeDowns.substring(typeDowns.indexOf("[")+2,typeDowns.indexOf("]")-1); + String[] typeDownsArr = str.split("\",\""); + List> result = new ArrayList<>(); + result = ebuyService.typeDown(typeDownsArr); return result; } diff --git a/src/main/java/com/phy/ebuy/dao/EbuyMapper.java b/src/main/java/com/phy/ebuy/dao/EbuyMapper.java index 9b9d904..aad5a6a 100644 --- a/src/main/java/com/phy/ebuy/dao/EbuyMapper.java +++ b/src/main/java/com/phy/ebuy/dao/EbuyMapper.java @@ -1,6 +1,7 @@ package com.phy.ebuy.dao; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.One; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -21,10 +22,16 @@ public interface EbuyMapper { /** * 所有订单Table */ - List> allOrderTable(); + List> allOrderTable(String orderStatus); /** * 查询字典表 */ List> queryDictionary(String[] ids); + + /** + * 获取商品分类 + */ + String[] typeDown(String typeDown); + } diff --git a/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml b/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml index 5daf66b..7a5618b 100644 --- a/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml +++ b/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml @@ -31,7 +31,7 @@ - SELECT o.creat_time creat_time, o.order_id order_id, @@ -47,6 +47,10 @@ FROM ebuy_order o INNER JOIN ebuy_businesses b ON o.businesses_id = b.business_id INNER JOIN ebuy_commodity c ON o.commodity_id = c.commodity_id + where 1 = 1 + + and order_status=#{orderStatus} + @@ -61,4 +65,14 @@ WHERE #{id} + + + \ No newline at end of file diff --git a/src/main/java/com/phy/ebuy/service/EbuyService.java b/src/main/java/com/phy/ebuy/service/EbuyService.java index 51cee53..b56efdd 100644 --- a/src/main/java/com/phy/ebuy/service/EbuyService.java +++ b/src/main/java/com/phy/ebuy/service/EbuyService.java @@ -18,5 +18,10 @@ public interface EbuyService{ /** * 所有订单Table */ - List> allOrderTable(); + List> allOrderTable(String orderStatus); + + /** + * 获取商品分类 + */ + List> typeDown(String[] typeDown); } diff --git a/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java b/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java index 1e2b830..96d8d79 100644 --- a/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java +++ b/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java @@ -5,6 +5,7 @@ import com.phy.ebuy.service.EbuyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -46,8 +47,11 @@ public class EbuyServiceImpl implements EbuyService { } @Override - public List> allOrderTable() { - List> result = ebuyMapper.allOrderTable(); + public List> allOrderTable(String orderStatus) { + if ("05".equals(orderStatus)) { + orderStatus = null; + } + List> result = ebuyMapper.allOrderTable(orderStatus); for (Map map : result ) { String ids = (String) map.get("commodity_attribute"); String[] idses = ids.split(","); @@ -62,4 +66,14 @@ public class EbuyServiceImpl implements EbuyService { } return result; } + + @Override + public List> typeDown(String[] typeDowns) { + List> result = new ArrayList<>(); + for (int i = 0; i < typeDowns.length; i++) { + String[] one = {}; + one = ebuyMapper.typeDown(typeDowns[i]); + } + return result; + } } diff --git a/src/main/java/com/phy/ebuy/util/Folder.java b/src/main/java/com/phy/ebuy/util/Folder.java new file mode 100644 index 0000000..7ed48e3 --- /dev/null +++ b/src/main/java/com/phy/ebuy/util/Folder.java @@ -0,0 +1,36 @@ +/* +package com.phy.ebuy.util; + +import com.phy.ebuy.dao.EbuyMapper; + + +import java.io.File; +import java.util.List; +import java.util.Map; + +*/ +/** + * 建文件夹 + *//* + +public class Folder{ + public static void main(String[] args) { + EbuyMapper ebuyMapper = null; + List> list = ebuyMapper.file(); + for ( Map one : list) { + File file=new File("D:\\work\\IDEAwork\\ebuy\\src\\main\\webapp\\static\\img\\commodity\\"+one.get("type_down")); + if(!file.exists()){//如果文件夹不存在 + file.mkdir();//创建文件夹 + } + File file1=new File("D:\\work\\IDEAwork\\ebuy\\src\\main\\webapp\\static\\img\\commodity\\"+one.get("type_down")+"\\"+one.get("type_down_details")); + if(!file1.exists()){//如果文件夹不存在 + file1.mkdir();//创建文件夹 + } + } + + System.out.println("已创建文件夹"); + } + + +} +*/ diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html index 2309e4c..abce185 100644 --- a/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html @@ -4,13 +4,14 @@ 待付款 + + + + +
- - - -
宝贝
@@ -22,175 +23,11 @@
交易操作
- -
-
-
-
2020-01-13
-
订单号: 814491555504605953
-
-
- 幽炫数码专营店 -
-
-
-
- -
-
【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]
-
内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条
-
-
-
- ￥229.00 -
-
1
-
- 违规举报 -
-
- ￥241.00 - (含运费：￥12.00) -
-
- 等待买家付款 - 订单详情 -
-
- - 找朋友帮忙付 - 取消订单 - 修改订单 -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html index 401b333..e74731d 100644 --- a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html @@ -4,13 +4,13 @@ 待评价 + + + +
-
- - 订单搜索 -
宝贝
@@ -22,175 +22,11 @@
交易操作
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
2020-01-13
-
订单号: 814491555504605953
-
-
- 幽炫数码专营店 -
-
-
-
- -
-
【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]
-
内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条
-
-
-
- ￥229.00 -
-
1
-
- 退款/退货 -
-
- ￥241.00 - (含运费：￥12.00) -
-
- 买家已付款 - 订单详情 -
-
- 提醒卖家发货 -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html index 50d720f..3755ef0 100644 --- a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html @@ -4,13 +4,14 @@ 待收货 + + + + +
- - - -
宝贝
@@ -22,175 +23,12 @@
交易操作
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
2020-01-13
-
订单号: 814491555504605953
-
-
- 幽炫数码专营店 -
-
-
-
- -
-
【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]
-
内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条
-
-
-
- ￥229.00 -
-
1
-
- 退款/退换货 - 投诉商家 - 退运保险 -
-
- ￥241.00 - (含运费：￥12.00) -
-
- 等待买家付款 - 订单详情 - 花呗账单 - 查看物流 -
-
- - 申请开票 -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html index 8da1f05..c13cd42 100644 --- a/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html @@ -4,15 +4,13 @@ 待发货 - + + +
- - - -
宝贝
@@ -24,179 +22,12 @@
交易操作
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
2020-01-13
-
订单号: 814491555504605953
-
-
- 幽炫数码专营店 -
-
-
-
- -
-
【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]
-
内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条
-
-
-
- ￥229.00 -
-
1
-
- 申请售后 - 投诉商家 -
-
- ￥241.00 - (含运费：￥12.00) -
-
- 交易成功 - 订单详情 - 花呗账单 - 查看物流 -
-
-
评价
-
-
-
- - + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/cart.html b/src/main/webapp/WEB-INF/view/cart.html new file mode 100644 index 0000000..ffbf310 --- /dev/null +++ b/src/main/webapp/WEB-INF/view/cart.html @@ -0,0 +1,88 @@ + + + + + 我的购物车 + + + + + + + + +
+ +
+
+ +
+ +
搜索
+
+
+
+
+
+
商品信息
+
+
单价
+
数量
+
金额
+
操作
+
+
+
+
+ + 店铺： + CEDY潮牌店 +
+
+
+ +
+
+ +
+ ins嘻哈国潮棉服oversize宽松大毛领连帽中长款男女情侣棉衣外套 +
+
+
+ 修改 + +

颜色：米白色（现货）

+

尺码：XL

+
+
+ ￥268.00 +
+
+
+
-
+ +
+
+
+
+
￥268.00
+
+

移入收藏夹

+

删除

+

相似宝贝

+
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/middle.html b/src/main/webapp/WEB-INF/view/middle.html index 50c0e20..f5bca6a 100644 --- a/src/main/webapp/WEB-INF/view/middle.html +++ b/src/main/webapp/WEB-INF/view/middle.html @@ -7,6 +7,7 @@ +
@@ -33,19 +34,15 @@
@@ -415,7 +416,7 @@ - - + + \ No newline at end of file diff --git a/src/main/webapp/static/css/account.css b/src/main/webapp/static/css/account.css index 5aac939..e503254 100644 --- a/src/main/webapp/static/css/account.css +++ b/src/main/webapp/static/css/account.css @@ -14,17 +14,17 @@ body{ flex-direction:column; } .head{ - height: 5em; - padding: 0 10%; + height: 5em; + padding: 0 17.5%; background: #17b5fe; } .head .my-logo{ float: left; height: 100%; width: 15%; - background-image: url("../img/my-logo.png"); + background-image: url(../img/my-logo.png); background-repeat: no-repeat; - background-position: center; + background-position: -16px 0; background-size: 100% 100%; cursor: pointer; } @@ -48,6 +48,7 @@ body{ float: right; width: 30%; height: 100%; + margin-right: -6px; } .head .search input{ diff --git a/src/main/webapp/static/css/cart.css b/src/main/webapp/static/css/cart.css new file mode 100644 index 0000000..66f1e5d --- /dev/null +++ b/src/main/webapp/static/css/cart.css @@ -0,0 +1,239 @@ +*{ + box-sizing: border-box; + margin: 0; + padding: 0; +} +html{ + width: 100%; + height: 100%; +} +body{ + width: 100%; + height: 100%; +} +.checkbox,img,.hand-shape{ + cursor: pointer; +} +.header{ + height: 6em; + padding: 0 17.5%; +} +.header .logo{ + height: 100%; + width: 30%; + line-height: 6em; + float: left; +} +.header .logo img{ + width: 150px; + margin-left: -7px; + float: left; +} +.header .logo p{ + float: left; + margin-left: 0.2em; + font-weight: bold; + font-size: 2em; + color: rgb(60,60,60); +} +.header .search{ + float: right; + width: 40%; + border: 2px solid #17b5fe; + height: 3em; + margin: 1.5em 0; +} +.header .search .check-type{ + float: left; + height: 100%; + width: 20%; +} +.header .search .check-type select{ + height: 100%; + width: 100%; + background: rgb(245,245,245); + border: 1px solid rgb(229,229,229); + color: rgb(107,107,107); + text-align: center; + text-align-last: center; + +} +.header .search input{ + float: left; + height: 100%; + width: 60%; + text-indent: 10px; + font-size: 1.1em; +} +.header .search .button{ + float: left; + height: 100%; + line-height: 1.9em; + background: #17b5fe; + width: 20%; + color: #fff; + font-size: 1.5em; + text-align: center; +} +.middle{ + width: 65%; + margin: 0 auto; +} +.middle .cart-header{ + display: flex; + /*background: rgb(245,245,245);*/ + height: 3em; + line-height: 3em; + margin-top: 1em; +} +.middle .null{ + flex:1; + padding: 1em 0 0 1em; +} +.middle .commodity-info{ + flex:14; + text-align: center; + padding: 0 1em; +} + +.middle .commodity-attribute{ + flex: 8; + text-align: center; + padding: 0 1em; +} +.middle .commodity-price{ + flex: 6; + text-align: center; + padding: 0 1em; +} +.middle .commodity-amount{ + flex:5; + text-align: center; + padding: 0 1em; +} +.middle .commodity-money{ + flex:5; + text-align: center; + padding: 0 1em; +} +.middle .operation{ + flex:10; + text-align: center; + padding: 0 1em; +} +.middle .cart-info .info-one{ + margin-top: 1em; + /*background: rgb(245,245,245);*/ + /*height: 3em;*/ + /*line-height: 3em;*/ + height: 12em; +} +.middle .cart-info .info-one .business-name{ + height: 2em; +} +.middle .cart-info .info-one .one-commodity{ + display: flex; + border: 1px solid rgb(204,204,204); + height: 10em; + +} +.middle .cart-info .info-one .one-commodity .check{ + flex: 1; + padding: 1em 0 0 1em; +} +.middle .one-commodity .commodity-info{ + flex:14; + text-align: center; + padding: 1em; +} +.commodity-info img{ + height: 6rem; + width: 6rem; + float: left; +} +.commodity-info .commodity-name{ + float: left; + width: 10rem; + margin-left: 1rem; + text-align: initial; + color: rgb(60,60,60); +} +.middle .one-commodity .commodity-attribute{ + flex: 8; + text-align: inherit; + padding: 1em; + color: rgb(156,156,156); +} +.middle .one-commodity .commodity-price{ + flex: 6; + text-align: center; + padding: 1em; + font-weight: bold; +} +.middle .one-commodity .commodity-amount{ + flex:5; + text-align: center; + padding:1em; +} +.commodity-amount .amount-box{ + width: 5rem; + display: flex; + margin: 0 auto; + height: 2em; + line-height: 2em; +} +.amount-box .subtraction{ + width: 1rem; + background: rgb(240,240,240); + border: 1px solid rgb(240,240,240); + user-select: none; +} +.amount-box input{ + width: 3rem; + + text-align: center; +} +.amount-box .addition{ + width: 1rem; + background: rgb(240,240,240); + border: 1px solid rgb(240,240,240); + user-select: none; +} +.middle .one-commodity .commodity-money{ + flex:5; + text-align: center; + padding: 1em; + font-weight: bold; + color: #17b5fe; +} +.middle .one-commodity .operation{ + flex:10; + text-align: center; + padding: 1em; +} +.operation p{ + margin-top: 0.2rem; +} +.operation p:nth-child(3){ + display: none; +} +.arithmetic:hover{ + color: #17b5fe; + border: 1px solid #17b5fe!important; +} +.frame{ + border: 1px dashed #DBEBFE; +} +.commodity-attribute i{ + /*display: none;*/ + float: right; + margin: -1rem; +} +.commodity-attribute span{ + display: none; + float: right; + margin: -1rem; + background: #17b5fe; + color: #fff; + cursor: pointer; +} diff --git a/src/main/webapp/static/css/index.css b/src/main/webapp/static/css/index.css index a5ccbea..82f9f1f 100644 --- a/src/main/webapp/static/css/index.css +++ b/src/main/webapp/static/css/index.css @@ -21,7 +21,7 @@ body{ } .head .content{ - width: 80%; + width: 65%; height: 100%; margin: 0 auto; } @@ -73,7 +73,6 @@ body{ position: absolute; padding: 1em; top: 3em; - left: calc(10% - 2px); border: 1px solid rgb(238,238,238); } .head .content .login-information .login-text .personInfo .function{ @@ -352,7 +351,7 @@ body{ overflow: auto; } .middle .box{ - width: 80%; + width: 65%; background: white; margin: 0 auto; } @@ -370,8 +369,8 @@ body{ background-repeat: no-repeat; background-size: 100% 75%; -moz-background-size: 80% 80%; - background-position: 7px 12px; - height: 100%; + background-position: 7px 23px; + height: 90%; width: 100%; cursor: pointer; } @@ -465,7 +464,7 @@ body{ .middle .box .navigation-carousel-person .navigation ul li .layui-icon{ position: absolute; text-decoration: none; - left: 23%; + left: 28%; } .middle .box .navigation-carousel-person .carousel .li-content{ display: none; @@ -474,7 +473,7 @@ body{ text-decoration: none; background: white; padding: 1em; - width: 100%; + /*width: 100%;*/ height: 93.8%; transform: translateY(-100%); } diff --git a/src/main/webapp/static/css/public.css b/src/main/webapp/static/css/public.css new file mode 100644 index 0000000..3ab3c41 --- /dev/null +++ b/src/main/webapp/static/css/public.css @@ -0,0 +1,10 @@ +.hand-shape{ + cursor: pointer; +} +.selection-text{ + cursor: pointer; +} +.selection-text:hover{ + color: #17b5fe; + text-decoration: underline; +} \ No newline at end of file diff --git a/src/main/webapp/static/img/commodity/chufang01.jpg b/src/main/webapp/static/img/commodity/chufang01.jpg deleted file mode 100644 index 96504d0..0000000 Binary files a/src/main/webapp/static/img/commodity/chufang01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/chufang02.jpg b/src/main/webapp/static/img/commodity/chufang02.jpg deleted file mode 100644 index 106f764..0000000 Binary files a/src/main/webapp/static/img/commodity/chufang02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/chufang03.jpg b/src/main/webapp/static/img/commodity/chufang03.jpg deleted file mode 100644 index 18ebab6..0000000 Binary files a/src/main/webapp/static/img/commodity/chufang03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/chufang04.jpg b/src/main/webapp/static/img/commodity/chufang04.jpg deleted file mode 100644 index 1ef7af8..0000000 Binary files a/src/main/webapp/static/img/commodity/chufang04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/chufang05.jpg b/src/main/webapp/static/img/commodity/chufang05.jpg deleted file mode 100644 index 74ee5d5..0000000 Binary files a/src/main/webapp/static/img/commodity/chufang05.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/chufang06.jpg b/src/main/webapp/static/img/commodity/chufang06.jpg deleted file mode 100644 index 3180046..0000000 Binary files a/src/main/webapp/static/img/commodity/chufang06.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/chufang07.jpg b/src/main/webapp/static/img/commodity/chufang07.jpg deleted file mode 100644 index 91ec745..0000000 Binary files a/src/main/webapp/static/img/commodity/chufang07.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/chufang08.jpg b/src/main/webapp/static/img/commodity/chufang08.jpg deleted file mode 100644 index 31dc4fd..0000000 Binary files a/src/main/webapp/static/img/commodity/chufang08.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/dajiadian01.jpg b/src/main/webapp/static/img/commodity/dajiadian01.jpg deleted file mode 100644 index badd5b3..0000000 Binary files a/src/main/webapp/static/img/commodity/dajiadian01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/dajiadian02.jpg b/src/main/webapp/static/img/commodity/dajiadian02.jpg deleted file mode 100644 index 38a637c..0000000 Binary files a/src/main/webapp/static/img/commodity/dajiadian02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/dajiadian03.jpg b/src/main/webapp/static/img/commodity/dajiadian03.jpg deleted file mode 100644 index 7f3df5d..0000000 Binary files a/src/main/webapp/static/img/commodity/dajiadian03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/dajiadian04.jpg b/src/main/webapp/static/img/commodity/dajiadian04.jpg deleted file mode 100644 index 3c3d883..0000000 Binary files a/src/main/webapp/static/img/commodity/dajiadian04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/dajiadian05.jpg b/src/main/webapp/static/img/commodity/dajiadian05.jpg deleted file mode 100644 index d4d6154..0000000 Binary files a/src/main/webapp/static/img/commodity/dajiadian05.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/dajiadian06.jpg b/src/main/webapp/static/img/commodity/dajiadian06.jpg deleted file mode 100644 index cc00ce9..0000000 Binary files a/src/main/webapp/static/img/commodity/dajiadian06.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/fangbian01.jpg b/src/main/webapp/static/img/commodity/fangbian01.jpg deleted file mode 100644 index 71ed7d1..0000000 Binary files a/src/main/webapp/static/img/commodity/fangbian01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/fangbian02.jpg b/src/main/webapp/static/img/commodity/fangbian02.jpg deleted file mode 100644 index c84aca4..0000000 Binary files a/src/main/webapp/static/img/commodity/fangbian02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/fangbian03.jpg b/src/main/webapp/static/img/commodity/fangbian03.jpg deleted file mode 100644 index 5e33459..0000000 Binary files a/src/main/webapp/static/img/commodity/fangbian03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/fangbian04.jpg b/src/main/webapp/static/img/commodity/fangbian04.jpg deleted file mode 100644 index 441d9cb..0000000 Binary files a/src/main/webapp/static/img/commodity/fangbian04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/fangbian05.jpg b/src/main/webapp/static/img/commodity/fangbian05.jpg deleted file mode 100644 index c43db26..0000000 Binary files a/src/main/webapp/static/img/commodity/fangbian05.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/kuzi01.jpg b/src/main/webapp/static/img/commodity/kuzi01.jpg deleted file mode 100644 index d60d583..0000000 Binary files a/src/main/webapp/static/img/commodity/kuzi01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/kuzi02.jpg b/src/main/webapp/static/img/commodity/kuzi02.jpg deleted file mode 100644 index 8567322..0000000 Binary files a/src/main/webapp/static/img/commodity/kuzi02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/kuzi03.jpg b/src/main/webapp/static/img/commodity/kuzi03.jpg deleted file mode 100644 index 36f6194..0000000 Binary files a/src/main/webapp/static/img/commodity/kuzi03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/kuzi04.jpg b/src/main/webapp/static/img/commodity/kuzi04.jpg deleted file mode 100644 index 6df45f8..0000000 Binary files a/src/main/webapp/static/img/commodity/kuzi04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/kuzi05.jpg b/src/main/webapp/static/img/commodity/kuzi05.jpg deleted file mode 100644 index 3713523..0000000 Binary files a/src/main/webapp/static/img/commodity/kuzi05.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/lingshi01.jpg b/src/main/webapp/static/img/commodity/lingshi01.jpg deleted file mode 100644 index 05b8864..0000000 Binary files a/src/main/webapp/static/img/commodity/lingshi01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/lingshi02.jpg b/src/main/webapp/static/img/commodity/lingshi02.jpg deleted file mode 100644 index a223fe1..0000000 Binary files a/src/main/webapp/static/img/commodity/lingshi02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/lingshi03.jpg b/src/main/webapp/static/img/commodity/lingshi03.jpg deleted file mode 100644 index 6470bd7..0000000 Binary files a/src/main/webapp/static/img/commodity/lingshi03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/lingshi04.jpg b/src/main/webapp/static/img/commodity/lingshi04.jpg deleted file mode 100644 index 1b4b787..0000000 Binary files a/src/main/webapp/static/img/commodity/lingshi04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/lingshi05.jpg b/src/main/webapp/static/img/commodity/lingshi05.jpg deleted file mode 100644 index b9fceee..0000000 Binary files a/src/main/webapp/static/img/commodity/lingshi05.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nanxie01.jpg b/src/main/webapp/static/img/commodity/nanxie01.jpg deleted file mode 100644 index 3d4ef17..0000000 Binary files a/src/main/webapp/static/img/commodity/nanxie01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nanxie02.jpg b/src/main/webapp/static/img/commodity/nanxie02.jpg deleted file mode 100644 index db31cc9..0000000 Binary files a/src/main/webapp/static/img/commodity/nanxie02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nanxie03.jpg b/src/main/webapp/static/img/commodity/nanxie03.jpg deleted file mode 100644 index 4c6af66..0000000 Binary files a/src/main/webapp/static/img/commodity/nanxie03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nanxie04.jpg b/src/main/webapp/static/img/commodity/nanxie04.jpg deleted file mode 100644 index 4c9fb50..0000000 Binary files a/src/main/webapp/static/img/commodity/nanxie04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvduanxiu01.jpg b/src/main/webapp/static/img/commodity/nvduanxiu01.jpg deleted file mode 100644 index 46e0dfc..0000000 Binary files a/src/main/webapp/static/img/commodity/nvduanxiu01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvduanxiu02.jpg b/src/main/webapp/static/img/commodity/nvduanxiu02.jpg deleted file mode 100644 index cf0cdf5..0000000 Binary files a/src/main/webapp/static/img/commodity/nvduanxiu02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvduanxiu03.jpg b/src/main/webapp/static/img/commodity/nvduanxiu03.jpg deleted file mode 100644 index 29787cc..0000000 Binary files a/src/main/webapp/static/img/commodity/nvduanxiu03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvduanxiu04.jpg b/src/main/webapp/static/img/commodity/nvduanxiu04.jpg deleted file mode 100644 index 956f561..0000000 Binary files a/src/main/webapp/static/img/commodity/nvduanxiu04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvku01.jpg b/src/main/webapp/static/img/commodity/nvku01.jpg deleted file mode 100644 index c2da90f..0000000 Binary files a/src/main/webapp/static/img/commodity/nvku01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvku02.jpg b/src/main/webapp/static/img/commodity/nvku02.jpg deleted file mode 100644 index f68d78e..0000000 Binary files a/src/main/webapp/static/img/commodity/nvku02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvku03.jpg b/src/main/webapp/static/img/commodity/nvku03.jpg deleted file mode 100644 index fe0cbaf..0000000 Binary files a/src/main/webapp/static/img/commodity/nvku03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvku04.jpg b/src/main/webapp/static/img/commodity/nvku04.jpg deleted file mode 100644 index abbdfac..0000000 Binary files a/src/main/webapp/static/img/commodity/nvku04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvqun01.jpg b/src/main/webapp/static/img/commodity/nvqun01.jpg deleted file mode 100644 index d3dc1eb..0000000 Binary files a/src/main/webapp/static/img/commodity/nvqun01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvqun02.jpg b/src/main/webapp/static/img/commodity/nvqun02.jpg deleted file mode 100644 index 5b99da0..0000000 Binary files a/src/main/webapp/static/img/commodity/nvqun02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvqun03.jpg b/src/main/webapp/static/img/commodity/nvqun03.jpg deleted file mode 100644 index 91b900b..0000000 Binary files a/src/main/webapp/static/img/commodity/nvqun03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvqun04.jpg b/src/main/webapp/static/img/commodity/nvqun04.jpg deleted file mode 100644 index 42f8375..0000000 Binary files a/src/main/webapp/static/img/commodity/nvqun04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvxie01.jpg b/src/main/webapp/static/img/commodity/nvxie01.jpg deleted file mode 100644 index 0d0053c..0000000 Binary files a/src/main/webapp/static/img/commodity/nvxie01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvxie02.jpg b/src/main/webapp/static/img/commodity/nvxie02.jpg deleted file mode 100644 index b06083c..0000000 Binary files a/src/main/webapp/static/img/commodity/nvxie02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvxie03.jpg b/src/main/webapp/static/img/commodity/nvxie03.jpg deleted file mode 100644 index f30c804..0000000 Binary files a/src/main/webapp/static/img/commodity/nvxie03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/nvxie04.jpg b/src/main/webapp/static/img/commodity/nvxie04.jpg deleted file mode 100644 index 209baca..0000000 Binary files a/src/main/webapp/static/img/commodity/nvxie04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/peijian01.jpg b/src/main/webapp/static/img/commodity/peijian01.jpg deleted file mode 100644 index 28cbdbe..0000000 Binary files a/src/main/webapp/static/img/commodity/peijian01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/peijian02.jpg b/src/main/webapp/static/img/commodity/peijian02.jpg deleted file mode 100644 index b5ba706..0000000 Binary files a/src/main/webapp/static/img/commodity/peijian02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/peijian03.jpg b/src/main/webapp/static/img/commodity/peijian03.jpg deleted file mode 100644 index 9e0d291..0000000 Binary files a/src/main/webapp/static/img/commodity/peijian03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/peijian04.jpg b/src/main/webapp/static/img/commodity/peijian04.jpg deleted file mode 100644 index 86f55b0..0000000 Binary files a/src/main/webapp/static/img/commodity/peijian04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/ruyin01.jpg b/src/main/webapp/static/img/commodity/ruyin01.jpg deleted file mode 100644 index 9b21fcd..0000000 Binary files a/src/main/webapp/static/img/commodity/ruyin01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/ruyin02.jpg b/src/main/webapp/static/img/commodity/ruyin02.jpg deleted file mode 100644 index c87838f..0000000 Binary files a/src/main/webapp/static/img/commodity/ruyin02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/ruyin03.jpg b/src/main/webapp/static/img/commodity/ruyin03.jpg deleted file mode 100644 index 267cf5e..0000000 Binary files a/src/main/webapp/static/img/commodity/ruyin03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/ruyin04.jpg b/src/main/webapp/static/img/commodity/ruyin04.jpg deleted file mode 100644 index 28f2b58..0000000 Binary files a/src/main/webapp/static/img/commodity/ruyin04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/ruyin05.jpg b/src/main/webapp/static/img/commodity/ruyin05.jpg deleted file mode 100644 index 94329f1..0000000 Binary files a/src/main/webapp/static/img/commodity/ruyin05.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shangzhuang01.jpg b/src/main/webapp/static/img/commodity/shangzhuang01.jpg deleted file mode 100644 index cd60c01..0000000 Binary files a/src/main/webapp/static/img/commodity/shangzhuang01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shangzhuang02.jpg b/src/main/webapp/static/img/commodity/shangzhuang02.jpg deleted file mode 100644 index acbb0b6..0000000 Binary files a/src/main/webapp/static/img/commodity/shangzhuang02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shangzhuang03.jpg b/src/main/webapp/static/img/commodity/shangzhuang03.jpg deleted file mode 100644 index 313985d..0000000 Binary files a/src/main/webapp/static/img/commodity/shangzhuang03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shangzhuang04.jpg b/src/main/webapp/static/img/commodity/shangzhuang04.jpg deleted file mode 100644 index 9bcd924..0000000 Binary files a/src/main/webapp/static/img/commodity/shangzhuang04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shenghuo01.jpg b/src/main/webapp/static/img/commodity/shenghuo01.jpg deleted file mode 100644 index 7bba648..0000000 Binary files a/src/main/webapp/static/img/commodity/shenghuo01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shenghuo02.jpg b/src/main/webapp/static/img/commodity/shenghuo02.jpg deleted file mode 100644 index 7cd0c22..0000000 Binary files a/src/main/webapp/static/img/commodity/shenghuo02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shenghuo03.jpg b/src/main/webapp/static/img/commodity/shenghuo03.jpg deleted file mode 100644 index 1b86c92..0000000 Binary files a/src/main/webapp/static/img/commodity/shenghuo03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shenghuo04.jpg b/src/main/webapp/static/img/commodity/shenghuo04.jpg deleted file mode 100644 index 154988b..0000000 Binary files a/src/main/webapp/static/img/commodity/shenghuo04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shenghuo05.jpg b/src/main/webapp/static/img/commodity/shenghuo05.jpg deleted file mode 100644 index be3d814..0000000 Binary files a/src/main/webapp/static/img/commodity/shenghuo05.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shouji01.jpg b/src/main/webapp/static/img/commodity/shouji01.jpg deleted file mode 100644 index 870acbb..0000000 Binary files a/src/main/webapp/static/img/commodity/shouji01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shouji02.jpg b/src/main/webapp/static/img/commodity/shouji02.jpg deleted file mode 100644 index d39081b..0000000 Binary files a/src/main/webapp/static/img/commodity/shouji02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shouji03.jpg b/src/main/webapp/static/img/commodity/shouji03.jpg deleted file mode 100644 index 8001fbe..0000000 Binary files a/src/main/webapp/static/img/commodity/shouji03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shouji04.jpg b/src/main/webapp/static/img/commodity/shouji04.jpg deleted file mode 100644 index cdd89b4..0000000 Binary files a/src/main/webapp/static/img/commodity/shouji04.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/shouji05.jpg b/src/main/webapp/static/img/commodity/shouji05.jpg deleted file mode 100644 index 376f9ae..0000000 Binary files a/src/main/webapp/static/img/commodity/shouji05.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/test.jpg b/src/main/webapp/static/img/commodity/test.jpg deleted file mode 100644 index fab983d..0000000 Binary files a/src/main/webapp/static/img/commodity/test.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/waitao01.jpg b/src/main/webapp/static/img/commodity/waitao01.jpg deleted file mode 100644 index 16dd74f..0000000 Binary files a/src/main/webapp/static/img/commodity/waitao01.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/waitao02.jpg b/src/main/webapp/static/img/commodity/waitao02.jpg deleted file mode 100644 index 6222605..0000000 Binary files a/src/main/webapp/static/img/commodity/waitao02.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/waitao03.jpg b/src/main/webapp/static/img/commodity/waitao03.jpg deleted file mode 100644 index d3fd3a3..0000000 Binary files a/src/main/webapp/static/img/commodity/waitao03.jpg and /dev/null differ diff --git a/src/main/webapp/static/img/commodity/waitao04.jpg b/src/main/webapp/static/img/commodity/waitao04.jpg deleted file mode 100644 index 2432053..0000000 Binary files a/src/main/webapp/static/img/commodity/waitao04.jpg and /dev/null differ diff --git a/src/main/webapp/static/js/allOrder.js b/src/main/webapp/static/js/allOrder.js index 254d8e6..5e49b84 100644 --- a/src/main/webapp/static/js/allOrder.js +++ b/src/main/webapp/static/js/allOrder.js @@ -11,12 +11,14 @@ layui.use(["layer","jquery","element","carousel","table"], function() { url:"/ebuy/allOrderTable", type:"post", dataType:"json", - data:{}, + data:{ + orderStatus:"05", + }, success:function (data) { orderInfo = data; let orderTable = ""; for (let i = 0; i < data.length; i++) { - let order = ""; + let orderOne = ""; //待付款 if (data[i].order_status == "01") { orderOne = `
diff --git a/src/main/webapp/static/js/cart.js b/src/main/webapp/static/js/cart.js new file mode 100644 index 0000000..b1007c8 --- /dev/null +++ b/src/main/webapp/static/js/cart.js @@ -0,0 +1,83 @@ +//一条记录悬停样式 +function oneOnmousemove() { + $(".operation p:nth-child(3)").css("display","block"); +} +function oneOnmouseout() { + $(".operation p:nth-child(3)").css("display","none"); +} + +//商品属性的悬停事件 +function attributeOnmousemove() { + $(".commodity-attribute span").css("display","inline"); + $(".commodity-attribute i").css("display","none"); + $(".frame").css("border","1px dashed #17b5fe") +} +function attributeOnmouseout() { + $(".commodity-attribute span").css("display","none"); + $(".commodity-attribute i").css("display","inline"); + $(".frame").css("border","1px dashed #DBEBFE") +} + +layui.use(["layer","jquery","element","carousel","table"], function() { + const layer = layui.layer + , $ = layui.jquery + , element = layui.element + , table = layui.table + , carousel = layui.carousel; + + //监听数量 + let $input = $("#amount"); + //商品数量 + let amount = $input.val(); + if (amount == 1) { + $(".subtraction").removeClass("arithmetic hand-shape"); + $(".subtraction").html(""); + $input.val(1); + } + $input.on("input propertychange",function () { + let amount = $input.val(); + if (amount < 1) { + layer.msg("商品数量不能低于1") + } + if (amount == 1) { + $(".subtraction").removeClass("arithmetic hand-shape"); + $(".subtraction").html("") + } + if (amount > 1) { + $input.val(amount); + } + }) + //购物车商品数量改变 + //商品减一 + $(".subtraction").on("click",function () { + let amount = $input.val(); + amount--; + if (amount < 2) { + $(".subtraction").removeClass("arithmetic hand-shape"); + $(".subtraction").html(""); + if (amount < 1) { + layer.msg("商品数量不能低于1") + } + amount = 1; + } + $("#amount").val(amount); + }) + //商品加一 + $(".addition").on("click",function () { + let amount = $input.val(); + amount++; + $("#amount").val(amount); + if (amount > 1) { + $(".subtraction").addClass("arithmetic hand-shape"); + $(".subtraction").html("-") + } + }) + + //一条记录的悬停样式 + $(".info-one").attr("onmouseover","oneOnmousemove()"); + $(".info-one").attr("onmouseout","oneOnmouseout()"); + + //修改属性的悬停事件 + $(".commodity-attribute").attr("onmouseover","attributeOnmousemove()") + $(".commodity-attribute").attr("onmouseout","attributeOnmouseout()") +}) \ No newline at end of file diff --git a/src/main/webapp/static/js/index.js b/src/main/webapp/static/js/index.js index 8993e02..f1d2279 100644 --- a/src/main/webapp/static/js/index.js +++ b/src/main/webapp/static/js/index.js @@ -98,6 +98,10 @@ $(".app-logo-one").on("click",function () { $(".more-equity").on("click",function () { layer.msg("功能正在完善,请联系管理员:15006732580!") }) +//消息正在完善 +$(".one-news,.news").on("click",function () { + layer.msg("功能正在完善,请联系管理员:15006732580!") +}) //log去首页 $(".middle .log").on("click",function () { @@ -179,7 +183,7 @@ layui.use(['layer',"jquery","element","carousel"], function() { } //头像去个人首页 - $(".head .content .login-information .login-text .personInfo .info .head-portrait").on("click",function () { + $(".head .content .login-information .login-text .personInfo .info .head-portrait,.login-information .login-text").on("click",function () { $(".iframe-middle").attr("src","/ebuy/account"); sessionStorage.setItem("accountTab","personalHomepage"); }) @@ -208,4 +212,10 @@ layui.use(['layer',"jquery","element","carousel"], function() { $(".search-text").on("click",function () { layer.msg($(".search-box-input").val()) }) + + //购物车 + $(".cart").on("click",function () { + $(".iframe-middle").attr("src","/ebuy/cart"); + }) + }) \ No newline at end of file diff --git a/src/main/webapp/static/js/middle.js b/src/main/webapp/static/js/middle.js new file mode 100644 index 0000000..e748049 --- /dev/null +++ b/src/main/webapp/static/js/middle.js @@ -0,0 +1,32 @@ + +layui.use(['layer',"jquery","element","carousel"], function() { + const layer = layui.layer + , $ = layui.jquery + , element = layui.element + , carousel = layui.carousel; +//分类展示 + let typeDowns = []; + for (let i = 0; i < 10; i++) { + for (let j = 0; j < 3; j++) { + let typeDown = $(".navigation ul li:eq(" + i + ") a:eq(" + j + ")").text(); + typeDowns.push(typeDown) + } + } + $.ajax({ + url: "/ebuy/commodityType", + data: { + typeDowns:JSON.stringify(typeDowns) + }, + async: false, + dataType: "json", + type: "post", + success: function (data) { + console.log("成功"); + console.log(data); + }, + error: function () { + console.log("shibai1"); + } + }) + +}) \ No newline at end of file diff --git a/src/main/webapp/static/js/pendingPayment.js b/src/main/webapp/static/js/pendingPayment.js new file mode 100644 index 0000000..118ca85 --- /dev/null +++ b/src/main/webapp/static/js/pendingPayment.js @@ -0,0 +1,72 @@ + +layui.use(["layer","jquery","element","carousel","table"], function() { + const layer = layui.layer + , $ = layui.jquery + , element = layui.element + , table = layui.table + , carousel = layui.carousel; + + let orderInfo; + $.ajax({ + url:"/ebuy/allOrderTable", + type:"post", + dataType:"json", + data:{ + orderStatus:"01", + }, + success:function (data) { + orderInfo = data; + let orderTable = ""; + for (let i = 0; i < data.length; i++) { + let orderOne = ""; + //待付款 + orderOne = `
+
+
+
${data[i].creat_time}
+
订单号: ${data[i].order_id}
+
+
+ ${data[i].businesses_name} +
+
+
+
+ +
+
${data[i].commodity_name}
+
${data[i].commodity_attribute}
+
+
+
+ ￥${data[i].commodity_price} +
+
${data[i].commodity_amount}
+
+ 违规举报 +
+
+ ￥${(data[i].commodity_price * data[i].commodity_amount)} + (含运费：￥0.00) +
+
+ 等待买家付款 + 订单详情 +
+
+ + 找朋友帮忙付 + 取消订单 + 修改订单 +
+
+
`; + orderTable += orderOne; + } + $(".table-body").html(orderTable); + }, + error:function () { + } + }); + +}) \ No newline at end of file diff --git a/src/main/webapp/static/js/toBeEvaluated.js b/src/main/webapp/static/js/toBeEvaluated.js new file mode 100644 index 0000000..b715060 --- /dev/null +++ b/src/main/webapp/static/js/toBeEvaluated.js @@ -0,0 +1,72 @@ + +layui.use(["layer","jquery","element","carousel","table"], function() { + const layer = layui.layer + , $ = layui.jquery + , element = layui.element + , table = layui.table + , carousel = layui.carousel; + + let orderInfo; + $.ajax({ + url:"/ebuy/allOrderTable", + type:"post", + dataType:"json", + data:{ + orderStatus:"04", + }, + success:function (data) { + orderInfo = data; + let orderTable = ""; + for (let i = 0; i < data.length; i++) { + let orderOne = ""; + //待评价 + orderOne = `
+
+
+
${data[i].creat_time}
+
订单号: ${data[i].order_id}
+
+
+ ${data[i].businesses_name} +
+
+
+
+ +
+
${data[i].commodity_name}
+
${data[i].commodity_attribute}
+
+
+
+ ￥${data[i].commodity_price} +
+
1
+
+ 申请售后 + 投诉商家 +
+
+ ￥${data[i].commodity_name * data[i].commodity_amount} + (含运费：￥0.00) +
+
+ 交易成功 + 订单详情 + 花呗账单 + 查看物流 +
+
+
评价
+
+
+
`; + orderTable += orderOne; + } + $(".table-body").html(orderTable); + }, + error:function () { + } + }); + +}) \ No newline at end of file diff --git a/src/main/webapp/static/js/toBeRecevied.js b/src/main/webapp/static/js/toBeRecevied.js new file mode 100644 index 0000000..f6244f9 --- /dev/null +++ b/src/main/webapp/static/js/toBeRecevied.js @@ -0,0 +1,74 @@ + +layui.use(["layer","jquery","element","carousel","table"], function() { + const layer = layui.layer + , $ = layui.jquery + , element = layui.element + , table = layui.table + , carousel = layui.carousel; + + let orderInfo; + $.ajax({ + url:"/ebuy/allOrderTable", + type:"post", + dataType:"json", + data:{ + orderStatus:"03", + }, + success:function (data) { + orderInfo = data; + let orderTable = ""; + for (let i = 0; i < data.length; i++) { + let orderOne = ""; + //待收货 + orderOne = `
+
+
+
${data[i].creat_time}
+
订单号: ${data[i].order_id}
+
+
+ ${data[i].businesses_name} +
+
+
+
+ +
+
${data[i].commodity_name}
+
${data[i].commodity_attribute}
+
+
+
+ ￥${data[i].commodity_price} +
+
1
+
+ 退款/退换货 + 投诉商家 + 退运保险 +
+
+ ￥${data[i].commodity_name * data[i].commodity_amount} + (含运费：￥0.00) +
+
+ 等待买家付款 + 订单详情 + 花呗账单 + 查看物流 +
+
+ + 申请开票 +
+
+
` + orderTable += orderOne; + } + $(".table-body").html(orderTable); + }, + error:function () { + } + }); + +}) \ No newline at end of file diff --git a/src/main/webapp/static/js/toBeShipped.js b/src/main/webapp/static/js/toBeShipped.js index 8ba91ee..cdaed62 100644 --- a/src/main/webapp/static/js/toBeShipped.js +++ b/src/main/webapp/static/js/toBeShipped.js @@ -1,17 +1,69 @@ -layui.use(['layer',"jquery","element","carousel"], function() { +layui.use(["layer","jquery","element","carousel","table"], function() { const layer = layui.layer , $ = layui.jquery , element = layui.element + , table = layui.table , carousel = layui.carousel; - //获取body高度 - // let bodyHeight = $("body").outerHeight(); - // sessionStorage.setItem("bodyHeight",bodyHeight); - // - // //赋给iframe标签 - // $(".order-type .layui-tab .layui-tab-content .iframe-middle",window.parent.document).css("height",bodyHeight+"px") - // $(".head .my-tab .layui-tab-content .layui-tab-item .iframe-middle",window.parent.parent.document).css("height",(bodyHeight+90)+"px") - + let orderInfo; + $.ajax({ + url:"/ebuy/allOrderTable", + type:"post", + dataType:"json", + data:{ + orderStatus:"02", + }, + success:function (data) { + orderInfo = data; + let orderTable = ""; + for (let i = 0; i < data.length; i++) { + let orderOne = ""; + //待发货 + orderOne = `
+
+
+
${data[i].creat_time}
+
订单号: ${data[i].order_id}
+
+
+ ${data[i].businesses_name} +
+
+
+
+ +
+
${data[i].commodity_name}
+
${data[i].commodity_attribute}
+
+
+
+ ￥${data[i].commodity_price} +
+
1
+
+ 退款/退货 +
+
+ ￥${(data[i].commodity_price * data[i].commodity_amount)} + (含运费：￥0.00) +
+
+ 买家已付款 + 订单详情 +
+
+ 提醒卖家发货 +
+
+
` + orderTable += orderOne; + } + $(".table-body").html(orderTable); + }, + error:function () { + } + }); }) \ No newline at end of file