Bladeren bron

课程预约逻辑修改

shaogen1995 8 maanden geleden
bovenliggende
commit
23ae7499bd
2 gewijzigde bestanden met toevoegingen van 14 en 8 verwijderingen
  1. 11 7
      展示端/src/pages/A3selectDay/index.tsx
  2. 3 1
      展示端/src/utils/timeChange.ts

+ 11 - 7
展示端/src/pages/A3selectDay/index.tsx

@@ -31,9 +31,9 @@ function A3selectDay() {
 
         setLoding(true)
 
-        const arr: A3ListType[] = []
+        let arr: A3ListType[] = []
 
-        const arrTime = getWeekList('MM-DD')
+        const arrTime = getWeekList('MM-DD', 1)
 
         // 上午obj
         const AMobj = baseList[0]
@@ -54,11 +54,15 @@ function A3selectDay() {
         })
         // if(dayjs())
 
-        const noeXisoShi = Number(dayjs(Date.now()).format('HH'))
-        if (noeXisoShi >= 12) arr[0].shangNum = 2
-        if (noeXisoShi >= 17) arr[0].xiaNum = 2
+        // 当天超时判断,现在不需要
+        // const noeXisoShi = Number(dayjs(Date.now()).format('HH'))
+        // if (noeXisoShi >= 12) arr[0].shangNum = 2
+        // if (noeXisoShi >= 17) arr[0].xiaNum = 2
 
-        setList(arr)
+        // 最多给2天可预约的日期
+        arr = arr.filter(v => v.shangNum === 0 || v.xiaNum === 0)
+
+        setList(arr.filter((v, i) => i <= 1))
       }
     }
   }, [])
@@ -96,7 +100,7 @@ function A3selectDay() {
                 <div
                   className='A3row'
                   key={item.id}
-                  hidden={item.shangNum !== 0 && item.xiaNum !== 0}
+                  // hidden={item.shangNum !== 0 && item.xiaNum !== 0}
                 >
                   <div className='A3R1'>
                     {item.time} {item.txt}

+ 3 - 1
展示端/src/utils/timeChange.ts

@@ -49,9 +49,11 @@ import dayjs from 'dayjs'
 
 const weekArr = ['日', '一', '二', '三', '四', '五', '六']
 
-const getWeekList = (str?: string): TimeChageResType[] => {
+const getWeekList = (str?: string, delay?: number): TimeChageResType[] => {
   let today = Date.now() // 当天时间戳
 
+  if (delay) today = today + delay * 1000 * 60 * 60 * 24
+
   let arr: TimeChageResType[] = []
 
   for (var i = 0; i < 7; i++) {