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 b6df1e9..2b71d4e 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 @@ -92,6 +92,47 @@ public class PageController extends BaseController { return ThreadLocalUtil.getTemplateDir() + "index"; } + /** + * 登录页 + */ + @RequestMapping("user/login.html") + public String login() { + return ThreadLocalUtil.getTemplateDir() + "user/login"; + } + + /** + * 注册页 + */ + @RequestMapping("user/register.html") + public String register() { + return ThreadLocalUtil.getTemplateDir() + "user/register"; + } + + /** + * 用户中心页 + */ + @RequestMapping("user/userinfo.html") + public String userinfo() { + return ThreadLocalUtil.getTemplateDir() + "user/userinfo"; + } + + /** + * 我的书架页 + */ + @RequestMapping("user/favorites.html") + public String favorites() { + return ThreadLocalUtil.getTemplateDir() + "user/favorites"; + } + + /** + * 充值页 + */ + @RequestMapping("pay/index.html") + public String pay() { + return ThreadLocalUtil.getTemplateDir() + "pay/index.html"; + } + + /** * 作品页 */ diff --git a/novel-front/src/main/java/com/java2nb/novel/vo/BookShelfVO.java b/novel-front/src/main/java/com/java2nb/novel/vo/BookShelfVO.java index 7573c0c..66faf6c 100644 --- a/novel-front/src/main/java/com/java2nb/novel/vo/BookShelfVO.java +++ b/novel-front/src/main/java/com/java2nb/novel/vo/BookShelfVO.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.java2nb.novel.entity.UserBookshelf; import lombok.Data; +import javax.annotation.Generated; import java.util.Date; /** @@ -19,9 +20,19 @@ public class BookShelfVO extends UserBookshelf { 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; + private Date lastIndexUpdateTime; + private Byte bookStatus; + @Override public String toString() { diff --git a/novel-front/src/main/resources/mybatis/mapping/UserBookshelfMapper.xml b/novel-front/src/main/resources/mybatis/mapping/UserBookshelfMapper.xml index 7870905..ad80d7d 100644 --- a/novel-front/src/main/resources/mybatis/mapping/UserBookshelfMapper.xml +++ b/novel-front/src/main/resources/mybatis/mapping/UserBookshelfMapper.xml @@ -4,7 +4,8 @@ + + + + + + + + + + +
+ +
+ + +
+ 充值 +
+ + +
+
+
+
+
+ 充值账号:13560421324    余额:10 屋币 +
+
+
+
选择充值金额
+
  • +
    +
    10元
    1000屋币
    +
    +
  • +
  • +
    +
    30元
    3000屋币
    +
    +
  • +
  • +
    +
    50元
    5000屋币
    +
    +
  • +
  • +
    +
    100元
    10000屋币
    +
    +
  • +
  • +
    +
    200元
    20000屋币
    +
    +
  • +
  • +
    +
    500元
    50000屋币
    +
    +
  • + +
    + +
    + + +
    + + +
    +
    +
    + + + + +
    + + + + + + \ No newline at end of file diff --git a/novel-front/src/main/resources/templates/mobile/user/favorites.html b/novel-front/src/main/resources/templates/mobile/user/favorites.html new file mode 100644 index 0000000..aba0bda --- /dev/null +++ b/novel-front/src/main/resources/templates/mobile/user/favorites.html @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + +
    + + + + + + + + + + + + + + + + + + + +
    + +
    + + +
    + 我的书架 +
    + + +
    +
    +
    +
    + + +
    + + +
    + +
    +
    +
    + + + + +
    + + + + + + \ No newline at end of file diff --git a/novel-front/src/main/resources/templates/mobile/user/login.html b/novel-front/src/main/resources/templates/mobile/user/login.html index c2048ac..5622acb 100644 --- a/novel-front/src/main/resources/templates/mobile/user/login.html +++ b/novel-front/src/main/resources/templates/mobile/user/login.html @@ -5,109 +5,114 @@ - 登录|注册 - -
    + 登录 +
    - - - +
    -
    +
    - +
    - 登录|注册 -
    - + 登录 +
    +
    - -
    +
    - -
    - + +
    +
    - +
    -
    如果登录名不存在,则直接注册!
    +
    - + +
    +
    +
    +
    +
    -
    +
    - - -
    - - - - - + \ No newline at end of file diff --git a/novel-front/src/main/resources/templates/mobile/user/register.html b/novel-front/src/main/resources/templates/mobile/user/register.html new file mode 100644 index 0000000..343606d --- /dev/null +++ b/novel-front/src/main/resources/templates/mobile/user/register.html @@ -0,0 +1,122 @@ + + + + + + + + 注册 + +
    + + + + + +
    + +
    + + +
    + 注册 + +
    +
    + + +
    + +
    + +
    +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    +
    + + +
    +
    + +
    +
    + + + + + \ 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 new file mode 100644 index 0000000..b0d198e --- /dev/null +++ b/novel-front/src/main/resources/templates/mobile/user/userinfo.html @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + +
    + + + + + + +
    + + +
    + +
    + + +
    + 用户中心 + +
    + +
    + +
    + +
    梦入神机
    +
    账户余额:3000 屋币
    + +
    +
    + + + +
    + + +
    + + 充值 +
    +
    +
    +
    + + + +
    +  + + 我的书架 +
    +
    +
    +
    + + + +
    +  + + 我的书评 +
    +
    +
    +
    + + + + +
    +  + + 账户设置 +
    +
    +
    +
    + +
    + +
    +
    + +
    +
    + + + + + + + + \ No newline at end of file