diff --git a/src/main/java/com/phy/ebuy/controller/EbuyController.java b/src/main/java/com/phy/ebuy/controller/EbuyController.java index 62573fb..b4c7fea 100644 --- a/src/main/java/com/phy/ebuy/controller/EbuyController.java +++ b/src/main/java/com/phy/ebuy/controller/EbuyController.java @@ -7,7 +7,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; @Controller @@ -54,24 +56,50 @@ public class EbuyController { //账户管理-个人首页页面 @RequestMapping("/personalHomepage") public String personalHomepage() { - return "/personalHomepage.html"; + return "/account/personalHomepage.html"; } //账户管理-账户设置页面 @RequestMapping("/accountSettings") public String accountSettings() { - return "/accountSettings.html"; + return "/account/accountSettings.html"; } //账户管理-消息页面 @RequestMapping("/message") public String message() { - return "/message.html"; + return "/account/message.html"; } + //账户管理-个人首页-所有订单页面 + @RequestMapping("/allOrder") + public String allOrder() { + return "/account/personalHomepage/allOrder.html"; + } + //账户管理-个人首页-待付款页面 + @RequestMapping("/pendingPayment") + public String pendingPayment() { + return "/account/personalHomepage/pendingPayment.html"; + } + //账户管理-个人首页-待发货页面 + @RequestMapping("/toBeShipped") + public String toBeShipped() { + return "/account/personalHomepage/toBeShipped.html"; + } + //账户管理-个人首页-待收货页面 + @RequestMapping("/toBeReceived") + public String toBeReceived() { + return "/account/personalHomepage/toBeReceived.html"; + } + + //账户管理-个人首页-待评价页面 + @RequestMapping("/toBeEvaluated") + public String toBeEvaluated() { + return "/account/personalHomepage/toBeEvaluated.html"; + } //验证登录 @ResponseBody @@ -108,5 +136,12 @@ public class EbuyController { return result; } + //获取全部订单 + @RequestMapping("/allOrderTable") + @ResponseBody + public List> allOrderTable() { + List> result = ebuyService.allOrderTable(); + 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 9137406..9b9d904 100644 --- a/src/main/java/com/phy/ebuy/dao/EbuyMapper.java +++ b/src/main/java/com/phy/ebuy/dao/EbuyMapper.java @@ -3,6 +3,7 @@ package com.phy.ebuy.dao; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; +import java.util.List; import java.util.Map; @Mapper public interface EbuyMapper { @@ -16,4 +17,14 @@ public interface EbuyMapper { * 注册提交 */ int registerSub(Map map); + + /** + * 所有订单Table + */ + List> allOrderTable(); + + /** + * 查询字典表 + */ + List> queryDictionary(String[] ids); } 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 561ddf7..5daf66b 100644 --- a/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml +++ b/src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml @@ -29,4 +29,36 @@ ( SELECT RIGHT ( RAND( ), 16 ) ) ); + + + + + + \ 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 7762f41..51cee53 100644 --- a/src/main/java/com/phy/ebuy/service/EbuyService.java +++ b/src/main/java/com/phy/ebuy/service/EbuyService.java @@ -1,6 +1,7 @@ package com.phy.ebuy.service; import java.util.HashMap; +import java.util.List; import java.util.Map; public interface EbuyService{ @@ -14,4 +15,8 @@ public interface EbuyService{ */ Map registerSub(Map parameter); + /** + * 所有订单Table + */ + List> allOrderTable(); } 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 c1168ee..1e2b830 100644 --- a/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java +++ b/src/main/java/com/phy/ebuy/service/impl/EbuyServiceImpl.java @@ -5,7 +5,9 @@ import com.phy.ebuy.service.EbuyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service @@ -42,4 +44,22 @@ public class EbuyServiceImpl implements EbuyService { result.put("count",count); return result; } + + @Override + public List> allOrderTable() { + List> result = ebuyMapper.allOrderTable(); + for (Map map : result ) { + String ids = (String) map.get("commodity_attribute"); + String[] idses = ids.split(","); + List> commodityAttributeList = ebuyMapper.queryDictionary(idses); + String commodityAttribute = ""; + String commodityAttributeString ; + for (Map commodityAttributemap : commodityAttributeList ) { + commodityAttributeString = commodityAttributemap.get("type_down")+":"+commodityAttributemap.get("type_down_details")+" "; + commodityAttribute += commodityAttributeString; + } + map.put("commodity_attribute",commodityAttribute); + } + return result; + } } diff --git a/src/main/webapp/WEB-INF/view/account.css b/src/main/webapp/WEB-INF/view/account.css deleted file mode 100644 index 6b82ae9..0000000 --- a/src/main/webapp/WEB-INF/view/account.css +++ /dev/null @@ -1,31 +0,0 @@ -*{ - box-sizing: border-box; - padding: 0; - margin: 0; -} -html{ - width: 100%; - height: 100%; -} -body{ - width: 100%; - height: 100%; - display: flex; - flex-direction:column; -} -.head{ - height: 5em; - padding: 0 10%; - background: #17b5fe; -} -.head .my-logo{ - height: 100%; - width: 15%; - background-image: url("../img/my-logo.png"); - background-repeat: no-repeat; - background-position: center; - background-size: 100% 100%; -} -.iframe-middle{ - height: calc(100% - 5em); -} \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/account.html b/src/main/webapp/WEB-INF/view/account.html index 7ce2341..ef422d5 100644 --- a/src/main/webapp/WEB-INF/view/account.html +++ b/src/main/webapp/WEB-INF/view/account.html @@ -4,15 +4,41 @@ 账户管理 + +
- -
-
+ +
+
    +
  • 首页
    • +
  • 账户设置
    • +
  • 消息
    • +
+
+
+ +
+
+ +
+
+ +
+
+
+
+ + 搜索 +
- + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/accountSettings.html b/src/main/webapp/WEB-INF/view/account/accountSettings.html similarity index 90% rename from src/main/webapp/WEB-INF/view/accountSettings.html rename to src/main/webapp/WEB-INF/view/account/accountSettings.html index ae12d74..6026131 100644 --- a/src/main/webapp/WEB-INF/view/accountSettings.html +++ b/src/main/webapp/WEB-INF/view/account/accountSettings.html @@ -9,7 +9,9 @@ - +
+

账户设置

+
diff --git a/src/main/webapp/WEB-INF/view/message.html b/src/main/webapp/WEB-INF/view/account/message.html similarity index 90% rename from src/main/webapp/WEB-INF/view/message.html rename to src/main/webapp/WEB-INF/view/account/message.html index e43229f..21b1c99 100644 --- a/src/main/webapp/WEB-INF/view/message.html +++ b/src/main/webapp/WEB-INF/view/account/message.html @@ -9,7 +9,9 @@ - +
+

消息

+
diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage.html b/src/main/webapp/WEB-INF/view/account/personalHomepage.html new file mode 100644 index 0000000..3c295bf --- /dev/null +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage.html @@ -0,0 +1,48 @@ + + + + + 个人首页 + + + + + + + + +
+
+
    +
  • 所有订单
    • +
  • 待付款
    • +
  • 待发货
    • +
  • 待收货
    • +
  • 待评价
    • +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/allOrder.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/allOrder.html new file mode 100644 index 0000000..e583ec1 --- /dev/null +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/allOrder.html @@ -0,0 +1,202 @@ + + + + + 所有订单 + + + + + + +
+
+ + 订单搜索 +
+
+
+
宝贝
+
单价
+
数量
+
商品操作
+
实付款
+
交易状态
+
交易操作
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html b/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html new file mode 100644 index 0000000..2309e4c --- /dev/null +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html @@ -0,0 +1,196 @@ + + + + + 待付款 + + + +
+ + + + +
+
+
宝贝
+
单价
+
数量
+
商品操作
+
实付款
+
交易状态
+
交易操作
+
+
+ +
+
+
+
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 new file mode 100644 index 0000000..401b333 --- /dev/null +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html @@ -0,0 +1,196 @@ + + + + + 待评价 + + + +
+
+ + 订单搜索 +
+
+
+
宝贝
+
单价
+
数量
+
商品操作
+
实付款
+
交易状态
+
交易操作
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
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 new file mode 100644 index 0000000..50d720f --- /dev/null +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html @@ -0,0 +1,196 @@ + + + + + 待收货 + + + +
+ + + + +
+
+
宝贝
+
单价
+
数量
+
商品操作
+
实付款
+
交易状态
+
交易操作
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
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 new file mode 100644 index 0000000..8da1f05 --- /dev/null +++ b/src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html @@ -0,0 +1,202 @@ + + + + + 待发货 + + + + + +
+ + + + +
+
+
宝贝
+
单价
+
数量
+
商品操作
+
实付款
+
交易状态
+
交易操作
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
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/index.html b/src/main/webapp/WEB-INF/view/index.html index 21868e0..a97eb4b 100644 --- a/src/main/webapp/WEB-INF/view/index.html +++ b/src/main/webapp/WEB-INF/view/index.html @@ -52,6 +52,9 @@ +
+ E-BUY首页 +
@@ -99,7 +102,7 @@
- + diff --git a/src/main/webapp/WEB-INF/view/personalHomepage.html b/src/main/webapp/WEB-INF/view/personalHomepage.html deleted file mode 100644 index 9c43e96..0000000 --- a/src/main/webapp/WEB-INF/view/personalHomepage.html +++ /dev/null @@ -1,16 +0,0 @@ - - - - - 个人首页 - - - - - - - - - - - \ 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 9f3508f..5aac939 100644 --- a/src/main/webapp/static/css/account.css +++ b/src/main/webapp/static/css/account.css @@ -15,7 +15,84 @@ body{ } .head{ height: 5em; + padding: 0 10%; + background: #17b5fe; } -.iframe-middle{ - height: calc(100% - 5em); +.head .my-logo{ + float: left; + height: 100%; + width: 15%; + background-image: url("../img/my-logo.png"); + background-repeat: no-repeat; + background-position: center; + background-size: 100% 100%; + cursor: pointer; +} +.head .my-tab{ + float: left; + width: 50%; + height: 100%; + padding-left: 5em; + padding-right: 10em; +} +.head .my-tab ul{ + display: flex; +} +.head .my-tab ul li{ + flex: 1; + text-align: center; + line-height: 5em; + color: #fff; +} +.head .search{ + float: right; + width: 30%; + height: 100%; + +} +.head .search input{ + height: 2em; + width: 20em; + border: 0; + float: left; + margin-top: 1.5em; +} +.head .search span{ + display: block; + background: rgb(245,245,245); + height: 2em; + line-height: 2em; + float: left; + margin-top: 1.5em; + text-indent: 15px; + letter-spacing: 15px; + cursor: pointer; + border-left: 1px solid rgb(216,216,216); + color: rgb(102,102,102); +} +.head .search span:hover{ + color: rgb(51,51,51); +} +.layui-tab{ + margin: 0!important; +} +.layui-tab-title{ + height: 100%!important; +} +.layui-tab-title .layui-this:after{ + height: calc(100% + 3px)!important; +} +.head .my-tab .layui-tab-content .layui-tab-item .iframe-middle{ + height: 800px; + width: 100%; +} +.layui-tab-item{ + width: 100%; + height: 100%; +} +.layui-tab-content { + padding: 10px; + width: 300%; + height: 900%; + margin-left: -61%; } \ No newline at end of file diff --git a/src/main/webapp/static/css/allOrder.css b/src/main/webapp/static/css/allOrder.css new file mode 100644 index 0000000..fda35a2 --- /dev/null +++ b/src/main/webapp/static/css/allOrder.css @@ -0,0 +1,258 @@ +*{ + box-sizing: border-box; + padding: 0; + margin: 0; +} +html{ + width: 100%; + +} +body{ + width: 100%; + padding: 1em!important; +} +.content .orderSearch{ + width: 100%; + height: 3em; +} +.content .orderSearch input{ + height: 2.5em; + line-height: 2.5em; + float: left; + border: 1px solid rgb(191,191,191); + width: 20em; + text-indent: 1em; +} +.content .orderSearch .span{ + display: block; + background: rgb(245,245,245); + height: 2.5em; + line-height: 2.5em; + float: left; + cursor: pointer; + border-top: 1px solid rgb(191,191,191); + border-right: 1px solid rgb(191,191,191); + border-bottom: 1px solid rgb(191,191,191); + color: #000; + padding: 0 1em; +} +.content .table{ + margin-top: 1em; +} +.content .table .table-head{ + display: flex; + background: rgb(245,245,245); + height: 3em; + line-height: 3em; +} +.content .table .table-head .div1{ + flex:19; + text-align: center; + padding: 0 1em; +} +.content .table .table-head .div2{ + flex: 4; + text-align: center; + padding: 0 1em; +} +.content .table .table-head .div3{ + flex: 3; + text-align: center; + padding: 0 1em; +} +.content .table .table-head .div4{ + flex: 6; + text-align: center; + padding: 0 1em; +} +.content .table .table-body{ + width: 100%; +} +.content .table .table-body .oneOrder{ + margin-top: 1em; + width: 100%; + height: 15em; + border: 1px solid rgb(218,243,255); +} +.content .table .table-body .oneOrder:hover{ + border: 1px solid rgb(174,216,255); +} +.content .table .table-body .oneOrder .top{ + background: rgb(234,248,255); + height: 3em; + display: flex; +} +.content .table .table-body .oneOrder .top .timeAndOrderId{ + flex: 19; + padding: 0 1em; + line-height: 3em; +} +.content .table .table-body .oneOrder .top .timeAndOrderId .time{ + float: left; + font-weight: bold; +} +.content .table .table-body .oneOrder .top .timeAndOrderId .orderId{ + float: left; + margin-left: 1em; +} +.content .table .table-body .oneOrder .top .businessName{ + flex: 31; + line-height: 3em; +} +.content .table .table-body .oneOrder .top .businessName span{ + cursor: pointer; +} +.content .table .table-body .oneOrder .top .businessName span:hover{ + color: #17b5fe; +} +.content .table .table-body .oneOrder .bottom{ + display: flex; + height: calc(100% - 3em); +} +.content .table .table-body .oneOrder .bottom .commodityInfo{ + flex: 19; + padding: 1em; +} +.content .table .table-body .oneOrder .bottom .commodityInfo .commodityPhoto{ + height: 80%; + width: 28%; + float: left; + cursor: pointer; +} +.content .table .table-body .oneOrder .bottom .commodityInfo .commodityNameAndCommodityAttribute{ + float: left; + height: 80%; + width: 72%; + padding: 0 1em; +} +.content .table .table-body .oneOrder .bottom .commodityInfo .commodityNameAndCommodityAttribute .commodityName{ + cursor: pointer; +} +.content .table .table-body .oneOrder .bottom .commodityInfo .commodityNameAndCommodityAttribute .commodityName:hover{ + color: #17b5fe; +} +.content .table .table-body .oneOrder .bottom .commodityInfo .commodityNameAndCommodityAttribute .commodityAttribute{ + margin-top: 1em; + color: rgb(157,157,157); +} +.content .table .table-body .oneOrder .bottom .commodityPrice{ + flex: 4; + text-align: center; + padding: 1em; +} +.content .table .table-body .oneOrder .bottom .commodityAmount{ + flex: 3; + text-align: center; + padding: 1em; +} +.content .table .table-body .oneOrder .bottom .commodityOperation{ + flex: 6; + border-right: 1px solid rgb(218,243,255); + text-align: center; + padding: 1em; +} +.content .table .table-body .oneOrder .bottom .commodityOperation span{ + cursor: pointer; + display: block; + margin-top: 0.5em; +} +.content .table .table-body .oneOrder .bottom .commodityOperation span:hover{ + color: #17b5fe; +} +.content .table .table-body .oneOrder .bottom .actualPayment{ + flex: 6; + border-right: 1px solid rgb(218,243,255); + text-align: center; + padding: 1em; +} +.content .table .table-body .oneOrder .bottom .actualPayment span:nth-child(1){ + display: block; + font-weight: bold; +} +.content .table .table-body .oneOrder .bottom .actualPayment span:nth-child(2){ + display: block; + margin-top: 0.5em; + font-size: 0.9em; +} +.content .table .table-body .oneOrder .bottom .orderStatus{ + flex: 6; + border-right: 1px solid rgb(218,243,255); + text-align: center; + padding: 1em; +} +.content .table .table-body .oneOrder .bottom .orderStatus span{ + display: block; + margin-top: 0.5em; + cursor: pointer; +} +.content .table .table-body .oneOrder .bottom .orderStatus .evaluate{ + color: #17b5fe; +} +.content .table .table-body .oneOrder .bottom .orderStatus span:nth-child(n+2):hover{ + color: #17b5fe; +} +.content .table .table-body .oneOrder .bottom .orderStatus span:nth-child(1){ + cursor:unset; +} +.content .table .table-body .oneOrder .bottom .orderOperation{ + flex: 6; + text-align: center; + padding: 1em; +} +.content .table .table-body .oneOrder .bottom .orderOperation button{ + background: #17b5fe; + border: 0; + border-radius: 3px; + width: 6em; + height: 2em; + color: white; + font-weight: bold; + cursor: pointer; +} +.content .table .table-body .oneOrder .bottom .orderOperation span{ + display: block; + margin-top: 0.5em; + cursor: pointer; +} +.content .table .table-body .oneOrder .bottom .orderOperation span:hover{ + color: #17b5fe; +} +.content .table .table-body .oneOrder .bottom .orderOperation .evaluate{ + width: 4em; + height: 2em; + line-height: 2em; + text-align: center; + border:1px solid rgb(220,220,220) ; + margin: 1em auto; + cursor: pointer; +} +.content .table .table-body .oneOrder .bottom .orderOperation .evaluate:hover{ + color: #17b5fe; + border:1px solid #17b5fe ; +} +html::-webkit-scrollbar { + /*滚动条整体样式*/ + width : 10px; /*高宽分别对应横竖滚动条的尺寸*/ + height: 1px; +} +html::-webkit-scrollbar-thumb { + /*滚动条里面小方块*/ + border-radius : 10px; + background-color: skyblue; + background-image: -webkit-linear-gradient( + 45deg, + rgba(255, 255, 255, 0.2) 25%, + transparent 25%, + transparent 50%, + rgba(255, 255, 255, 0.2) 50%, + rgba(255, 255, 255, 0.2) 75%, + transparent 75%, + transparent + ); +} +html::-webkit-scrollbar-track { + /*滚动条里面轨道*/ + box-shadow : inset 0 0 5px rgba(0, 0, 0, 0.2); + background : #ededed; + border-radius: 10px; +} \ No newline at end of file diff --git a/src/main/webapp/static/css/index.css b/src/main/webapp/static/css/index.css index c9e124c..a5ccbea 100644 --- a/src/main/webapp/static/css/index.css +++ b/src/main/webapp/static/css/index.css @@ -73,7 +73,7 @@ body{ position: absolute; padding: 1em; top: 3em; - left: 10%; + left: calc(10% - 2px); border: 1px solid rgb(238,238,238); } .head .content .login-information .login-text .personInfo .function{ @@ -177,6 +177,15 @@ body{ .head .content .login-information .news .news-content .one-news{ cursor: pointer; } +.head .content .goHomepage{ + margin-left: 3em; + line-height: 3em; + float: left; + cursor: pointer; +} +.head .content .goHomepage:hover{ + color:rgb(23,181,254); +} .head .content .function{ display: flex; float: right; @@ -218,6 +227,7 @@ body{ color: black; font-weight: bold; overflow: auto; + margin-left: -1em; } .head .content .function .cart .cart-content span{ color: black; @@ -356,11 +366,11 @@ body{ height: 100%; } .middle .box .search .search-log .log{ - background: url(../img/E-Buy04.png); + background: url(../img/ebuy-logo.png); background-repeat: no-repeat; - background-size: 110% 85%; + background-size: 100% 75%; -moz-background-size: 80% 80%; - background-position: -5px 1px; + background-position: 7px 12px; height: 100%; width: 100%; cursor: pointer; @@ -372,7 +382,7 @@ body{ .middle .box .search .search-box .search-box-box{ width: 95%; margin: auto; - margin-top: 3em; + margin-top: 4.5em; height: 3.26em; border: 2px solid rgb(23,181,254); border-radius: 20px; @@ -453,8 +463,9 @@ body{ text-decoration: underline; } .middle .box .navigation-carousel-person .navigation ul li .layui-icon{ - float: right; + position: absolute; text-decoration: none; + left: 23%; } .middle .box .navigation-carousel-person .carousel .li-content{ display: none; @@ -695,7 +706,7 @@ body{ .middle .box .navigation-carousel-person .person .cooperation .app-logo .app-logo-one{ flex: 1; background-repeat: no-repeat!important; - background-size: 90% 80%!important; + background-size: 90% 96%!important; background-position: center!important; cursor: pointer!important; } @@ -733,11 +744,11 @@ body{ } .layui-tab-title li{ min-width: 0px!important; - width: 11%; + width: 12%; } .layui-tab{ padding-left: 1em; - padding-right: 2em; + padding-right: 1em; } .layui-tab-content span{ display: inline-block; diff --git a/src/main/webapp/static/css/login.css b/src/main/webapp/static/css/login.css index b86e756..6881475 100644 --- a/src/main/webapp/static/css/login.css +++ b/src/main/webapp/static/css/login.css @@ -17,7 +17,7 @@ body{ display: flex; } .head .log{ - background: url("../img/E-Buy04.png"); + background: url("../img/ebuy-logo.png"); background-repeat: no-repeat; background-size: 100%; -moz-background-size: 80% 80%; @@ -57,25 +57,26 @@ body{ margin-top: 10%; margin-left: 65%; width: 20%; - height: 42%; + height: 40%; background: #FFF3E6; padding: 1em; } .middle .login-box .login-title{ - height: 18px; - line-height: 18px; + height: 24px; + line-height: 24px; font-size: 16px; color: #3c3c3c; - margin-top: 9px; - padding-bottom: 8px; + margin-top: 14px; + font-weight: 700; + margin-left: 18px; } .middle .login-box .form .userName{ height: 2.5em; width: 90%; background: white; margin: 0 auto; - margin-top: 1em; + margin-top: 2em; } .middle .login-box .form .userName .ico1{ background-color: #ddd; @@ -111,13 +112,13 @@ body{ width: 90%; background: white; margin: 0 auto; - margin-top: 1em; + margin-top: 2em; } .middle .login-box .form .login-btu{ height: 3em; width: 90%; margin: 0 auto; - margin-top: 1em; + margin-top: 2em; letter-spacing: 15px; border: 0; display: block; @@ -133,7 +134,7 @@ body{ } .middle .login-box .function{ color: #6C6C6C; - margin-top: 1em; + margin-top: 2em; display: flex; font-size: 0.8em; width: 60%; diff --git a/src/main/webapp/static/css/pendingPayment.css b/src/main/webapp/static/css/pendingPayment.css new file mode 100644 index 0000000..5d18bfc --- /dev/null +++ b/src/main/webapp/static/css/pendingPayment.css @@ -0,0 +1,13 @@ +*{ + box-sizing: border-box; + padding: 0; + margin: 0; +} +html{ + width: 100%; + +} +body{ + width: 100%; + padding: 1em!important; +} \ No newline at end of file diff --git a/src/main/webapp/static/css/personalHomepage.css b/src/main/webapp/static/css/personalHomepage.css index 3c332e9..ac063fb 100644 --- a/src/main/webapp/static/css/personalHomepage.css +++ b/src/main/webapp/static/css/personalHomepage.css @@ -5,9 +5,22 @@ } html{ width: 100%; - height: 100%; } body{ width: 100%; - height: 100%; + +} +.order-type .layui-tab .layui-tab-content .iframe-middle{ + width: 100%; + height: 700px; +} + +.layui-tab-brief>.layui-tab-title .layui-this{ + color: #17b5fe!important; +} +.layui-tab-brief>.layui-tab-more li.layui-this:after, .layui-tab-brief>.layui-tab-title .layui-this:after{ + border-bottom: 2px solid #17b5fe!important; +} +.layui-tab-title li:hover{ + color: #17b5fe!important; } \ No newline at end of file diff --git a/src/main/webapp/static/css/toBeEvaluated.css b/src/main/webapp/static/css/toBeEvaluated.css new file mode 100644 index 0000000..5d18bfc --- /dev/null +++ b/src/main/webapp/static/css/toBeEvaluated.css @@ -0,0 +1,13 @@ +*{ + box-sizing: border-box; + padding: 0; + margin: 0; +} +html{ + width: 100%; + +} +body{ + width: 100%; + padding: 1em!important; +} \ No newline at end of file diff --git a/src/main/webapp/static/css/toBeReceived.css b/src/main/webapp/static/css/toBeReceived.css new file mode 100644 index 0000000..5d18bfc --- /dev/null +++ b/src/main/webapp/static/css/toBeReceived.css @@ -0,0 +1,13 @@ +*{ + box-sizing: border-box; + padding: 0; + margin: 0; +} +html{ + width: 100%; + +} +body{ + width: 100%; + padding: 1em!important; +} \ No newline at end of file diff --git a/src/main/webapp/static/css/toBeShipped.css b/src/main/webapp/static/css/toBeShipped.css new file mode 100644 index 0000000..5d18bfc --- /dev/null +++ b/src/main/webapp/static/css/toBeShipped.css @@ -0,0 +1,13 @@ +*{ + box-sizing: border-box; + padding: 0; + margin: 0; +} +html{ + width: 100%; + +} +body{ + width: 100%; + padding: 1em!important; +} \ 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 new file mode 100644 index 0000000..96504d0 Binary files /dev/null and b/src/main/webapp/static/img/commodity/chufang01.jpg differ diff --git a/src/main/webapp/static/img/commodity/chufang02.jpg b/src/main/webapp/static/img/commodity/chufang02.jpg new file mode 100644 index 0000000..106f764 Binary files /dev/null and b/src/main/webapp/static/img/commodity/chufang02.jpg differ diff --git a/src/main/webapp/static/img/commodity/chufang03.jpg b/src/main/webapp/static/img/commodity/chufang03.jpg new file mode 100644 index 0000000..18ebab6 Binary files /dev/null and b/src/main/webapp/static/img/commodity/chufang03.jpg differ diff --git a/src/main/webapp/static/img/commodity/chufang04.jpg b/src/main/webapp/static/img/commodity/chufang04.jpg new file mode 100644 index 0000000..1ef7af8 Binary files /dev/null and b/src/main/webapp/static/img/commodity/chufang04.jpg differ diff --git a/src/main/webapp/static/img/commodity/chufang05.jpg b/src/main/webapp/static/img/commodity/chufang05.jpg new file mode 100644 index 0000000..74ee5d5 Binary files /dev/null and b/src/main/webapp/static/img/commodity/chufang05.jpg differ diff --git a/src/main/webapp/static/img/commodity/chufang06.jpg b/src/main/webapp/static/img/commodity/chufang06.jpg new file mode 100644 index 0000000..3180046 Binary files /dev/null and b/src/main/webapp/static/img/commodity/chufang06.jpg differ diff --git a/src/main/webapp/static/img/commodity/chufang07.jpg b/src/main/webapp/static/img/commodity/chufang07.jpg new file mode 100644 index 0000000..91ec745 Binary files /dev/null and b/src/main/webapp/static/img/commodity/chufang07.jpg differ diff --git a/src/main/webapp/static/img/commodity/chufang08.jpg b/src/main/webapp/static/img/commodity/chufang08.jpg new file mode 100644 index 0000000..31dc4fd Binary files /dev/null and b/src/main/webapp/static/img/commodity/chufang08.jpg differ diff --git a/src/main/webapp/static/img/commodity/dajiadian01.jpg b/src/main/webapp/static/img/commodity/dajiadian01.jpg new file mode 100644 index 0000000..badd5b3 Binary files /dev/null and b/src/main/webapp/static/img/commodity/dajiadian01.jpg differ diff --git a/src/main/webapp/static/img/commodity/dajiadian02.jpg b/src/main/webapp/static/img/commodity/dajiadian02.jpg new file mode 100644 index 0000000..38a637c Binary files /dev/null and b/src/main/webapp/static/img/commodity/dajiadian02.jpg differ diff --git a/src/main/webapp/static/img/commodity/dajiadian03.jpg b/src/main/webapp/static/img/commodity/dajiadian03.jpg new file mode 100644 index 0000000..7f3df5d Binary files /dev/null and b/src/main/webapp/static/img/commodity/dajiadian03.jpg differ diff --git a/src/main/webapp/static/img/commodity/dajiadian04.jpg b/src/main/webapp/static/img/commodity/dajiadian04.jpg new file mode 100644 index 0000000..3c3d883 Binary files /dev/null and b/src/main/webapp/static/img/commodity/dajiadian04.jpg differ diff --git a/src/main/webapp/static/img/commodity/dajiadian05.jpg b/src/main/webapp/static/img/commodity/dajiadian05.jpg new file mode 100644 index 0000000..d4d6154 Binary files /dev/null and b/src/main/webapp/static/img/commodity/dajiadian05.jpg differ diff --git a/src/main/webapp/static/img/commodity/dajiadian06.jpg b/src/main/webapp/static/img/commodity/dajiadian06.jpg new file mode 100644 index 0000000..cc00ce9 Binary files /dev/null and b/src/main/webapp/static/img/commodity/dajiadian06.jpg differ diff --git a/src/main/webapp/static/img/commodity/fangbian01.jpg b/src/main/webapp/static/img/commodity/fangbian01.jpg new file mode 100644 index 0000000..71ed7d1 Binary files /dev/null and b/src/main/webapp/static/img/commodity/fangbian01.jpg differ diff --git a/src/main/webapp/static/img/commodity/fangbian02.jpg b/src/main/webapp/static/img/commodity/fangbian02.jpg new file mode 100644 index 0000000..c84aca4 Binary files /dev/null and b/src/main/webapp/static/img/commodity/fangbian02.jpg differ diff --git a/src/main/webapp/static/img/commodity/fangbian03.jpg b/src/main/webapp/static/img/commodity/fangbian03.jpg new file mode 100644 index 0000000..5e33459 Binary files /dev/null and b/src/main/webapp/static/img/commodity/fangbian03.jpg differ diff --git a/src/main/webapp/static/img/commodity/fangbian04.jpg b/src/main/webapp/static/img/commodity/fangbian04.jpg new file mode 100644 index 0000000..441d9cb Binary files /dev/null and b/src/main/webapp/static/img/commodity/fangbian04.jpg differ diff --git a/src/main/webapp/static/img/commodity/fangbian05.jpg b/src/main/webapp/static/img/commodity/fangbian05.jpg new file mode 100644 index 0000000..c43db26 Binary files /dev/null and b/src/main/webapp/static/img/commodity/fangbian05.jpg differ diff --git a/src/main/webapp/static/img/commodity/kuzi01.jpg b/src/main/webapp/static/img/commodity/kuzi01.jpg new file mode 100644 index 0000000..d60d583 Binary files /dev/null and b/src/main/webapp/static/img/commodity/kuzi01.jpg differ diff --git a/src/main/webapp/static/img/commodity/kuzi02.jpg b/src/main/webapp/static/img/commodity/kuzi02.jpg new file mode 100644 index 0000000..8567322 Binary files /dev/null and b/src/main/webapp/static/img/commodity/kuzi02.jpg differ diff --git a/src/main/webapp/static/img/commodity/kuzi03.jpg b/src/main/webapp/static/img/commodity/kuzi03.jpg new file mode 100644 index 0000000..36f6194 Binary files /dev/null and b/src/main/webapp/static/img/commodity/kuzi03.jpg differ diff --git a/src/main/webapp/static/img/commodity/kuzi04.jpg b/src/main/webapp/static/img/commodity/kuzi04.jpg new file mode 100644 index 0000000..6df45f8 Binary files /dev/null and b/src/main/webapp/static/img/commodity/kuzi04.jpg differ diff --git a/src/main/webapp/static/img/commodity/kuzi05.jpg b/src/main/webapp/static/img/commodity/kuzi05.jpg new file mode 100644 index 0000000..3713523 Binary files /dev/null and b/src/main/webapp/static/img/commodity/kuzi05.jpg differ diff --git a/src/main/webapp/static/img/commodity/lingshi01.jpg b/src/main/webapp/static/img/commodity/lingshi01.jpg new file mode 100644 index 0000000..05b8864 Binary files /dev/null and b/src/main/webapp/static/img/commodity/lingshi01.jpg differ diff --git a/src/main/webapp/static/img/commodity/lingshi02.jpg b/src/main/webapp/static/img/commodity/lingshi02.jpg new file mode 100644 index 0000000..a223fe1 Binary files /dev/null and b/src/main/webapp/static/img/commodity/lingshi02.jpg differ diff --git a/src/main/webapp/static/img/commodity/lingshi03.jpg b/src/main/webapp/static/img/commodity/lingshi03.jpg new file mode 100644 index 0000000..6470bd7 Binary files /dev/null and b/src/main/webapp/static/img/commodity/lingshi03.jpg differ diff --git a/src/main/webapp/static/img/commodity/lingshi04.jpg b/src/main/webapp/static/img/commodity/lingshi04.jpg new file mode 100644 index 0000000..1b4b787 Binary files /dev/null and b/src/main/webapp/static/img/commodity/lingshi04.jpg differ diff --git a/src/main/webapp/static/img/commodity/lingshi05.jpg b/src/main/webapp/static/img/commodity/lingshi05.jpg new file mode 100644 index 0000000..b9fceee Binary files /dev/null and b/src/main/webapp/static/img/commodity/lingshi05.jpg differ diff --git a/src/main/webapp/static/img/commodity/nanxie01.jpg b/src/main/webapp/static/img/commodity/nanxie01.jpg new file mode 100644 index 0000000..3d4ef17 Binary files /dev/null and b/src/main/webapp/static/img/commodity/nanxie01.jpg differ diff --git a/src/main/webapp/static/img/commodity/nanxie02.jpg b/src/main/webapp/static/img/commodity/nanxie02.jpg new file mode 100644 index 0000000..db31cc9 Binary files /dev/null and b/src/main/webapp/static/img/commodity/nanxie02.jpg differ diff --git a/src/main/webapp/static/img/commodity/nanxie03.jpg b/src/main/webapp/static/img/commodity/nanxie03.jpg new file mode 100644 index 0000000..4c6af66 Binary files /dev/null and b/src/main/webapp/static/img/commodity/nanxie03.jpg differ diff --git a/src/main/webapp/static/img/commodity/nanxie04.jpg b/src/main/webapp/static/img/commodity/nanxie04.jpg new file mode 100644 index 0000000..4c9fb50 Binary files /dev/null and b/src/main/webapp/static/img/commodity/nanxie04.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvduanxiu01.jpg b/src/main/webapp/static/img/commodity/nvduanxiu01.jpg new file mode 100644 index 0000000..46e0dfc Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvduanxiu01.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvduanxiu02.jpg b/src/main/webapp/static/img/commodity/nvduanxiu02.jpg new file mode 100644 index 0000000..cf0cdf5 Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvduanxiu02.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvduanxiu03.jpg b/src/main/webapp/static/img/commodity/nvduanxiu03.jpg new file mode 100644 index 0000000..29787cc Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvduanxiu03.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvduanxiu04.jpg b/src/main/webapp/static/img/commodity/nvduanxiu04.jpg new file mode 100644 index 0000000..956f561 Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvduanxiu04.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvku01.jpg b/src/main/webapp/static/img/commodity/nvku01.jpg new file mode 100644 index 0000000..c2da90f Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvku01.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvku02.jpg b/src/main/webapp/static/img/commodity/nvku02.jpg new file mode 100644 index 0000000..f68d78e Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvku02.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvku03.jpg b/src/main/webapp/static/img/commodity/nvku03.jpg new file mode 100644 index 0000000..fe0cbaf Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvku03.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvku04.jpg b/src/main/webapp/static/img/commodity/nvku04.jpg new file mode 100644 index 0000000..abbdfac Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvku04.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvqun01.jpg b/src/main/webapp/static/img/commodity/nvqun01.jpg new file mode 100644 index 0000000..d3dc1eb Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvqun01.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvqun02.jpg b/src/main/webapp/static/img/commodity/nvqun02.jpg new file mode 100644 index 0000000..5b99da0 Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvqun02.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvqun03.jpg b/src/main/webapp/static/img/commodity/nvqun03.jpg new file mode 100644 index 0000000..91b900b Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvqun03.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvqun04.jpg b/src/main/webapp/static/img/commodity/nvqun04.jpg new file mode 100644 index 0000000..42f8375 Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvqun04.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvxie01.jpg b/src/main/webapp/static/img/commodity/nvxie01.jpg new file mode 100644 index 0000000..0d0053c Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvxie01.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvxie02.jpg b/src/main/webapp/static/img/commodity/nvxie02.jpg new file mode 100644 index 0000000..b06083c Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvxie02.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvxie03.jpg b/src/main/webapp/static/img/commodity/nvxie03.jpg new file mode 100644 index 0000000..f30c804 Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvxie03.jpg differ diff --git a/src/main/webapp/static/img/commodity/nvxie04.jpg b/src/main/webapp/static/img/commodity/nvxie04.jpg new file mode 100644 index 0000000..209baca Binary files /dev/null and b/src/main/webapp/static/img/commodity/nvxie04.jpg differ diff --git a/src/main/webapp/static/img/commodity/peijian01.jpg b/src/main/webapp/static/img/commodity/peijian01.jpg new file mode 100644 index 0000000..28cbdbe Binary files /dev/null and b/src/main/webapp/static/img/commodity/peijian01.jpg differ diff --git a/src/main/webapp/static/img/commodity/peijian02.jpg b/src/main/webapp/static/img/commodity/peijian02.jpg new file mode 100644 index 0000000..b5ba706 Binary files /dev/null and b/src/main/webapp/static/img/commodity/peijian02.jpg differ diff --git a/src/main/webapp/static/img/commodity/peijian03.jpg b/src/main/webapp/static/img/commodity/peijian03.jpg new file mode 100644 index 0000000..9e0d291 Binary files /dev/null and b/src/main/webapp/static/img/commodity/peijian03.jpg differ diff --git a/src/main/webapp/static/img/commodity/peijian04.jpg b/src/main/webapp/static/img/commodity/peijian04.jpg new file mode 100644 index 0000000..86f55b0 Binary files /dev/null and b/src/main/webapp/static/img/commodity/peijian04.jpg differ diff --git a/src/main/webapp/static/img/commodity/ruyin01.jpg b/src/main/webapp/static/img/commodity/ruyin01.jpg new file mode 100644 index 0000000..9b21fcd Binary files /dev/null and b/src/main/webapp/static/img/commodity/ruyin01.jpg differ diff --git a/src/main/webapp/static/img/commodity/ruyin02.jpg b/src/main/webapp/static/img/commodity/ruyin02.jpg new file mode 100644 index 0000000..c87838f Binary files /dev/null and b/src/main/webapp/static/img/commodity/ruyin02.jpg differ diff --git a/src/main/webapp/static/img/commodity/ruyin03.jpg b/src/main/webapp/static/img/commodity/ruyin03.jpg new file mode 100644 index 0000000..267cf5e Binary files /dev/null and b/src/main/webapp/static/img/commodity/ruyin03.jpg differ diff --git a/src/main/webapp/static/img/commodity/ruyin04.jpg b/src/main/webapp/static/img/commodity/ruyin04.jpg new file mode 100644 index 0000000..28f2b58 Binary files /dev/null and b/src/main/webapp/static/img/commodity/ruyin04.jpg differ diff --git a/src/main/webapp/static/img/commodity/ruyin05.jpg b/src/main/webapp/static/img/commodity/ruyin05.jpg new file mode 100644 index 0000000..94329f1 Binary files /dev/null and b/src/main/webapp/static/img/commodity/ruyin05.jpg differ diff --git a/src/main/webapp/static/img/commodity/shangzhuang01.jpg b/src/main/webapp/static/img/commodity/shangzhuang01.jpg new file mode 100644 index 0000000..cd60c01 Binary files /dev/null and b/src/main/webapp/static/img/commodity/shangzhuang01.jpg differ diff --git a/src/main/webapp/static/img/commodity/shangzhuang02.jpg b/src/main/webapp/static/img/commodity/shangzhuang02.jpg new file mode 100644 index 0000000..acbb0b6 Binary files /dev/null and b/src/main/webapp/static/img/commodity/shangzhuang02.jpg differ diff --git a/src/main/webapp/static/img/commodity/shangzhuang03.jpg b/src/main/webapp/static/img/commodity/shangzhuang03.jpg new file mode 100644 index 0000000..313985d Binary files /dev/null and b/src/main/webapp/static/img/commodity/shangzhuang03.jpg differ diff --git a/src/main/webapp/static/img/commodity/shangzhuang04.jpg b/src/main/webapp/static/img/commodity/shangzhuang04.jpg new file mode 100644 index 0000000..9bcd924 Binary files /dev/null and b/src/main/webapp/static/img/commodity/shangzhuang04.jpg differ diff --git a/src/main/webapp/static/img/commodity/shenghuo01.jpg b/src/main/webapp/static/img/commodity/shenghuo01.jpg new file mode 100644 index 0000000..7bba648 Binary files /dev/null and b/src/main/webapp/static/img/commodity/shenghuo01.jpg differ diff --git a/src/main/webapp/static/img/commodity/shenghuo02.jpg b/src/main/webapp/static/img/commodity/shenghuo02.jpg new file mode 100644 index 0000000..7cd0c22 Binary files /dev/null and b/src/main/webapp/static/img/commodity/shenghuo02.jpg differ diff --git a/src/main/webapp/static/img/commodity/shenghuo03.jpg b/src/main/webapp/static/img/commodity/shenghuo03.jpg new file mode 100644 index 0000000..1b86c92 Binary files /dev/null and b/src/main/webapp/static/img/commodity/shenghuo03.jpg differ diff --git a/src/main/webapp/static/img/commodity/shenghuo04.jpg b/src/main/webapp/static/img/commodity/shenghuo04.jpg new file mode 100644 index 0000000..154988b Binary files /dev/null and b/src/main/webapp/static/img/commodity/shenghuo04.jpg differ diff --git a/src/main/webapp/static/img/commodity/shenghuo05.jpg b/src/main/webapp/static/img/commodity/shenghuo05.jpg new file mode 100644 index 0000000..be3d814 Binary files /dev/null and b/src/main/webapp/static/img/commodity/shenghuo05.jpg differ diff --git a/src/main/webapp/static/img/commodity/shouji01.jpg b/src/main/webapp/static/img/commodity/shouji01.jpg new file mode 100644 index 0000000..870acbb Binary files /dev/null and b/src/main/webapp/static/img/commodity/shouji01.jpg differ diff --git a/src/main/webapp/static/img/commodity/shouji02.jpg b/src/main/webapp/static/img/commodity/shouji02.jpg new file mode 100644 index 0000000..d39081b Binary files /dev/null and b/src/main/webapp/static/img/commodity/shouji02.jpg differ diff --git a/src/main/webapp/static/img/commodity/shouji03.jpg b/src/main/webapp/static/img/commodity/shouji03.jpg new file mode 100644 index 0000000..8001fbe Binary files /dev/null and b/src/main/webapp/static/img/commodity/shouji03.jpg differ diff --git a/src/main/webapp/static/img/commodity/shouji04.jpg b/src/main/webapp/static/img/commodity/shouji04.jpg new file mode 100644 index 0000000..cdd89b4 Binary files /dev/null and b/src/main/webapp/static/img/commodity/shouji04.jpg differ diff --git a/src/main/webapp/static/img/commodity/shouji05.jpg b/src/main/webapp/static/img/commodity/shouji05.jpg new file mode 100644 index 0000000..376f9ae Binary files /dev/null and b/src/main/webapp/static/img/commodity/shouji05.jpg differ diff --git a/src/main/webapp/static/img/commodity/waitao01.jpg b/src/main/webapp/static/img/commodity/waitao01.jpg new file mode 100644 index 0000000..16dd74f Binary files /dev/null and b/src/main/webapp/static/img/commodity/waitao01.jpg differ diff --git a/src/main/webapp/static/img/commodity/waitao02.jpg b/src/main/webapp/static/img/commodity/waitao02.jpg new file mode 100644 index 0000000..6222605 Binary files /dev/null and b/src/main/webapp/static/img/commodity/waitao02.jpg differ diff --git a/src/main/webapp/static/img/commodity/waitao03.jpg b/src/main/webapp/static/img/commodity/waitao03.jpg new file mode 100644 index 0000000..d3fd3a3 Binary files /dev/null and b/src/main/webapp/static/img/commodity/waitao03.jpg differ diff --git a/src/main/webapp/static/img/commodity/waitao04.jpg b/src/main/webapp/static/img/commodity/waitao04.jpg new file mode 100644 index 0000000..2432053 Binary files /dev/null and b/src/main/webapp/static/img/commodity/waitao04.jpg differ diff --git a/src/main/webapp/static/img/ebuy-logo.png b/src/main/webapp/static/img/ebuy-logo.png new file mode 100644 index 0000000..09aee79 Binary files /dev/null and b/src/main/webapp/static/img/ebuy-logo.png differ diff --git a/src/main/webapp/static/img/logo.png b/src/main/webapp/static/img/logo.png new file mode 100644 index 0000000..116fc2e Binary files /dev/null and b/src/main/webapp/static/img/logo.png differ diff --git a/src/main/webapp/static/js/account.js b/src/main/webapp/static/js/account.js index 070fbdf..b25d681 100644 --- a/src/main/webapp/static/js/account.js +++ b/src/main/webapp/static/js/account.js @@ -1 +1,46 @@ -$(".iframe-middle").attr("src",localStorage.getItem("accountIframe")) \ No newline at end of file + //选择Tab页内容 + let accountTab = sessionStorage.getItem("accountTab"); +//个人首页 + if (accountTab == "personalHomepage") { + $(".layui-tab-title li:eq(0)").addClass("layui-this"); + $(".layui-tab-title li:eq(1)").removeClass("layui-this"); + $(".layui-tab-title li:eq(2)").removeClass("layui-this"); + $(".layui-tab-item:eq(0)").addClass("layui-show"); + $(".layui-tab-item:eq(1)").removeClass("layui-show"); + $(".layui-tab-item:eq(2)").removeClass("layui-show"); + //账户设置 + }else if (accountTab == "accountSettings") { + $(".layui-tab-title li:eq(0)").removeClass("layui-this"); + $(".layui-tab-title li:eq(1)").addClass("layui-this"); + $(".layui-tab-title li:eq(2)").removeClass("layui-this"); + $(".layui-tab-item:eq(0)").removeClass("layui-show"); + $(".layui-tab-item:eq(1)").addClass("layui-show"); + $(".layui-tab-item:eq(2)").removeClass("layui-show"); + //消息 +} else if (accountTab == "accountSettings") { + $(".layui-tab-title li:eq(0)").removeClass("layui-this"); + $(".layui-tab-title li:eq(1)").removeClass("layui-this"); + $(".layui-tab-title li:eq(2)").addClass("layui-this"); + $(".layui-tab-item:eq(0)").removeClass("layui-show"); + $(".layui-tab-item:eq(1)").removeClass("layui-show"); + $(".layui-tab-item:eq(2)").addClass("layui-show"); +} + +//logo跳转个人首页 +$(".my-logo").on("click",function () { + $(".layui-tab-title li:eq(0)").addClass("layui-this"); + $(".layui-tab-title li:eq(1)").removeClass("layui-this"); + $(".layui-tab-title li:eq(2)").removeClass("layui-this"); + $(".layui-tab-item:eq(0)").addClass("layui-show"); + $(".layui-tab-item:eq(1)").removeClass("layui-show"); + $(".layui-tab-item:eq(2)").removeClass("layui-show"); +}); + +layui.use(['layer',"jquery","element","carousel"], function() { + const layer = layui.layer + ,$ = layui.jquery + ,element = layui.element + ,carousel = layui.carousel; + + +}) \ No newline at end of file diff --git a/src/main/webapp/static/js/allOrder.js b/src/main/webapp/static/js/allOrder.js new file mode 100644 index 0000000..254d8e6 --- /dev/null +++ b/src/main/webapp/static/js/allOrder.js @@ -0,0 +1,201 @@ + +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:{}, + success:function (data) { + orderInfo = data; + let orderTable = ""; + for (let i = 0; i < data.length; i++) { + let order = ""; + //待付款 + if (data[i].order_status == "01") { + 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) +
+
+ 等待买家付款 + 订单详情 +
+
+ + 找朋友帮忙付 + 取消订单 + 修改订单 +
+
+
`; + //待发货 + } else if (data[i].order_status == "02") { + 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) +
+
+ 买家已付款 + 订单详情 +
+
+ 提醒卖家发货 +
+
+
` + //待收货 + }else if (data[i].order_status == "03") { + 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) +
+
+ 等待买家付款 + 订单详情 + 花呗账单 + 查看物流 +
+
+ + 申请开票 +
+
+
` + //待评价 + }else if (data[i].order_status == "04") { + 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/index.js b/src/main/webapp/static/js/index.js index 8c86e3a..8993e02 100644 --- a/src/main/webapp/static/js/index.js +++ b/src/main/webapp/static/js/index.js @@ -101,13 +101,18 @@ $(".more-equity").on("click",function () { //log去首页 $(".middle .log").on("click",function () { + window.location.href="/ebuy/middle"; +}) + +//E-BUY首页 +$(".goHomepage").on("click",function () { window.location.href="/ebuy/index"; }) //用户退出 $(".sign-out").on("click",function () { layer.confirm('确认退出?', function(index){ - localStorage.setItem("userInfo",""); + sessionStorage.setItem("userInfo",""); location.reload(); layer.close(index); }); @@ -116,7 +121,7 @@ $(".sign-out").on("click",function () { //跳转到账户管理 $(".account-management").on("click",function () { $(".iframe-middle").attr("src","/ebuy/account"); - localStorage.setItem("accountIframe","accountSettings"); + sessionStorage.setItem("accountTab","accountSettings"); }) layui.use(['layer',"jquery","element","carousel"], function() { @@ -139,7 +144,7 @@ layui.use(['layer',"jquery","element","carousel"], function() { }); //判断登录 - let userInfo = JSON.parse(localStorage.getItem("userInfo")); + let userInfo = JSON.parse(sessionStorage.getItem("userInfo")); console.log(userInfo); if (userInfo.user_name != "" || userInfo.user_name != null){ $(".login-information").css("display","block"); @@ -173,6 +178,18 @@ layui.use(['layer',"jquery","element","carousel"], function() { } } + //头像去个人首页 + $(".head .content .login-information .login-text .personInfo .info .head-portrait").on("click",function () { + $(".iframe-middle").attr("src","/ebuy/account"); + sessionStorage.setItem("accountTab","personalHomepage"); + }) + + //middle页面中的头像去个人首页 + $(".middle .box .navigation-carousel-person .person .person-person .head-portrait .photo,.middle .box .navigation-carousel-person .person .person-person .person-name").on("click",function () { + $(".iframe-middle", window.parent.document).attr("src","/ebuy/account"); + sessionStorage.setItem("accountTab","personalHomepage"); + }) + //联系客服 $(".service").on("click",function () { layer.msg("功能正在完善,联系客服:15006732580!") diff --git a/src/main/webapp/static/js/login.js b/src/main/webapp/static/js/login.js index 0531399..2b2260a 100644 --- a/src/main/webapp/static/js/login.js +++ b/src/main/webapp/static/js/login.js @@ -19,7 +19,7 @@ layui.use(['layer',"jquery"], function() { success: function (data) { let msg = data.msg; if (msg == "登录成功!") { - localStorage.setItem("userInfo",JSON.stringify(data)); + sessionStorage.setItem("userInfo",JSON.stringify(data)); //登录成功 console.log(msg); console.log(localStorage.setItem("userInfo",JSON.stringify(data))); diff --git a/src/main/webapp/static/js/personalHomepage.js b/src/main/webapp/static/js/personalHomepage.js new file mode 100644 index 0000000..1d46227 --- /dev/null +++ b/src/main/webapp/static/js/personalHomepage.js @@ -0,0 +1,8 @@ + +layui.use(['layer',"jquery","element","carousel"], function() { + const layer = layui.layer + , $ = layui.jquery + , element = layui.element + , carousel = layui.carousel; + +}) \ No newline at end of file diff --git a/src/main/webapp/static/js/toBeShipped.js b/src/main/webapp/static/js/toBeShipped.js new file mode 100644 index 0000000..8ba91ee --- /dev/null +++ b/src/main/webapp/static/js/toBeShipped.js @@ -0,0 +1,17 @@ + +layui.use(['layer',"jquery","element","carousel"], function() { + const layer = layui.layer + , $ = layui.jquery + , element = layui.element + , 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") + + +}) \ No newline at end of file