更新

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<Map<String,Object>> allOrderTable() {
+        List<Map<String,Object>> result = ebuyService.allOrderTable();
+        return result;
+    }
 
 }

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<String,Object> map);
+
+    /**
+     * 所有订单Table
+     */
+    List<Map<String,Object>> allOrderTable();
+
+    /**
+     * 查询字典表
+     */
+    List<Map<String,Object>> queryDictionary(String[] ids);
 }

src/main/java/com/phy/ebuy/dao/mapping/EbuyMapper.xml

@@ -29,4 +29,36 @@
             ( SELECT RIGHT ( RAND( ), 16 ) )
             );
     </insert>
+
+    <!--获取所有订单-->
+    <select id="allOrderTable" resultType="map">
+    SELECT
+	o.creat_time creat_time,
+	o.order_id order_id,
+	o.businesses_id businesses_id,
+	b.business_name businesses_name,
+	c.commodity_photo commodity_photo,
+	c.commodity_name commodity_name,
+	o.commodity_attribute commodity_attribute,
+	c.commodity_price commodity_price,
+	o.commodity_amount commodity_amount,
+	o.order_status order_status
+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
+    </select>
+
+    <!--查询字典表-->
+    <select id="queryDictionary" resultType="map">
+        SELECT
+	*
+FROM
+	ebuy_dictionaries
+WHERE
+	id IN
+        <foreach collection="array" open="(" separator="," close=")" item="id">
+        #{id}
+    </foreach>
+    </select>
 </mapper>

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<String,Object> registerSub(Map<String,Object> parameter);
 
+    /**
+     * 所有订单Table
+     */
+    List<Map<String,Object>> allOrderTable();
 }

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<Map<String, Object>> allOrderTable() {
+        List<Map<String,Object>> result  = ebuyMapper.allOrderTable();
+        for (Map<String, Object> map : result ) {
+            String ids = (String) map.get("commodity_attribute");
+            String[] idses = ids.split(",");
+            List<Map<String,Object>> commodityAttributeList = ebuyMapper.queryDictionary(idses);
+            String commodityAttribute = "";
+            String commodityAttributeString ;
+            for (Map<String, Object> commodityAttributemap : commodityAttributeList ) {
+                commodityAttributeString =  commodityAttributemap.get("type_down")+":"+commodityAttributemap.get("type_down_details")+" ";
+                commodityAttribute += commodityAttributeString;
+            }
+            map.put("commodity_attribute",commodityAttribute);
+        }
+        return result;
+    }
 }

src/main/webapp/WEB-INF/view/account.css

@@ -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);
-}

src/main/webapp/WEB-INF/view/account.html

@@ -4,15 +4,41 @@
     <meta charset="UTF-8">
     <title>账户管理</title>
     <link rel="stylesheet" href="../../static/css/account.css">
+	<link rel="shortcut icon" type="image/x-icon" href="../../static/img/favicon.ico" rel="external nofollow" />
+    <link rel="stylesheet" href="../../static/layui/css/layui.css">
 
 </head>
 <body>
     <div class="head">
-        <div class="my-logo"></div>
+        <div class="my-logo">
-        <div class="my-tab"></div>
+		</div>
-        <div class="search"></div>
+        <div class="my-tab layui-tab">
+			<ul class="layui-tab-title">
+			    <li class="layui-this">首页</li>
+			    <li>账户设置</li>
+			    <li>消息</li>
+			  </ul>
+			  <div class="layui-tab-content">
+			      <div class="layui-tab-item layui-show">
+					   <iframe src="/ebuy/personalHomepage"  class="iframe-middle" frameborder="0"></iframe>
+				  </div>
+			      <div class="layui-tab-item">
+					  <iframe src="/ebuy/accountSettings" class="iframe-middle" frameborder="0"></iframe>
+				  </div>
+			      <div class="layui-tab-item">
+					  <iframe src="/ebuy/message" class="iframe-middle" frameborder="0"></iframe>
+				  </div>
+			  </div>
+		</div>
+        <div class="search">
+			<input type="text" name="" id="" value="" />
+			<span>搜索</span>
+		</div>
     </div>
-    <iframe src="/ebuy/personalHomepage" class="iframe-middle" frameborder="0"></iframe>
+    <!-- <iframe src="/ebuy/personalHomepage" class="iframe-middle" frameborder="0"></iframe> -->
 </body>
+<script src="../../static/layui/layui.all.js"></script>
+<script src="../../static/js/jquery-1.12.2.js"></script>
+<script src="../../static/layui/layui.js"></script>
 <script src="../../static/js/account.js"></script>
 </html>

src/main/webapp/WEB-INF/view/account/accountSettings.html

@@ -9,7 +9,9 @@
 	<script src="../../static/layui/layui.all.js"></script>
 </head>
 <body>
-
+    <div class="">
+        <h1>账户设置</h1>
+    </div>
 </body>
 <script src="../../static/layui/layui.js"></script>
 <script src="../../static/js/jquery-1.12.2.js"></script>

src/main/webapp/WEB-INF/view/account/message.html

@@ -9,7 +9,9 @@
 	<script src="../../static/layui/layui.all.js"></script>
 </head>
 <body>
-
+    <div class="">
+        <h1>消息</h1>
+    </div>
 </body>
 <script src="../../static/layui/layui.js"></script>
 <script src="../../static/js/jquery-1.12.2.js"></script>

src/main/webapp/WEB-INF/view/account/personalHomepage.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>个人首页</title>
+    <link rel="stylesheet" href="../../static/css/personalHomepage.css">
+	<link rel="shortcut icon" type="image/x-icon" href="../../static/img/favicon.ico" rel="external nofollow" />
+	<link rel="stylesheet" href="../../static/layui/css/layui.css">
+	<script src="../../static/layui/layui.all.js"></script>
+
+
+</head>
+<body>
+    <div class="order-type">
+        <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+            <ul class="layui-tab-title">
+                <li class="layui-this">所有订单</li>
+                <li>待付款</li>
+                <li>待发货</li>
+                <li>待收货</li>
+                <li>待评价</li>
+            </ul>
+
+            <div class="layui-tab-content">
+                <div class="layui-tab-item layui-show">
+                    <iframe src="/ebuy/allOrder" class="iframe-middle" frameborder="0"></iframe>
+                </div>
+                <div class="layui-tab-item">
+                    <iframe src="/ebuy/pendingPayment" class="iframe-middle" frameborder="0"></iframe>
+                </div>
+                <div class="layui-tab-item">
+                    <iframe src="/ebuy/toBeShipped" class="iframe-middle" frameborder="0"></iframe>
+                </div>
+                <div class="layui-tab-item">
+                    <iframe src="/ebuy/toBeReceived" class="iframe-middle" frameborder="0"></iframe>
+                </div>
+                <div class="layui-tab-item">
+                    <iframe src="/ebuy/toBeEvaluated" class="iframe-middle" frameborder="0"></iframe>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</body>
+<script src="../../static/layui/layui.js"></script>
+<script src="../../static/js/jquery-1.12.2.js"></script>
+<script src="../../../static/js/personalHomepage.js"></script>
+</html>

src/main/webapp/WEB-INF/view/account/personalHomepage/allOrder.html

@@ -0,0 +1,202 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>所有订单</title>
+    <link rel="stylesheet" href="../../../../static/css/allOrder.css">
+    <link rel="shortcut icon" type="image/x-icon" href="../../static/img/favicon.ico" rel="external nofollow" />
+    <link rel="stylesheet" href="../../static/layui/css/layui.css">
+    <script src="../../static/layui/layui.all.js"></script>
+</head>
+<body>
+    <div class="content">
+        <div class="orderSearch">
+            <input type="text" placeholder="输入商品标题或订单号进行搜索" name="" id="" value="">
+            <span class="span">订单搜索</span>
+        </div>
+        <div class="table">
+            <div class="table-head">
+                <div class="div1">宝贝</div>
+                <div class="div2">单价</div>
+                <div class="div3">数量</div>
+                <div class="div4">商品操作</div>
+                <div class="div4">实付款</div>
+                <div class="div4">交易状态</div>
+                <div class="div4">交易操作</div>
+            </div>
+            <div class="table-body">
+                <!--&lt;!&ndash;待付款&ndash;&gt;-->
+                <!--<div class="oneOrder">-->
+                    <!--<div class="top">-->
+                        <!--<div class="timeAndOrderId">-->
+                            <!--<div class="time">2020-01-13</div>-->
+                            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+                        <!--</div>-->
+                        <!--<div class="businessName">-->
+                            <!--<span>幽炫数码专营店</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--<div class="bottom">-->
+                        <!--<div class="commodityInfo">-->
+                            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+                            <!--<div class="commodityNameAndCommodityAttribute">-->
+                                <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+                                <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+                            <!--</div>-->
+                        <!--</div>-->
+                        <!--<div class="commodityPrice">-->
+                            <!--￥229.00-->
+                        <!--</div>-->
+                        <!--<div class="commodityAmount">1</div>-->
+                        <!--<div class="commodityOperation">-->
+                            <!--<span>违规举报</span>-->
+                        <!--</div>-->
+                        <!--<div class="actualPayment">-->
+                            <!--<span>￥241.00</span>-->
+                            <!--<span>(含运费：￥12.00)</span>-->
+                        <!--</div>-->
+                        <!--<div class="orderStatus">-->
+                            <!--<span>等待买家付款</span>-->
+                            <!--<span>订单详情</span>-->
+                        <!--</div>-->
+                        <!--<div class="orderOperation">-->
+                            <!--<button>立即付款</button>-->
+                            <!--<span>找朋友帮忙付</span>-->
+                            <!--<span>取消订单</span>-->
+                            <!--<span>修改订单</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+                <!--&lt;!&ndash;待发货&ndash;&gt;-->
+                <!--<div class="oneOrder">-->
+                    <!--<div class="top">-->
+                        <!--<div class="timeAndOrderId">-->
+                            <!--<div class="time">2020-01-13</div>-->
+                            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+                        <!--</div>-->
+                        <!--<div class="businessName">-->
+                            <!--<span>幽炫数码专营店</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--<div class="bottom">-->
+                        <!--<div class="commodityInfo">-->
+                            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+                            <!--<div class="commodityNameAndCommodityAttribute">-->
+                                <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+                                <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+                            <!--</div>-->
+                        <!--</div>-->
+                        <!--<div class="commodityPrice">-->
+                            <!--￥229.00-->
+                        <!--</div>-->
+                        <!--<div class="commodityAmount">1</div>-->
+                        <!--<div class="commodityOperation">-->
+                            <!--<span>退款/退货</span>-->
+                        <!--</div>-->
+                        <!--<div class="actualPayment">-->
+                            <!--<span>￥241.00</span>-->
+                            <!--<span>(含运费：￥12.00)</span>-->
+                        <!--</div>-->
+                        <!--<div class="orderStatus">-->
+                            <!--<span>买家已付款</span>-->
+                            <!--<span>订单详情</span>-->
+                        <!--</div>-->
+                        <!--<div class="orderOperation">-->
+                            <!--<span>提醒卖家发货</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+                <!--&lt;!&ndash;待收货&ndash;&gt;-->
+                <!--<div class="oneOrder">-->
+                    <!--<div class="top">-->
+                        <!--<div class="timeAndOrderId">-->
+                            <!--<div class="time">2020-01-13</div>-->
+                            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+                        <!--</div>-->
+                        <!--<div class="businessName">-->
+                            <!--<span>幽炫数码专营店</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--<div class="bottom">-->
+                        <!--<div class="commodityInfo">-->
+                            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+                            <!--<div class="commodityNameAndCommodityAttribute">-->
+                                <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+                                <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+                            <!--</div>-->
+                        <!--</div>-->
+                        <!--<div class="commodityPrice">-->
+                            <!--￥229.00-->
+                        <!--</div>-->
+                        <!--<div class="commodityAmount">1</div>-->
+                        <!--<div class="commodityOperation">-->
+                            <!--<span>退款/退换货</span>-->
+                            <!--<span>投诉商家</span>-->
+                            <!--<span>退运保险</span>-->
+                        <!--</div>-->
+                        <!--<div class="actualPayment">-->
+                            <!--<span>￥241.00</span>-->
+                            <!--<span>(含运费：￥12.00)</span>-->
+                        <!--</div>-->
+                        <!--<div class="orderStatus">-->
+                            <!--<span>等待买家付款</span>-->
+                            <!--<span>订单详情</span>-->
+                            <!--<span>花呗账单</span>-->
+                            <!--<span class="evaluate">查看物流</span>-->
+                        <!--</div>-->
+                        <!--<div class="orderOperation">-->
+                            <!--<button>确认收货</button>-->
+                            <!--<span>申请开票</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+                <!--&lt;!&ndash;待评价&ndash;&gt;-->
+                <!--<div class="oneOrder">-->
+                    <!--<div class="top">-->
+                        <!--<div class="timeAndOrderId">-->
+                            <!--<div class="time">2020-01-13</div>-->
+                            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+                        <!--</div>-->
+                        <!--<div class="businessName">-->
+                            <!--<span>幽炫数码专营店</span>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                    <!--<div class="bottom">-->
+                        <!--<div class="commodityInfo">-->
+                            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+                            <!--<div class="commodityNameAndCommodityAttribute">-->
+                                <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+                                <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+                            <!--</div>-->
+                        <!--</div>-->
+                        <!--<div class="commodityPrice">-->
+                            <!--￥229.00-->
+                        <!--</div>-->
+                        <!--<div class="commodityAmount">1</div>-->
+                        <!--<div class="commodityOperation">-->
+                            <!--<span>申请售后</span>-->
+                            <!--<span>投诉商家</span>-->
+                        <!--</div>-->
+                        <!--<div class="actualPayment">-->
+                            <!--<span>￥241.00</span>-->
+                            <!--<span>(含运费：￥12.00)</span>-->
+                        <!--</div>-->
+                        <!--<div class="orderStatus">-->
+                            <!--<span>交易成功</span>-->
+                            <!--<span>订单详情</span>-->
+                            <!--<span>花呗账单</span>-->
+                            <!--<span>查看物流</span>-->
+                        <!--</div>-->
+                        <!--<div class="orderOperation">-->
+                            <!--<div class="evaluate">评价</div>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+            </div>
+        </div>
+    </div>
+</body>
+<script src="../../static/layui/layui.js"></script>
+<script src="../../static/js/jquery-1.12.2.js"></script>
+<script src="../../../../static/js/allOrder.js"></script>
+</html>

src/main/webapp/WEB-INF/view/account/personalHomepage/pendingPayment.html

@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>待付款</title>
+    <link rel="stylesheet" href="../../../../static/css/pendingPayment.css">
+</head>
+<body>
+<div class="content">
+    <!--<div class="orderSearch">-->
+        <!--<input type="text" placeholder="输入商品标题或订单号进行搜索" name="" id="" value="">-->
+        <!--<span class="span">订单搜索</span>-->
+    <!--</div>-->
+    <div class="table">
+        <div class="table-head">
+            <div class="div1">宝贝</div>
+            <div class="div2">单价</div>
+            <div class="div3">数量</div>
+            <div class="div4">商品操作</div>
+            <div class="div4">实付款</div>
+            <div class="div4">交易状态</div>
+            <div class="div4">交易操作</div>
+        </div>
+        <div class="table-body">
+            <!--待付款-->
+            <div class="oneOrder">
+            <div class="top">
+            <div class="timeAndOrderId">
+            <div class="time">2020-01-13</div>
+            <div class="orderId">订单号: 814491555504605953</div>
+            </div>
+            <div class="businessName">
+            <span>幽炫数码专营店</span>
+            </div>
+            </div>
+            <div class="bottom">
+            <div class="commodityInfo">
+            <img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>
+            <div class="commodityNameAndCommodityAttribute">
+            <div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>
+            <div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>
+            </div>
+            </div>
+            <div class="commodityPrice">
+            ￥229.00
+            </div>
+            <div class="commodityAmount">1</div>
+            <div class="commodityOperation">
+            <span>违规举报</span>
+            </div>
+            <div class="actualPayment">
+            <span>￥241.00</span>
+            <span>(含运费：￥12.00)</span>
+            </div>
+            <div class="orderStatus">
+            <span>等待买家付款</span>
+            <span>订单详情</span>
+            </div>
+            <div class="orderOperation">
+            <button>立即付款</button>
+            <span>找朋友帮忙付</span>
+            <span>取消订单</span>
+            <span>修改订单</span>
+            </div>
+            </div>
+            </div>
+            <!--&lt;!&ndash;待发货&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>退款/退货</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>买家已付款</span>-->
+            <!--<span>订单详情</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<span>提醒卖家发货</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--&lt;!&ndash;待收货&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>退款/退换货</span>-->
+            <!--<span>投诉商家</span>-->
+            <!--<span>退运保险</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>等待买家付款</span>-->
+            <!--<span>订单详情</span>-->
+            <!--<span>花呗账单</span>-->
+            <!--<span class="evaluate">查看物流</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<button>确认收货</button>-->
+            <!--<span>申请开票</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--&lt;!&ndash;待评价&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>申请售后</span>-->
+            <!--<span>投诉商家</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>交易成功</span>-->
+            <!--<span>订单详情</span>-->
+            <!--<span>花呗账单</span>-->
+            <!--<span>查看物流</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<div class="evaluate">评价</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/view/account/personalHomepage/toBeEvaluated.html

@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>待评价</title>
+    <link rel="stylesheet" href="../../../../static/css/toBeEvaluated.css">
+</head>
+<body>
+<div class="content">
+    <div class="orderSearch">
+        <input type="text" placeholder="输入商品标题或订单号进行搜索" name="" id="" value="">
+        <span class="span">订单搜索</span>
+    </div>
+    <div class="table">
+        <div class="table-head">
+            <div class="div1">宝贝</div>
+            <div class="div2">单价</div>
+            <div class="div3">数量</div>
+            <div class="div4">商品操作</div>
+            <div class="div4">实付款</div>
+            <div class="div4">交易状态</div>
+            <div class="div4">交易操作</div>
+        </div>
+        <div class="table-body">
+            <!--&lt;!&ndash;待付款&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>违规举报</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>等待买家付款</span>-->
+            <!--<span>订单详情</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<button>立即付款</button>-->
+            <!--<span>找朋友帮忙付</span>-->
+            <!--<span>取消订单</span>-->
+            <!--<span>修改订单</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--待发货-->
+            <div class="oneOrder">
+            <div class="top">
+            <div class="timeAndOrderId">
+            <div class="time">2020-01-13</div>
+            <div class="orderId">订单号: 814491555504605953</div>
+            </div>
+            <div class="businessName">
+            <span>幽炫数码专营店</span>
+            </div>
+            </div>
+            <div class="bottom">
+            <div class="commodityInfo">
+            <img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>
+            <div class="commodityNameAndCommodityAttribute">
+            <div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>
+            <div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>
+            </div>
+            </div>
+            <div class="commodityPrice">
+            ￥229.00
+            </div>
+            <div class="commodityAmount">1</div>
+            <div class="commodityOperation">
+            <span>退款/退货</span>
+            </div>
+            <div class="actualPayment">
+            <span>￥241.00</span>
+            <span>(含运费：￥12.00)</span>
+            </div>
+            <div class="orderStatus">
+            <span>买家已付款</span>
+            <span>订单详情</span>
+            </div>
+            <div class="orderOperation">
+            <span>提醒卖家发货</span>
+            </div>
+            </div>
+            </div>
+            <!--&lt;!&ndash;待收货&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>退款/退换货</span>-->
+            <!--<span>投诉商家</span>-->
+            <!--<span>退运保险</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>等待买家付款</span>-->
+            <!--<span>订单详情</span>-->
+            <!--<span>花呗账单</span>-->
+            <!--<span class="evaluate">查看物流</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<button>确认收货</button>-->
+            <!--<span>申请开票</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--&lt;!&ndash;待评价&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>申请售后</span>-->
+            <!--<span>投诉商家</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>交易成功</span>-->
+            <!--<span>订单详情</span>-->
+            <!--<span>花呗账单</span>-->
+            <!--<span>查看物流</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<div class="evaluate">评价</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/view/account/personalHomepage/toBeReceived.html

@@ -0,0 +1,196 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>待收货</title>
+    <link rel="stylesheet" href="../../../../static/css/toBeReceived.css">
+</head>
+<body>
+<div class="content">
+    <!--<div class="orderSearch">-->
+        <!--<input type="text" placeholder="输入商品标题或订单号进行搜索" name="" id="" value="">-->
+        <!--<span class="span">订单搜索</span>-->
+    <!--</div>-->
+    <div class="table">
+        <div class="table-head">
+            <div class="div1">宝贝</div>
+            <div class="div2">单价</div>
+            <div class="div3">数量</div>
+            <div class="div4">商品操作</div>
+            <div class="div4">实付款</div>
+            <div class="div4">交易状态</div>
+            <div class="div4">交易操作</div>
+        </div>
+        <div class="table-body">
+            <!--&lt;!&ndash;待付款&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>违规举报</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>等待买家付款</span>-->
+            <!--<span>订单详情</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<button>立即付款</button>-->
+            <!--<span>找朋友帮忙付</span>-->
+            <!--<span>取消订单</span>-->
+            <!--<span>修改订单</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--&lt;!&ndash;待发货&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>退款/退货</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>买家已付款</span>-->
+            <!--<span>订单详情</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<span>提醒卖家发货</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--待收货-->
+            <div class="oneOrder">
+            <div class="top">
+            <div class="timeAndOrderId">
+            <div class="time">2020-01-13</div>
+            <div class="orderId">订单号: 814491555504605953</div>
+            </div>
+            <div class="businessName">
+            <span>幽炫数码专营店</span>
+            </div>
+            </div>
+            <div class="bottom">
+            <div class="commodityInfo">
+            <img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>
+            <div class="commodityNameAndCommodityAttribute">
+            <div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>
+            <div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>
+            </div>
+            </div>
+            <div class="commodityPrice">
+            ￥229.00
+            </div>
+            <div class="commodityAmount">1</div>
+            <div class="commodityOperation">
+            <span>退款/退换货</span>
+            <span>投诉商家</span>
+            <span>退运保险</span>
+            </div>
+            <div class="actualPayment">
+            <span>￥241.00</span>
+            <span>(含运费：￥12.00)</span>
+            </div>
+            <div class="orderStatus">
+            <span>等待买家付款</span>
+            <span>订单详情</span>
+            <span>花呗账单</span>
+            <span class="evaluate">查看物流</span>
+            </div>
+            <div class="orderOperation">
+            <button>确认收货</button>
+            <span>申请开票</span>
+            </div>
+            </div>
+            </div>
+            <!--&lt;!&ndash;待评价&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>申请售后</span>-->
+            <!--<span>投诉商家</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>交易成功</span>-->
+            <!--<span>订单详情</span>-->
+            <!--<span>花呗账单</span>-->
+            <!--<span>查看物流</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<div class="evaluate">评价</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/webapp/WEB-INF/view/account/personalHomepage/toBeShipped.html

@@ -0,0 +1,202 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>待发货</title>
+    <link rel="stylesheet" href="../../../../static/css/toBeShipped.css">
+    <link rel="shortcut icon" type="image/x-icon" href="../../static/img/favicon.ico" rel="external nofollow" />
+    <link rel="stylesheet" href="../../static/layui/css/layui.css">
+</head>
+<body>
+<div class="content">
+    <!--<div class="orderSearch">-->
+        <!--<input type="text" placeholder="输入商品标题或订单号进行搜索" name="" id="" value="">-->
+        <!--<span class="span">订单搜索</span>-->
+    <!--</div>-->
+    <div class="table">
+        <div class="table-head">
+            <div class="div1">宝贝</div>
+            <div class="div2">单价</div>
+            <div class="div3">数量</div>
+            <div class="div4">商品操作</div>
+            <div class="div4">实付款</div>
+            <div class="div4">交易状态</div>
+            <div class="div4">交易操作</div>
+        </div>
+        <div class="table-body">
+            <!--&lt;!&ndash;待付款&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>违规举报</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>等待买家付款</span>-->
+            <!--<span>订单详情</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<button>立即付款</button>-->
+            <!--<span>找朋友帮忙付</span>-->
+            <!--<span>取消订单</span>-->
+            <!--<span>修改订单</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--&lt;!&ndash;待发货&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>退款/退货</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>买家已付款</span>-->
+            <!--<span>订单详情</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<span>提醒卖家发货</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--&lt;!&ndash;待收货&ndash;&gt;-->
+            <!--<div class="oneOrder">-->
+            <!--<div class="top">-->
+            <!--<div class="timeAndOrderId">-->
+            <!--<div class="time">2020-01-13</div>-->
+            <!--<div class="orderId">订单号: 814491555504605953</div>-->
+            <!--</div>-->
+            <!--<div class="businessName">-->
+            <!--<span>幽炫数码专营店</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="bottom">-->
+            <!--<div class="commodityInfo">-->
+            <!--<img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>-->
+            <!--<div class="commodityNameAndCommodityAttribute">-->
+            <!--<div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>-->
+            <!--<div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--<div class="commodityPrice">-->
+            <!--￥229.00-->
+            <!--</div>-->
+            <!--<div class="commodityAmount">1</div>-->
+            <!--<div class="commodityOperation">-->
+            <!--<span>退款/退换货</span>-->
+            <!--<span>投诉商家</span>-->
+            <!--<span>退运保险</span>-->
+            <!--</div>-->
+            <!--<div class="actualPayment">-->
+            <!--<span>￥241.00</span>-->
+            <!--<span>(含运费：￥12.00)</span>-->
+            <!--</div>-->
+            <!--<div class="orderStatus">-->
+            <!--<span>等待买家付款</span>-->
+            <!--<span>订单详情</span>-->
+            <!--<span>花呗账单</span>-->
+            <!--<span class="evaluate">查看物流</span>-->
+            <!--</div>-->
+            <!--<div class="orderOperation">-->
+            <!--<button>确认收货</button>-->
+            <!--<span>申请开票</span>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--</div>-->
+            <!--待评价-->
+            <div class="oneOrder">
+            <div class="top">
+            <div class="timeAndOrderId">
+            <div class="time">2020-01-13</div>
+            <div class="orderId">订单号: 814491555504605953</div>
+            </div>
+            <div class="businessName">
+            <span>幽炫数码专营店</span>
+            </div>
+            </div>
+            <div class="bottom">
+            <div class="commodityInfo">
+            <img src="../../../../static/img/commodity/chufang01.jpg" class="commodityPhoto" alt=""/>
+            <div class="commodityNameAndCommodityAttribute">
+            <div class="commodityName">【活动】威刚16G 8G 4G 2666 2400 2133笔记本电脑内存条ddr4高速 [交易快照]</div>
+            <div class="commodityAttribute">内存频率：2400MHz颜色分类：威刚 8G DDR4 笔记本内存条</div>
+            </div>
+            </div>
+            <div class="commodityPrice">
+            ￥229.00
+            </div>
+            <div class="commodityAmount">1</div>
+            <div class="commodityOperation">
+            <span>申请售后</span>
+            <span>投诉商家</span>
+            </div>
+            <div class="actualPayment">
+            <span>￥241.00</span>
+            <span>(含运费：￥12.00)</span>
+            </div>
+            <div class="orderStatus">
+            <span>交易成功</span>
+            <span>订单详情</span>
+            <span>花呗账单</span>
+            <span>查看物流</span>
+            </div>
+            <div class="orderOperation">
+            <div class="evaluate">评价</div>
+            </div>
+            </div>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+<script src="../../static/layui/layui.all.js"></script>
+<script src="../../static/js/jquery-1.12.2.js"></script>
+<script src="../../static/layui/layui.js"></script>
+<script src="../../../../static/js/toBeShipped.js"></script>
+</html>

src/main/webapp/WEB-INF/view/index.html

@@ -52,6 +52,9 @@
                 </div>
             </div>
         </div>
+        <div class="goHomepage">
+            E-BUY首页
+        </div>
         <div class="function">
             <div class="cart">
                 <a >
@@ -99,7 +102,7 @@
         </div>
     </div>
 </div>
-<iframe src="/ebuy/middle" class="iframe-middle" frameborder="0"></iframe>
+<iframe src="/ebuy/middle" class="iframe-middle" scrolling="no" frameborder="0"></iframe>
 </body>
 <script src="../../static/js/jquery-1.12.2.js"></script>
 <script src="../../static/js/index.js"></script>

src/main/webapp/WEB-INF/view/personalHomepage.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>个人首页</title>
-    <link rel="stylesheet" href="../../static/css/personalHomepage.css">
-	<link rel="shortcut icon" type="image/x-icon" href="../../static/img/favicon.ico" rel="external nofollow" />
-	<link rel="stylesheet" href="../../static/layui/css/layui.css">
-	<script src="../../static/layui/layui.all.js"></script>
-</head>
-<body>
-
-</body>
-<script src="../../static/layui/layui.js"></script>
-<script src="../../static/js/jquery-1.12.2.js"></script>
-</html>

src/main/webapp/static/css/account.css

@@ -15,7 +15,84 @@ body{
 }
 .head{
     height: 5em;
+	padding: 0 10%;
+	background: #17b5fe;
 }
-.iframe-middle{
+.head .my-logo{
-    height: calc(100% - 5em);
+	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%;
 }

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;
+}

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;

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;
+    height: 24px;
-    line-height: 18px;
+    line-height: 24px;
     font-size: 16px;
     color: #3c3c3c;
-    margin-top: 9px;
+    margin-top: 14px;
-    padding-bottom: 8px;
+
     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%;

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;
+}

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;
 }

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;
+}

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;
+}

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;
+}