Kaynağa Gözat

改改改,甲方需求一直变

shaogen1995 6 ay önce
ebeveyn
işleme
3ca4190591

+ 3 - 3
展示端/public/home.html

@@ -57,15 +57,15 @@
     <div class="main">
       <img class="top" src="./home/bg2.png" alt="" />
 
-      <div class="tit">请选择预约入口</div>
+      <div class="tit">请选择预约项目</div>
 
       <div class="txt" id="url1">
         <p>琴澳儿童健康生活</p>
-        <p>展馆预约</p>
+        <p>展馆预约(个人)</p>
       </div>
       <div class="txt txt2" id="url2">
         <p>琴澳儿童健康教育</p>
-        <p>课堂预约</p>
+        <p>课堂预约(团体)</p>
       </div>
       <br />
       <br />

BIN
展示端/public/home/bg2.png


BIN
展示端/src/assets/img/exhibit/top.png


BIN
展示端/src/assets/img/home/bg.png


+ 7 - 2
展示端/src/pages/B3start/index.tsx

@@ -29,7 +29,12 @@ function B3start() {
         .replaceAll('日', '')
         .split(',')
       // noTimeArr = noTimeArr.map(v => dayjs().format('YYYY') + '.' + v)
-      const arr = getWeekList()
+
+      // 过了晚上8点 之后 列表显示8个
+      const nowXiaoShi = dayjs().hour()
+      let xiaoShi8 = nowXiaoShi >= 20 ? 8 : 7
+
+      const arr = getWeekList(undefined, undefined, xiaoShi8)
 
       let arrRes: TimeChageResType[] = []
       arr.forEach(v => {
@@ -129,7 +134,7 @@ function B3start() {
           <div className='B3selDay'>
             {zhouArr.map(item => (
               <div
-                key={item.name}
+                key={item.name + item.date}
                 className={classNames('B3dayRow', nowTime === item.date ? 'B3dayRowAc' : '')}
                 onClick={() => cutTopFu(item.date)}
               >

+ 9 - 2
展示端/src/utils/timeChange.ts

@@ -49,14 +49,21 @@ import dayjs from 'dayjs'
 
 const weekArr = ['日', '一', '二', '三', '四', '五', '六']
 
-const getWeekList = (str?: string, delay?: number): TimeChageResType[] => {
+const getWeekList = (str?: string, delay?: number, dayNum: number = 7): TimeChageResType[] => {
+  // str=>时间格式
+
+  // delay=>不传从当天开始,比如当天为1-1
+  // 就返回 01-01  01-02... 传5就是 01-06 01-07...
+
+  // number=>不传就是往后推7天。传数字多少就是推几天。相当于列表的长度
+
   let today = Date.now() // 当天时间戳
 
   if (delay) today = today + delay * 1000 * 60 * 60 * 24
 
   let arr: TimeChageResType[] = []
 
-  for (var i = 0; i < 7; i++) {
+  for (var i = 0; i < dayNum; i++) {
     let timeCuo = today + i * 1000 * 60 * 60 * 24
     arr.push({
       name: '周' + weekArr[dayjs(timeCuo).day()],