diff --git a/api/reservation.js b/api/reservation.js index ae812fb..049d34f 100644 --- a/api/reservation.js +++ b/api/reservation.js @@ -16,3 +16,31 @@ export function FetchReserve(data) { data }) } + +// 我的预约-预约登记界面初始化 +// ?libcode=&openId= +export function FetchInitMyReservation(data) { + return request({ + url: '/api/weixin/myReservationInit', + data + }) +} + +// 我的预约 +// ?libcode=&openId=&page=&size= +// libcode可选填(我不知道小程序是一家图书馆还是多加图书馆的 所以可为空) +export function FetchMyReservation(data) { + return request({ + url: '/api/weixin/myReservation', + data + }) +} + +// 取消预约 +export function FetchCancelReservation(data) { + return request({ + url: '/api/weixin/cancelReservation', + method: 'POST', + data + }) +} diff --git a/pages.json b/pages.json index d04c3fd..9f6a4c1 100644 --- a/pages.json +++ b/pages.json @@ -167,7 +167,8 @@ { "path": "pages/booking-record/booking-record", "style": { - "navigationBarTitleText": "预约入馆记录" + "navigationBarTitleText": "预约入馆记录", + "enablePullDownRefresh": true } }, { diff --git a/subpkg/pages/book-detail/book-detail.vue b/subpkg/pages/book-detail/book-detail.vue index de57ec6..a706a6d 100644 --- a/subpkg/pages/book-detail/book-detail.vue +++ b/subpkg/pages/book-detail/book-detail.vue @@ -359,7 +359,7 @@ export default { padding: 15px; background-color: #f5f5f5; min-height: 100vh; - padding-bottom: 60px; + padding-bottom: 70px; } .article-detail-container { @@ -491,5 +491,7 @@ export default { } .detail-bottom{ justify-content: space-around; + padding: 0 15px; + box-shadow: 0 -2px 5px rgba(0, 0, 0, 0.05); } diff --git a/subpkg/pages/booking-record/booking-record.vue b/subpkg/pages/booking-record/booking-record.vue index 79ff5e8..529d453 100644 --- a/subpkg/pages/booking-record/booking-record.vue +++ b/subpkg/pages/booking-record/booking-record.vue @@ -1,289 +1,386 @@ \ No newline at end of file diff --git a/subpkg/pages/seat-booking/seat-booking.vue b/subpkg/pages/seat-booking/seat-booking.vue index e8e920b..0a788a0 100644 --- a/subpkg/pages/seat-booking/seat-booking.vue +++ b/subpkg/pages/seat-booking/seat-booking.vue @@ -26,6 +26,7 @@ + {{ day.isToday ? '今天' : day.weekText }} {{ day.day }} @@ -36,6 +37,7 @@ + 时间选择 @@ -72,6 +74,7 @@ {{ closeNoticeText }} + 预约说明 @@ -91,17 +94,20 @@ + + +