From 7cf25a1050c222d45c24ca387d9397ee5f197c18 Mon Sep 17 00:00:00 2001
From: YuhangQ <i@yuhangq.com>
Date: Sun, 24 Sep 2023 14:31:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=97=B6=E9=97=B4=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/2023-38.json |  2 +-
 data/current.json |  2 +-
 example.json      |  9 ++++++++-
 public/admin.js   |  4 ++--
 public/index.js   |  4 ++--
 public/info.js    |  2 +-
 routers/index.js  |  6 ++++--
 views/admin.ejs   |  8 +++++++-
 views/index.ejs   |  8 +++++++-
 views/info.ejs    | 10 +++++++++-
 10 files changed, 42 insertions(+), 13 deletions(-)

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 @@
           <div class="form-check">
             <input id="radio-5" class="form-check-input" type="radio" name="flexRadioDefault" id="flexRadioDefault1">
             <label id="reserve-5" class="form-check-label" for="radio-5">
-              18:10-21:00
+              18:10-19:50
+            </label>
+          </div>
+          <div class="form-check">
+            <input id="radio-6" class="form-check-input" type="radio" name="flexRadioDefault" id="flexRadioDefault1">
+            <label id="reserve-6" class="form-check-label" for="radio-6">
+              20:10-21:50
             </label>
           </div>
           <div id="select-time-error" class="invalid-feedback">请选择预约时间段</div>
diff --git a/views/index.ejs b/views/index.ejs
index 4940280..0f53fa8 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -82,7 +82,13 @@
           <div class="form-check">
             <input id="radio-5" class="form-check-input" type="radio" name="flexRadioDefault" id="flexRadioDefault1">
             <label id="reserve-5" class="form-check-label" for="radio-5">
-              18:10-21:00
+              18:10-19:50
+            </label>
+          </div>
+          <div class="form-check">
+            <input id="radio-6" class="form-check-input" type="radio" name="flexRadioDefault" id="flexRadioDefault1">
+            <label id="reserve-6" class="form-check-label" for="radio-6">
+              20:10-21:50
             </label>
           </div>
           <div id="select-time-error" class="invalid-feedback">请选择预约时间段</div>
diff --git a/views/info.ejs b/views/info.ejs
index 05f3a91..ef0e165 100644
--- a/views/info.ejs
+++ b/views/info.ejs
@@ -53,7 +53,8 @@
                 <th scope="col">10:30-12:10</th>
                 <th scope="col">13:30-15:10</th>
                 <th scope="col">15:30-17:10</th>
-                <th scope="col">18:10-21:00</th>
+                <th scope="col">18:10-19:50</th>
+                <th scope="col">20:10-21:50</th>
               </tr>
             </thead>
             <tbody class="table-group-divider">
@@ -64,6 +65,7 @@
                 <td id="table1-3"></td>
                 <td id="table1-4"></td>
                 <td id="table1-5"></td>
+                <td id="table1-6"></td>
               </tr>
               <tr>
                 <th scope="row">周二</th>
@@ -72,6 +74,7 @@
                 <td id="table2-3"></td>
                 <td id="table2-4"></td>
                 <td id="table2-5"></td>
+                <td id="table2-6"></td>
               </tr>
               <tr>
                 <th scope="row">周三</th>
@@ -80,6 +83,7 @@
                 <td id="table3-3"></td>
                 <td id="table3-4"></td>
                 <td id="table3-5"></td>
+                <td id="table3-6"></td>
               </tr>
               <tr>
                 <th scope="row">周四</th>
@@ -88,6 +92,7 @@
                 <td id="table4-3"></td>
                 <td id="table4-4"></td>
                 <td id="table4-5"></td>
+                <td id="table4-6"></td>
               </tr>
               <tr>
                 <th scope="row">周五</th>
@@ -96,6 +101,7 @@
                 <td id="table5-3"></td>
                 <td id="table5-4"></td>
                 <td id="table5-5"></td>
+                <td id="table5-6"></td>
               </tr>
               <tr>
                 <th scope="row">周六</th>
@@ -104,6 +110,7 @@
                 <td id="table6-3"></td>
                 <td id="table6-4"></td>
                 <td id="table6-5"></td>
+                <td id="table6-6"></td>
               </tr>
               <tr>
                 <th scope="row">周日</th>
@@ -112,6 +119,7 @@
                 <td id="table7-3"></td>
                 <td id="table7-4"></td>
                 <td id="table7-5"></td>
+                <td id="table7-6"></td>
               </tr>
             </tbody>
           </table>