diff --git a/data/2023-38.json b/data/2023-38.json index ab2503e..e24d9f1 100644 --- a/data/2023-38.json +++ b/data/2023-38.json @@ -1 +1 @@ -{"ganshi":"KzUAnrI9","yuedui":"jdpKQLgF","sheyuan":"9HItpc5M","current_week":{"1-1":{"name":"","phone":"","type":""},"1-2":{"name":"","phone":"","type":""},"1-3":{"name":"","phone":"","type":""},"1-4":{"name":"","phone":"","type":""},"1-5":{"name":"","phone":"","type":""},"2-1":{"name":"","phone":"","type":""},"2-2":{"name":"","phone":"","type":""},"2-3":{"name":"","phone":"","type":""},"2-4":{"name":"","phone":"","type":""},"2-5":{"name":"","phone":"","type":""},"3-1":{"name":"","phone":"","type":""},"3-2":{"name":"","phone":"","type":""},"3-3":{"name":"","phone":"","type":""},"3-4":{"name":"","phone":"","type":""},"3-5":{"name":"","phone":"","type":""},"4-1":{"name":"","phone":"","type":""},"4-2":{"name":"","phone":"","type":""},"4-3":{"name":"","phone":"","type":""},"4-4":{"name":"","phone":"","type":""},"4-5":{"name":"","phone":"","type":""},"5-1":{"name":"","phone":"","type":""},"5-2":{"name":"","phone":"","type":""},"5-3":{"name":"","phone":"","type":""},"5-4":{"name":"","phone":"","type":""},"5-5":{"name":"","phone":"","type":""},"6-1":{"name":"","phone":"","type":""},"6-2":{"name":"","phone":"","type":""},"6-3":{"name":"","phone":"","type":""},"6-4":{"name":"","phone":"","type":""},"6-5":{"name":"","phone":"","type":""},"7-1":{"name":"","phone":"","type":""},"7-2":{"name":"","phone":"","type":""},"7-3":{"name":"","phone":"","type":""},"7-4":{"name":"","phone":"","type":""},"7-5":{"name":"","phone":"","type":""}}} \ No newline at end of file +{"ganshi":"ijvDmtxA","yuedui":"Sk12QiTs","sheyuan":"08dsWSFL","current_week":{"1-1":{"name":"","phone":"","type":""},"1-2":{"name":"","phone":"","type":""},"1-3":{"name":"","phone":"","type":""},"1-4":{"name":"","phone":"","type":""},"1-5":{"name":"","phone":"","type":""},"2-1":{"name":"","phone":"","type":""},"2-2":{"name":"","phone":"","type":""},"2-3":{"name":"","phone":"","type":""},"2-4":{"name":"","phone":"","type":""},"2-5":{"name":"","phone":"","type":""},"3-1":{"name":"","phone":"","type":""},"3-2":{"name":"","phone":"","type":""},"3-3":{"name":"","phone":"","type":""},"3-4":{"name":"","phone":"","type":""},"3-5":{"name":"","phone":"","type":""},"4-1":{"name":"","phone":"","type":""},"4-2":{"name":"","phone":"","type":""},"4-3":{"name":"","phone":"","type":""},"4-4":{"name":"","phone":"","type":""},"4-5":{"name":"","phone":"","type":""},"5-1":{"name":"","phone":"","type":""},"5-2":{"name":"","phone":"","type":""},"5-3":{"name":"","phone":"","type":""},"5-4":{"name":"","phone":"","type":""},"5-5":{"name":"","phone":"","type":""},"6-1":{"name":"","phone":"","type":""},"6-2":{"name":"","phone":"","type":""},"6-3":{"name":"","phone":"","type":""},"6-4":{"name":"","phone":"","type":""},"6-5":{"name":"","phone":"","type":""},"7-1":{"name":"","phone":"","type":""},"7-2":{"name":"","phone":"","type":""},"7-3":{"name":"","phone":"","type":""},"7-4":{"name":"","phone":"","type":""},"7-5":{"name":"","phone":"","type":""}}} \ No newline at end of file diff --git a/data/current.json b/data/current.json index e24d9f1..e607106 100644 --- a/data/current.json +++ b/data/current.json @@ -1 +1 @@ -{"ganshi":"ijvDmtxA","yuedui":"Sk12QiTs","sheyuan":"08dsWSFL","current_week":{"1-1":{"name":"","phone":"","type":""},"1-2":{"name":"","phone":"","type":""},"1-3":{"name":"","phone":"","type":""},"1-4":{"name":"","phone":"","type":""},"1-5":{"name":"","phone":"","type":""},"2-1":{"name":"","phone":"","type":""},"2-2":{"name":"","phone":"","type":""},"2-3":{"name":"","phone":"","type":""},"2-4":{"name":"","phone":"","type":""},"2-5":{"name":"","phone":"","type":""},"3-1":{"name":"","phone":"","type":""},"3-2":{"name":"","phone":"","type":""},"3-3":{"name":"","phone":"","type":""},"3-4":{"name":"","phone":"","type":""},"3-5":{"name":"","phone":"","type":""},"4-1":{"name":"","phone":"","type":""},"4-2":{"name":"","phone":"","type":""},"4-3":{"name":"","phone":"","type":""},"4-4":{"name":"","phone":"","type":""},"4-5":{"name":"","phone":"","type":""},"5-1":{"name":"","phone":"","type":""},"5-2":{"name":"","phone":"","type":""},"5-3":{"name":"","phone":"","type":""},"5-4":{"name":"","phone":"","type":""},"5-5":{"name":"","phone":"","type":""},"6-1":{"name":"","phone":"","type":""},"6-2":{"name":"","phone":"","type":""},"6-3":{"name":"","phone":"","type":""},"6-4":{"name":"","phone":"","type":""},"6-5":{"name":"","phone":"","type":""},"7-1":{"name":"","phone":"","type":""},"7-2":{"name":"","phone":"","type":""},"7-3":{"name":"","phone":"","type":""},"7-4":{"name":"","phone":"","type":""},"7-5":{"name":"","phone":"","type":""}}} \ No newline at end of file +{"ganshi":"PsLCDOkB","yuedui":"Ifr3GuX5","sheyuan":"FFpq7LHH","current_week":{"1-1":{"name":"","phone":"","type":""},"1-2":{"name":"","phone":"","type":""},"1-3":{"name":"","phone":"","type":""},"1-4":{"name":"","phone":"","type":""},"1-5":{"name":"","phone":"","type":""},"1-6":{"name":"钱宇航","phone":"16643416659","type":"干事"},"2-1":{"name":"","phone":"","type":""},"2-2":{"name":"","phone":"","type":""},"2-3":{"name":"","phone":"","type":""},"2-4":{"name":"","phone":"","type":""},"2-5":{"name":"","phone":"","type":""},"2-6":{"name":"","phone":"","type":""},"3-1":{"name":"","phone":"","type":""},"3-2":{"name":"","phone":"","type":""},"3-3":{"name":"","phone":"","type":""},"3-4":{"name":"","phone":"","type":""},"3-5":{"name":"","phone":"","type":""},"3-6":{"name":"","phone":"","type":""},"4-1":{"name":"","phone":"","type":""},"4-2":{"name":"","phone":"","type":""},"4-3":{"name":"","phone":"","type":""},"4-4":{"name":"","phone":"","type":""},"4-5":{"name":"","phone":"","type":""},"4-6":{"name":"","phone":"","type":""},"5-1":{"name":"","phone":"","type":""},"5-2":{"name":"","phone":"","type":""},"5-3":{"name":"","phone":"","type":""},"5-4":{"name":"","phone":"","type":""},"5-5":{"name":"","phone":"","type":""},"5-6":{"name":"","phone":"","type":""},"6-1":{"name":"","phone":"","type":""},"6-2":{"name":"","phone":"","type":""},"6-3":{"name":"","phone":"","type":""},"6-4":{"name":"","phone":"","type":""},"6-5":{"name":"","phone":"","type":""},"6-6":{"name":"","phone":"","type":""},"7-1":{"name":"","phone":"","type":""},"7-2":{"name":"","phone":"","type":""},"7-3":{"name":"","phone":"","type":""},"7-4":{"name":"","phone":"","type":""},"7-5":{"name":"","phone":"","type":""},"7-6":{"name":"","phone":"","type":""}}} \ No newline at end of file diff --git a/example.json b/example.json index 1d1916a..4726711 100644 --- a/example.json +++ b/example.json @@ -9,35 +9,42 @@ "1-3": { "name": "", "phone": "", "type": "" }, "1-4": { "name": "", "phone": "", "type": "" }, "1-5": { "name": "", "phone": "", "type": "" }, + "1-6": { "name": "", "phone": "", "type": "" }, "2-1": { "name": "", "phone": "", "type": "" }, "2-2": { "name": "", "phone": "", "type": "" }, "2-3": { "name": "", "phone": "", "type": "" }, "2-4": { "name": "", "phone": "", "type": "" }, "2-5": { "name": "", "phone": "", "type": "" }, + "2-6": { "name": "", "phone": "", "type": "" }, "3-1": { "name": "", "phone": "", "type": "" }, "3-2": { "name": "", "phone": "", "type": "" }, "3-3": { "name": "", "phone": "", "type": "" }, "3-4": { "name": "", "phone": "", "type": "" }, "3-5": { "name": "", "phone": "", "type": "" }, + "3-6": { "name": "", "phone": "", "type": "" }, "4-1": { "name": "", "phone": "", "type": "" }, "4-2": { "name": "", "phone": "", "type": "" }, "4-3": { "name": "", "phone": "", "type": "" }, "4-4": { "name": "", "phone": "", "type": "" }, "4-5": { "name": "", "phone": "", "type": "" }, + "4-6": { "name": "", "phone": "", "type": "" }, "5-1": { "name": "", "phone": "", "type": "" }, "5-2": { "name": "", "phone": "", "type": "" }, "5-3": { "name": "", "phone": "", "type": "" }, "5-4": { "name": "", "phone": "", "type": "" }, "5-5": { "name": "", "phone": "", "type": "" }, + "5-6": { "name": "", "phone": "", "type": "" }, "6-1": { "name": "", "phone": "", "type": "" }, "6-2": { "name": "", "phone": "", "type": "" }, "6-3": { "name": "", "phone": "", "type": "" }, "6-4": { "name": "", "phone": "", "type": "" }, "6-5": { "name": "", "phone": "", "type": "" }, + "6-6": { "name": "", "phone": "", "type": "" }, "7-1": { "name": "", "phone": "", "type": "" }, "7-2": { "name": "", "phone": "", "type": "" }, "7-3": { "name": "", "phone": "", "type": "" }, "7-4": { "name": "", "phone": "", "type": "" }, - "7-5": { "name": "", "phone": "", "type": "" } + "7-5": { "name": "", "phone": "", "type": "" }, + "7-6": { "name": "", "phone": "", "type": "" } } } \ No newline at end of file diff --git a/public/admin.js b/public/admin.js index a85d0a6..128f5b5 100644 --- a/public/admin.js +++ b/public/admin.js @@ -10,7 +10,7 @@ function flush_reserve_info() { if(day != '...') { - for(let time=1; time<=5; time++) { + for(let time=1; time<=6; time++) { let info = json[`${day}-${time}`] @@ -89,7 +89,7 @@ $("#back-btn").click(()=>{ let day = $("#select-day").val(); let time = -1; - for(let i=1; i<=5; i++) { + for(let i=1; i<=6; i++) { if($(`#radio-${i}`).prop('checked')) { time = i } diff --git a/public/index.js b/public/index.js index 14866c7..dc01638 100644 --- a/public/index.js +++ b/public/index.js @@ -10,7 +10,7 @@ function flush_reserve_info() { if(day != '...') { - for(let time=1; time<=5; time++) { + for(let time=1; time<=6; time++) { let info = json[`${day}-${time}`] @@ -54,7 +54,7 @@ $("#back-btn").click(()=>{ let day = $("#select-day").val(); let time = -1; - for(let i=1; i<=5; i++) { + for(let i=1; i<=6; i++) { if($(`#radio-${i}`).prop('checked')) { time = i } diff --git a/public/info.js b/public/info.js index 0a30f95..7d30fad 100644 --- a/public/info.js +++ b/public/info.js @@ -7,7 +7,7 @@ function flush_reserve_info() { let json = JSON.parse(data) for(let day=1; day<=7; day++) { - for(let time=1; time<=5; time++) { + for(let time=1; time<=6; time++) { let info = json[`${day}-${time}`] console.log(info) if(info.name != "") { diff --git a/routers/index.js b/routers/index.js index 2dacae5..d6bb97f 100644 --- a/routers/index.js +++ b/routers/index.js @@ -116,9 +116,11 @@ router.post('/reserve', (req, res) => { if (!day || day < 1 || day > 7) { errors.push('日期应该是1到7之间的数字'); } + + console.log(req.body) - if (!time || time < 1 || time > 5) { - errors.push('时间应该是1到5之间的数字'); + if (!time || time < 1 || time > 6) { + errors.push('时间应该是1到6之间的数字'); } if (!password || password.trim().length === 0) { diff --git a/views/admin.ejs b/views/admin.ejs index a4feb70..6a920b2 100644 --- a/views/admin.ejs +++ b/views/admin.ejs @@ -82,7 +82,13 @@