Merge branch 'main' of http://154.8.193.216:3030/admin1/jiangchengfeiyi-Web

src/layout/components/appointTime.vue

@@ -163,7 +163,7 @@ const minNumFun = (index : number,row : number)=> {
             message: '最小人数不大于最大人数'
         })
         timeList.value[index][row].minNumValue = ''
-        return;
+        return; 
     }
 }
 //组件传值

src/utils/dealStringArray.js

@@ -45,6 +45,8 @@ export const transfer = (val, arr, isAvailableArr) => {
 
     let timeSlotArr = []
     let numberRangeArr = []
+    let cnt = 0
+    let k = 0
     for (var i = 0; i < val.length; i ++ ) {
         for (var j = 0; j < val[i].length; j ++ ) {
             if(isNotValid(arr[i][j])) {
@@ -56,10 +58,27 @@ export const transfer = (val, arr, isAvailableArr) => {
             newArr[i].timeSlot = "00:00-00:00"
             newArr[i].numberRange = "(0,0)"
             newArr[i].isAvailable = 0
+            k ++
+            cnt ++
         }else{
             newArr[i].timeSlot = timeSlotArr.join(';')
             newArr[i].numberRange = numberRangeArr.join(';')
             newArr[i].isAvailable = isAvailableArr[i] ? 1 : 0
+            if(!isAvailableArr[i]) k ++ 
+        }
+        if(cnt == 4) {
+            ElMessage({
+                type: 'error',
+                message: '至少得有一个预约时间段'
+           })
+           return ;
+        }
+        if(k == 4) {
+            ElMessage({
+                type: 'error',
+                message: '至少有一天可以预约'
+           })
+           return ;
         }
         timeSlotArr = []
         numberRangeArr = []