diff --git a/api/reservation.js b/api/reservation.js new file mode 100644 index 0000000..ae812fb --- /dev/null +++ b/api/reservation.js @@ -0,0 +1,18 @@ + +import request from '../utils/request'; + +export function FetchInitLibraryReservationSettings(data) { + return request({ + url: '/api/weixin/initLibraryReservationSettings', + data + }) +} + +// 预约入馆 +export function FetchReserve(data) { + return request({ + url: '/api/weixin/reserve', + method: 'POST', + data + }) +} diff --git a/static/iconfont.css b/static/iconfont.css index 19c3eb5..43e6203 100644 --- a/static/iconfont.css +++ b/static/iconfont.css @@ -3,7 +3,6 @@ src: url('/static/iconfont.ttf') format('truetype'); } - .iconfont { font-family: "iconfont" !important; font-size: 16px; @@ -12,6 +11,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-xuanze:before { + content: "\e63e"; +} + .icon-ruguanyuyue:before { content: "\e61d"; } diff --git a/static/iconfont.ttf b/static/iconfont.ttf index 5b4c6e1..8f4d4c8 100644 Binary files a/static/iconfont.ttf and b/static/iconfont.ttf differ diff --git a/subpkg/pages/seat-booking/seat-booking.vue b/subpkg/pages/seat-booking/seat-booking.vue index bfca77c..e8e920b 100644 --- a/subpkg/pages/seat-booking/seat-booking.vue +++ b/subpkg/pages/seat-booking/seat-booking.vue @@ -4,7 +4,7 @@ 选择入馆日期 - {{ currentYear }}.{{ String(currentMonth).padStart(2,'0') }} + {{ displayYear }}.{{ String(displayMonth).padStart(2,'0') }} - + - + + + {{ day.isToday ? '今天' : day.weekText }} {{ day.day }} - {{ day.available ? '可预约' : '' }} + {{ day.tempClose ? '闭馆' : (day.userHasBooked ? '已预约' : (day.available ? '可预约' : '')) }} - + + 时间选择 {{ slot.time }} - 可选 - 已满 + 已预约 + + 该日期闭馆,不可选择时间段 + + + + + 闭馆公告 + {{ closeNoticeText }} + + + + 预约说明 + + 1、蓝色日期 可预约 + + + 2、橙色日期 已有预约 + + + 3、灰色日期 超出可选范围不可点击预约 + + + 4、标“闭馆”日期 可查看公告,但无法预约或入馆 + + + 5、已预约时间段仅可查看,不可取消,可新增其他时间段 + - +