From b860e706f4d0b8930a49662aefb5d3eed370f437 Mon Sep 17 00:00:00 2001
From: lihang19980418 <30917713+lihang19980418@users.noreply.github.com>
Date: Wed, 4 Sep 2019 10:02:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neumall.iml                                |   1 -
 src/main/resources/templates/cart.html     |   6 +-
 src/main/resources/templates/profile.html  |  26 ++++-
 src/main/resources/templates/shipping.html | 117 ++++++++++++++++++++-
 4 files changed, 138 insertions(+), 12 deletions(-)

diff --git a/neumall.iml b/neumall.iml
index b6f5125..bdfd71d 100644
--- a/neumall.iml
+++ b/neumall.iml
@@ -30,7 +30,6 @@
     <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:Release2" level="project" />
     <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-springsecurity4:Release" level="project" />
     <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring4:Release" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework.boot:spring-boot-devtools:2.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:2.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.1.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.4" level="project" />
diff --git a/src/main/resources/templates/cart.html b/src/main/resources/templates/cart.html
index 29199fe..c49aa7e 100644
--- a/src/main/resources/templates/cart.html
+++ b/src/main/resources/templates/cart.html
@@ -14,7 +14,7 @@
         <p class=" wrapper clearfix">
             <span  class="fl">购物车</span>
             <img class="top" src="img/temp/cartTop01.png">
-            <a href="product.html" class="fr">继续购物&gt;</a>
+            <a href="product" class="fr">继续购物&gt;</a>
         </p>`
     </div>
     <!-----------------table------------------->
@@ -80,13 +80,13 @@
 </div>
 <!--返回顶部-->
 <div class="gotop">
-    <a href="cart.html">
+    <a href="cart">
         <dl>
             <dt><img src="img/gt1.png"/></dt>
             <dd>去购<br />物车</dd>
         </dl>
     </a>
-    <a href="mygxin.html">
+    <a href="/home/profile">
         <dl>
             <dt><img src="img/gt3.png"/></dt>
             <dd>个人<br />中心</dd>
diff --git a/src/main/resources/templates/profile.html b/src/main/resources/templates/profile.html
index 4d87a31..1ff2a7c 100644
--- a/src/main/resources/templates/profile.html
+++ b/src/main/resources/templates/profile.html
@@ -12,9 +12,9 @@
 <!------------------------------idea------------------------------>
 <div class="address mt">
     <div class="wrapper clearfix">
-        <a href="index.html" class="fl">首页</a>
+        <a href="/product" class="fl">首页</a>
         <span>/</span>
-        <a href="mygxin.html" class="on">个人信息</a>
+        <a href="profile" class="on">个人信息</a>
     </div>
 </div>
 
@@ -31,7 +31,7 @@
             <div>
                 <h4>个人中心</h4>
                 <ul>
-                    <li><a href="cart">我的购物车</a></li>
+                    <li><a href="/cart">我的购物车</a></li>
                     <li  class="on"><a href="profile">我的信息</a></li>
                 </ul>
                 <h4>信息管理</h4>
@@ -59,6 +59,26 @@
         </div>
     </div>
 </div>
+<div class="gotop">
+    <a href="/cart">
+        <dl>
+            <dt><img src="/img/gt1.png"/></dt>
+            <dd>去购<br />物车</dd>
+        </dl>
+    </a>
+    <a href="profile">
+        <dl>
+            <dt><img src="/img/gt3.png"/></dt>
+            <dd>个人<br />中心</dd>
+        </dl>
+    </a>
+    <a href="#" class="toptop" style="display: none">
+        <dl>
+            <dt><img src="/img/gt4.png"/></dt>
+            <dd>返回<br />顶部</dd>
+        </dl>
+    </a>
+</div>
 <!--遮罩-->
 <div class="mask"></div>
 <!--编辑弹框-->
diff --git a/src/main/resources/templates/shipping.html b/src/main/resources/templates/shipping.html
index 566549b..0a58ddd 100644
--- a/src/main/resources/templates/shipping.html
+++ b/src/main/resources/templates/shipping.html
@@ -1,10 +1,117 @@
 <!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html>
+<head lang="en">
+    <meta charset="utf-8" />
+    <title>地址管理</title>
+    <link rel="stylesheet" type="text/css" href="/css/public.css"/>
+    <link rel="stylesheet" type="text/css" href="/css/mygxin.css" />
 </head>
 <body>
 
+<!------------------------------idea------------------------------>
+<div class="address mt">
+    <div class="wrapper clearfix">
+        <a href="/product" class="fl">首页</a>
+        <span>/</span>
+        <a href="shipping" class="on">地址管理</a>
+    </div>
+</div>
+
+<!------------------------------Bott------------------------------>
+<div class="Bott">
+    <!--/*@thymesVar id="user" type="edu.neu.neumall.entity.User"*/-->
+    <div class="wrapper clearfix">
+        <div class="zuo fl">
+            <h3>
+                <a href="#"><img th:src="${user.avatar}" width="92" height="92"/></a>
+                <p class="clearfix"><span th:text="${user.nickName}" class="fl" ></span></p>
+            </h3>
+            <div>
+                <h4>个人中心</h4>
+                <ul>
+                    <li><a href="/cart">我的购物车</a></li>
+                    <li  class="on"><a href="profile">我的信息</a></li>
+                </ul>
+                <h4>信息管理</h4>
+                <ul>
+                    <li><a href="shipping">地址管理</a></li>
+                    <li><a href="change">修改密码</a></li>
+                </ul>
+            </div>
+        </div>
+
+        <div class="you fl">
+            <h2>收货地址</h2>
+            <div class="add">
+                <div>
+                    <a href="#2" id="addxad"><img src="/img/jia.png"/></a>
+                    <span>添加新地址</span>
+                </div>
+                <div  id="dizhi">
+                    <!--/*@thymesVar id="user" type="edu.neu.neumall.entity.User"*/-->
+                    <p th:text="${user.nickName}"></p>
+                    <p th:text="${user.phone}"></p>
+                    <p th:each="addr:${user.shippingAddrAddrList}">
+                        <span>地址：</span><span th:text="${addr.getReceiverProvince()}"></span>
+                        <span th:text="${addr.getReceiverCity()}"></span>
+                        <span th:text="${addr.getReceiverDistrict()}"></span>
+                    </p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="gotop">
+    <a href="/cart">
+        <dl>
+            <dt><img src="/img/gt1.png"/></dt>
+            <dd>去购<br />物车</dd>
+        </dl>
+    </a>
+    <a href="profile">
+        <dl>
+            <dt><img src="/img/gt3.png"/></dt>
+            <dd>个人<br />中心</dd>
+        </dl>
+    </a>
+    <a href="#" class="toptop" style="display: none">
+        <dl>
+            <dt><img src="/img/gt4.png"/></dt>
+            <dd>返回<br />顶部</dd>
+        </dl>
+    </a>
+</div>
+<div class="mask"></div>
+<div class="adddz">
+    <form action="#" method="get">
+        <input type="text" placeholder="姓名" class="on" />
+        <input type="text" placeholder="手机号" />
+
+        <textarea name="" rows="" cols="" placeholder="详细地址"></textarea>
+        <div class="bc">
+            <input type="button" value="保存" />
+            <input type="button" value="取消" />
+        </div>
+    </form>
+</div>
+<!--/*@thymesVar id="user" type="edu.neu.neumall.entity.User"*/-->
+<div class="readd">
+    <form action="#" method="get">
+        <input type="text"  class="on" placeholder="姓名" value="" />
+        <input type="text" placeholder="电话" value="" />
+
+        <textarea name="" rows="" cols="" placeholder="详细地址"></textarea>
+
+        <div class="bc">
+            <input type="button" value="保存" />
+            <input type="button" value="取消" />
+        </div>
+    </form>
+</div>
+
+<script src="/js/jquery-1.12.4.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/public.js" type="text/javascript" charset="utf-8"></script>
+<script src="/js/user.js" type="text/javascript" charset="utf-8"></script>
 </body>
-</html>
\ No newline at end of file
+</html>