From aa0b756c14b6897d19e5d9b9fb2e64cc50e5f5d8 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Wed, 4 Dec 2024 02:26:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Login.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/Login.vue b/src/views/Login.vue
index b4f4bf5..0f9dde5 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -37,7 +37,7 @@
   </template>
   
   <script setup lang="ts">
-  import {ref, reactive} from 'vue'
+  import {ref, reactive, onMounted} from 'vue'
   import { ElMessage } from 'element-plus'
   import {useRouter} from 'vue-router'
   import myAxios from '@/api/myAxios';
@@ -49,6 +49,8 @@
   const router = useRouter()
   const store = userStore()
 
+ 
+
   const Login = async ()=>{
     const res: any = await myAxios.post("/user/login",{
       userAccount: username.value,

From 10feded7491d11ada1e3e3e9c3f62d23d6f012c6 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Wed, 4 Dec 2024 02:26:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/appointTime.vue | 22 ++++++++++++++--------
 src/utils/dealStringArray.js          | 15 +++++++++++----
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/layout/components/appointTime.vue b/src/layout/components/appointTime.vue
index da0919d..dbfb2b3 100644
--- a/src/layout/components/appointTime.vue
+++ b/src/layout/components/appointTime.vue
@@ -4,10 +4,13 @@
             <div v-for="(item, index) in dayList" :key="index">
                 <div class="inner" style="font-size: medium;">
                     第{{ index + 1 }}天
-                    <el-checkbox v-model="isAvailableArray[index]" label="这天可预约"  style="margin-left: 10px;"/>
+                    <el-checkbox v-model="isAvailableArray[index]" v-if="timeList[index].length != 0" label="这天可预约"  style="margin-left: 10px;"/>
                 </div>
                 <!-- 时间段部分 -->
                 <div class="time-picker">
+                    <el-button circle @click="addList(index, 0)" v-if="timeList[index].length == 0"><el-icon>
+                                <Plus />
+                            </el-icon></el-button>
                     <div v-for="(item, row) in timeList[index]" :key="row" class="box">
                         <span>第 {{ row + 1 }} 个时间段</span>
                         <el-time-select v-model="timeList[index][row].startTime" 
@@ -40,7 +43,7 @@
                         <el-button circle @click="addList(index, row)"><el-icon>
                                 <Plus />
                             </el-icon></el-button>
-                        <el-button circle @click="subList(index, row)" v-if="row + 1 > 1"><el-icon>
+                        <el-button circle @click="subList(index, row)" v-if="row >= 0"><el-icon>
                                 <Minus />
                             </el-icon></el-button>
                         </div>
@@ -120,8 +123,16 @@ const maxOptions = ref(
 const flag = ref(0)  //第一个人数下标
 var arr = new Array(4)
 const emit = defineEmits(['time-Info'])  //组件绑定
+
+const initTimeList = () => {
+    for (var i = 0; i < 4; i ++ ) {
+        timeList.value[i].splice(0)
+    }
+}
+
 onMounted(()=>{
     init()
+    initTimeList()
     for(let i=0; i<4; i++) {  //开始时初始化人数的数组
         for(let j=0; j<6; j++) {
             for(let k=0;k<50;k++) {
@@ -164,12 +175,7 @@ const onSubmit =()=> {
 }
 const resetForm=()=>{
     for(let i=0;i<4;i++) {
-        timeList.value[i] = [{
-            startTime: '',
-            endTime: '',
-            minNumValue: '',
-            maxNumValue: '',
-        }]
+        timeList.value[i].splice(0, timeList.value[i].length)
         isAvailableArray.value[i] = false
     }
 }
diff --git a/src/utils/dealStringArray.js b/src/utils/dealStringArray.js
index a773855..12b962a 100644
--- a/src/utils/dealStringArray.js
+++ b/src/utils/dealStringArray.js
@@ -15,13 +15,14 @@ const isValidPlus = (val) => {
 }
 
 export const transfer = (val, arr, isAvailableArr) => {
+    console.log('这是val:', val)
     for (var i = 0; i < val.length; i ++ ) {
         for (var j = 0; j < val[i].length; j ++ ) {
             arr[i][j].timeSlot = val[i][j].startTime + "-" + val[i][j].endTime
             arr[i][j].numberRange = "(" + val[i][j].minNumValue + "," + val[i][j].maxNumValue + ")"
         }
     }
-    // console.log(arr)
+    console.log('这是arr:', arr)
     for (var i = 0; i < 4; i ++ ) {
         for (var j = 0; j < 6; j ++ ) {
             if(isValidPlus(arr[i][j])) {
@@ -51,9 +52,15 @@ export const transfer = (val, arr, isAvailableArr) => {
                 numberRangeArr.push(arr[i][j].numberRange)
             }
         }
-        newArr[i].timeSlot = timeSlotArr.join(';')
-        newArr[i].numberRange = numberRangeArr.join(';')
-        newArr[i].isAvailable = isAvailableArr[i] ? 1 : 0
+        if(val[i].length == 0){
+            newArr[i].timeSlot = "00:00-00:00"
+            newArr[i].numberRange = "(0,0)"
+            newArr[i].isAvailable = 0
+        }else{
+            newArr[i].timeSlot = timeSlotArr.join(';')
+            newArr[i].numberRange = numberRangeArr.join(';')
+            newArr[i].isAvailable = isAvailableArr[i] ? 1 : 0
+        }
         timeSlotArr = []
         numberRangeArr = []
     }