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 14c71d9..0a950f0 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/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/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 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 diff --git a/demo/src/main/resources/static/prodescription.html b/demo/src/main/resources/static/prodescription.html index cbad340..b113c44 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" +