diff --git a/novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java b/novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java index 2b71d4e..bf4c69f 100644 --- a/novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java +++ b/novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java @@ -124,6 +124,14 @@ public class PageController extends BaseController { return ThreadLocalUtil.getTemplateDir() + "user/favorites"; } + /** + * 阅读历史页 + */ + @RequestMapping("user/read_history.html") + public String readHistory() { + return ThreadLocalUtil.getTemplateDir() + "user/read_history"; + } + /** * 充值页 */ diff --git a/novel-front/src/main/java/com/java2nb/novel/vo/BookReadHistoryVO.java b/novel-front/src/main/java/com/java2nb/novel/vo/BookReadHistoryVO.java index 729e836..8b08bf7 100644 --- a/novel-front/src/main/java/com/java2nb/novel/vo/BookReadHistoryVO.java +++ b/novel-front/src/main/java/com/java2nb/novel/vo/BookReadHistoryVO.java @@ -19,9 +19,19 @@ public class BookReadHistoryVO extends UserReadHistory { private String lastIndexName; private String bookName; - @JsonFormat(timezone = "GMT+8", pattern = "MM/dd HH:mm:ss") + private String picUrl; + + private Long authorId; + + private String authorName; + + private String bookDesc; + + @JsonFormat(timezone = "GMT+8", pattern = "MM/dd HH:mm") private Date lastIndexUpdateTime; + private Byte bookStatus; + @Override public String toString() { diff --git a/novel-front/src/main/resources/mybatis/mapping/UserReadHistoryMapper.xml b/novel-front/src/main/resources/mybatis/mapping/UserReadHistoryMapper.xml index ed2eaa6..41705d4 100644 --- a/novel-front/src/main/resources/mybatis/mapping/UserReadHistoryMapper.xml +++ b/novel-front/src/main/resources/mybatis/mapping/UserReadHistoryMapper.xml @@ -4,12 +4,25 @@ - \ No newline at end of file diff --git a/novel-front/src/main/resources/templates/mobile/user/read_history.html b/novel-front/src/main/resources/templates/mobile/user/read_history.html new file mode 100644 index 0000000..c11386e --- /dev/null +++ b/novel-front/src/main/resources/templates/mobile/user/read_history.html @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+ +
+ + +
+ 阅读历史 +
+ + +
+
+
+
+ + +
+ + +
+ +
+
+
+ + + + +
+ + + + + + \ No newline at end of file diff --git a/novel-front/src/main/resources/templates/mobile/user/userinfo.html b/novel-front/src/main/resources/templates/mobile/user/userinfo.html index b0d198e..07e2c00 100644 --- a/novel-front/src/main/resources/templates/mobile/user/userinfo.html +++ b/novel-front/src/main/resources/templates/mobile/user/userinfo.html @@ -40,7 +40,7 @@ -webkit-transition: all .3s; } - .user_link{ + .user_link { position: relative; display: inline-block; vertical-align: middle; @@ -49,10 +49,12 @@ color: #fff; float: right; } - .user_link a{ + + .user_link a { color: #fff; } + .user_big_head { width: 80px; height: 80px; @@ -66,19 +68,20 @@
- -
+ +
-
- - +
+ + +
+ 用户中心 +
+ + +
- 用户中心 -
- - -
-
@@ -91,76 +94,111 @@
+
+ -
-
- -
- - 充值 -
+
+
+ + + + + + + +
+
充值
+
+
-
-
+ - + -
-  - - 我的书架 -
+
+
+ + + +
+
我的书架
+
+
-
-
+ - + -
-  - - 我的书评 -
+
+
+ + + +
+
阅读历史
+
+
-
-
+ + + - + -
-  - - 账户设置 -
-
-
-
+
+ + 退出登录 +
+
-
+
+
-