diff --git a/pages.json b/pages.json index 4113918..39c5a6c 100644 --- a/pages.json +++ b/pages.json @@ -80,78 +80,96 @@ "navigationBarTitleText": "图书详情", "enablePullDownRefresh": false } - }, - { - "path": "pages/book-list/book-list", - "style": { - "navigationBarTitleText": "图书列表" - } - }, - { - "path": "pages/ranking/ranking", - "style": { - "navigationBarTitleText": "借阅排行榜" - } - }, - { - "path": "pages/activity-list/activity-list", - "style": { - "navigationBarTitleText": "活动列表" - } - }, - { - "path": "pages/activity-detail/activity-detail", - "style": { - "navigationBarTitleText": "活动详情" - } - }, - { - "path": "pages/myLending/myLending", - "style": { - "navigationBarTitleText": "我的借阅", - "enablePullDownRefresh": true, - "onReachBottomDistance": 100 - } - }, - { - "path": "pages/feedback/feedback", - "style": { - "navigationBarTitleText": "读者留言" - } - }, - { - "path": "pages/reader-card/reader-card", - "style": { - "navigationBarTitleText": "读者证" - } - }, - { - "path": "pages/feedback-list/feedback-list", - "style": { - "navigationBarTitleText": "读者留言" - } - }, - { - "path": "pages/feedback-detail/feedback-detail", - "style": { - "navigationBarTitleText": "留言详情" - } - }, - { - "path": "pages/collect-list/collect-list", - "style": { - "navigationBarTitleText": "我的收藏", - "enablePullDownRefresh": true, - "onReachBottomDistance": 100 - } - }, - { - "path": "pages/user-info/user-info", - "style": { - "navigationBarTitleText": "个人资料" - } - } - ] + }, + { + "path": "pages/book-list/book-list", + "style": { + "navigationBarTitleText": "图书列表" + } + }, + { + "path": "pages/ranking/ranking", + "style": { + "navigationBarTitleText": "借阅排行榜" + } + }, + { + "path": "pages/activity-list/activity-list", + "style": { + "navigationBarTitleText": "活动列表" + } + }, + { + "path": "pages/activity-detail/activity-detail", + "style": { + "navigationBarTitleText": "活动详情" + } + }, + { + "path": "pages/myLending/myLending", + "style": { + "navigationBarTitleText": "我的借阅", + "enablePullDownRefresh": true, + "onReachBottomDistance": 100 + } + }, + { + "path": "pages/feedback/feedback", + "style": { + "navigationBarTitleText": "读者留言" + } + }, + { + "path": "pages/reader-card/reader-card", + "style": { + "navigationBarTitleText": "读者证" + } + }, + { + "path": "pages/feedback-list/feedback-list", + "style": { + "navigationBarTitleText": "读者留言" + } + }, + { + "path": "pages/feedback-detail/feedback-detail", + "style": { + "navigationBarTitleText": "留言详情" + } + }, + { + "path": "pages/collect-list/collect-list", + "style": { + "navigationBarTitleText": "我的收藏", + "enablePullDownRefresh": true, + "onReachBottomDistance": 100 + } + }, + { + "path": "pages/user-info/user-info", + "style": { + "navigationBarTitleText": "个人资料" + } + }, + { + "path": "pages/seat-booking/seat-booking", + "style": { + "navigationBarTitleText": "座位预约" + } + }, + { + "path": "pages/booking-detail/booking-detail", + "style": { + "navigationBarTitleText": "预约登记" + } + }, + { + "path": "pages/booking-record/booking-record", + "style": { + "navigationBarTitleText": "预约座位记录" + } + } + ] } ] } diff --git a/pages/home/home.vue b/pages/home/home.vue index f5ff70e..cccff0f 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -88,9 +88,9 @@ - + - 读者留言 + 预约入馆 @@ -452,7 +452,9 @@ export default { }); }, toFeedback() { - this.checkBindAndNavigate("/subpkg/pages/feedback/feedback", "请您绑定读者证"); + uni.navigateTo({ + url: '/subpkg/pages/seat-booking/seat-booking' + }); }, // 去借阅证列表页 toLibraryCard() { diff --git a/pages/user/user.vue b/pages/user/user.vue index 4d227e9..5eff1a9 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -22,6 +22,10 @@ 借阅 + + + 入馆 + @@ -72,6 +76,12 @@ export default { }); }, + toBookingRecord() { + uni.navigateTo({ + url: '/subpkg/pages/booking-record/booking-record' + }); + }, + async loadUserInfo() { if (this.loading) return; this.loading = true; diff --git a/static/iconfont.css b/static/iconfont.css index 3c4935f..19c3eb5 100644 --- a/static/iconfont.css +++ b/static/iconfont.css @@ -3,6 +3,7 @@ src: url('/static/iconfont.ttf') format('truetype'); } + .iconfont { font-family: "iconfont" !important; font-size: 16px; @@ -11,6 +12,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-ruguanyuyue:before { + content: "\e61d"; +} + .icon-xingming:before { content: "\e646"; } diff --git a/static/iconfont.ttf b/static/iconfont.ttf index e1d52bf..5b4c6e1 100644 Binary files a/static/iconfont.ttf and b/static/iconfont.ttf differ diff --git a/static/images/lib.png b/static/images/lib.png new file mode 100644 index 0000000..474b1dc Binary files /dev/null and b/static/images/lib.png differ diff --git a/subpkg/pages/booking-detail/booking-detail.vue b/subpkg/pages/booking-detail/booking-detail.vue new file mode 100644 index 0000000..73d61be --- /dev/null +++ b/subpkg/pages/booking-detail/booking-detail.vue @@ -0,0 +1,336 @@ + + + + 日期选择 + + + {{ currentYear }}年{{ currentMonth }}月 + + + {{ day }} + + + + {{ day.day }} + 开放日 + 今天 + + + + + + + 时间选择 + + + {{ slot.time }} + 可选 + 已满 + + + + + + 确认预约 + + + + + + + \ No newline at end of file diff --git a/subpkg/pages/booking-record/booking-record.vue b/subpkg/pages/booking-record/booking-record.vue new file mode 100644 index 0000000..6c54ea7 --- /dev/null +++ b/subpkg/pages/booking-record/booking-record.vue @@ -0,0 +1,289 @@ + + + + + 未开始 + + + 进行中 + + + 已结束 + + + + + + + {{ item.area }} + + 开始时间: + {{ item.startTime }} + + + 结束时间: + {{ item.endTime }} + + + 座位号: + {{ item.seatNumber }} + + + 状态: + {{ item.statusText }} + + + + 取消预约 + + + + + + + {{ getEmptyText() }} + + + + + + + + \ No newline at end of file diff --git a/subpkg/pages/seat-booking/seat-booking.vue b/subpkg/pages/seat-booking/seat-booking.vue new file mode 100644 index 0000000..8214107 --- /dev/null +++ b/subpkg/pages/seat-booking/seat-booking.vue @@ -0,0 +1,241 @@ + + + + + + + 葛店经济开发区图书馆预约 + + + + + + + + + + + {{ floor.floor }} + + + {{ floor.title }} + + + + {{ floor.desc }} + + 预约 + + + + + + + + + + + + \ No newline at end of file