From 290e8278cc33f83c4ad973c8da2d47fc4f1f52ae Mon Sep 17 00:00:00 2001 From: istars Date: Wed, 16 Jan 2019 14:38:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9auditMapper=E7=9A=84sql?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=EF=BC=8C=E4=BF=AE=E6=94=B9compController,=20?= =?UTF-8?q?order(done).html=E6=95=B0=E6=8D=AE=E4=BA=A4=E4=BA=92=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/Dao/auditMapper.java | 4 +- .../demo/order/controller/compController.java | 5 +- .../resources/static/orders（done）.html | 266 +++++++++++------- 3 files changed, 162 insertions(+), 113 deletions(-) diff --git a/demo/src/main/java/com/example/demo/Dao/auditMapper.java b/demo/src/main/java/com/example/demo/Dao/auditMapper.java index 507838c..748c547 100644 --- a/demo/src/main/java/com/example/demo/Dao/auditMapper.java +++ b/demo/src/main/java/com/example/demo/Dao/auditMapper.java @@ -23,11 +23,11 @@ public interface auditMapper { @Select("select * from audit where userNum = #{userNum} order by applyTime") public List selectAudByNum(long userNum); - @Select("select * from audit where userNum = #{userNum} and checkState=1" + + @Select("select * from audit where userNum = #{userNum} and checkState=1 " + "order by applyTime") public List selectByNumFinshed(long userNum); - @Select("select * from audit where userNum = #{userNum} and checkState=0" + + @Select("select * from audit where userNum = #{userNum} and checkState=0 " + "order by applyTime") public List selectByNumUnfinshed(long userNum); diff --git a/demo/src/main/java/com/example/demo/order/controller/compController.java b/demo/src/main/java/com/example/demo/order/controller/compController.java index 7619c77..020aa2c 100644 --- a/demo/src/main/java/com/example/demo/order/controller/compController.java +++ b/demo/src/main/java/com/example/demo/order/controller/compController.java @@ -13,12 +13,13 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.util.List; -@Controller +//@Controller +@RestController public class compController { @Autowired com.example.demo.Dao.auditMapper auditMapper; - @RequestMapping("/finished")//已经完成的订单浏览的界面 + @RequestMapping(value = "/finished",method = RequestMethod.POST)//已经完成的订单浏览的界面 public List doPost(HttpServletResponse response, HttpServletRequest request){ HttpSession session=request.getSession(); User user=new User(); diff --git a/demo/src/main/resources/static/orders（done）.html b/demo/src/main/resources/static/orders（done）.html index b942e5b..7367902 100644 --- a/demo/src/main/resources/static/orders（done）.html +++ b/demo/src/main/resources/static/orders（done）.html @@ -10,6 +10,54 @@ + + @@ -28,115 +76,115 @@ -
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file From de2bf294383f496597cf0d35d22b775c0aa25fa6 Mon Sep 17 00:00:00 2001 From: istars Date: Wed, 16 Jan 2019 14:50:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?order(undone).html=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BA=A4=E4=BA=92=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/orders（undone）.html | 266 +++++++++++------- 1 file changed, 157 insertions(+), 109 deletions(-) diff --git a/demo/src/main/resources/static/orders（undone）.html b/demo/src/main/resources/static/orders（undone）.html index 218fcd6..d25e29b 100644 --- a/demo/src/main/resources/static/orders（undone）.html +++ b/demo/src/main/resources/static/orders（undone）.html @@ -10,6 +10,54 @@ + + @@ -28,115 +76,115 @@
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
-
-
- -
-

- 订单 银行转账 -

- 123456 - 123456 -
-
-

- 123456 -

- 详情 -
-
-
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file From 46287a237a59f59762d7e4f342e1fb640d0816b2 Mon Sep 17 00:00:00 2001 From: istars Date: Wed, 16 Jan 2019 15:20:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9index\prodescription\prod?= =?UTF-8?q?uctshow\search=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/src/main/resources/static/index.html | 2 +- demo/src/main/resources/static/prodescription.html | 6 +++--- demo/src/main/resources/static/productshow.html | 2 +- demo/src/main/resources/static/search.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/demo/src/main/resources/static/index.html b/demo/src/main/resources/static/index.html index c34da6a..4ddb4a4 100644 --- a/demo/src/main/resources/static/index.html +++ b/demo/src/main/resources/static/index.html @@ -68,7 +68,7 @@ $("#content").empty(); for (var i = 0; i
"+pro.productName+"

"+pro.productNum+"

"; + var str = "
"+pro.productName+"

"+pro.productNum+"

"; $("#content").append(str); } diff --git a/demo/src/main/resources/static/prodescription.html b/demo/src/main/resources/static/prodescription.html index cbad340..797423a 100644 --- a/demo/src/main/resources/static/prodescription.html +++ b/demo/src/main/resources/static/prodescription.html @@ -32,8 +32,8 @@
-

标题 标题

-

标题下面内容

+

产品 标题

+

产品介绍

@@ -87,7 +87,7 @@
diff --git a/demo/src/main/resources/static/productshow.html b/demo/src/main/resources/static/productshow.html index 1b763c6..02e4e1f 100644 --- a/demo/src/main/resources/static/productshow.html +++ b/demo/src/main/resources/static/productshow.html @@ -34,7 +34,7 @@ $("#content").empty(); for (var i = 0; i
"+pro.productName+"

"+pro.productNum+"

"; + var str = "
"+pro.productName+"

"+pro.productNum+"

"; $("#content").append(str); } diff --git a/demo/src/main/resources/static/search.html b/demo/src/main/resources/static/search.html index 9c9fb21..4214333 100644 --- a/demo/src/main/resources/static/search.html +++ b/demo/src/main/resources/static/search.html @@ -46,7 +46,7 @@ "\t\t\t\t\t\n" + "\t\t\t\t\t
\n" + "\t\t\t\t\t
\n" + - "\t\t\t\t\t\t\n" + + "\t\t\t\t\t\t\n" + "\t\t\t\t\t
\n" + "\t\t\t\t\n" + "\t\t\t\t
\n" + From 0c2a183468de87f8ac6e1795690011fb1fda9a38 Mon Sep 17 00:00:00 2001 From: istars Date: Wed, 16 Jan 2019 15:27:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9prodescription?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/src/main/resources/static/prodescription.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/src/main/resources/static/prodescription.html b/demo/src/main/resources/static/prodescription.html index 797423a..b113c44 100644 --- a/demo/src/main/resources/static/prodescription.html +++ b/demo/src/main/resources/static/prodescription.html @@ -87,7 +87,7 @@