..

src/components/Picker/CalendarDialog/DialogCalendarCard.tsx

@@ -1,17 +1,19 @@
-import React, { useState, useEffect, useRef } from 'react'
-import CommonPopup from '@/components/CommonPopup'
-import { View } from '@tarojs/components'
-import CalendarUI, { CalendarUIRef } from '@/components/Picker/CalendarUI/CalendarUI'
-import { PickerCommon, PickerCommonRef } from '@/components/Picker'
-import dayjs from 'dayjs'
-import styles from './index.module.scss'
+import React, { useState, useEffect, useRef } from "react";
+import CommonPopup from "@/components/CommonPopup";
+import { View } from "@tarojs/components";
+import CalendarUI, {
+  CalendarUIRef,
+} from "@/components/Picker/CalendarUI/CalendarUI";
+import { PickerCommon, PickerCommonRef } from "@/components/Picker";
+import dayjs from "dayjs";
+import styles from "./index.module.scss";
 export interface DialogCalendarCardProps {
-  value?: Date | Date[]
-  searchType?: 'single' | 'range' | 'multiple'
-  onChange?: (date: Date | Date[]) => void
-  visible: boolean
-  onClose: () => void
-  title?: React.ReactNode
+  value?: Date | Date[];
+  searchType?: "single" | "range" | "multiple";
+  onChange?: (date: Date | Date[]) => void;
+  visible: boolean;
+  onClose: () => void;
+  title?: React.ReactNode;
 }
 
 const DialogCalendarCard: React.FC<DialogCalendarCardProps> = ({
@@ -22,61 +24,73 @@ const DialogCalendarCard: React.FC<DialogCalendarCardProps> = ({
   value,
   onChange,
 }) => {
-  const [selected, setSelected] = useState<Date | Date[]>(value || new Date())
+  const [selected, setSelected] = useState<Date | Date[]>(value || new Date());
+  const [selectedBackup, setSelectedBackup] = useState<Date[]>(
+    Array.isArray(value) ? [...(value as Date[])] : [value as Date]
+  );
   const calendarRef = useRef<CalendarUIRef>(null);
-  const [type, setType] = useState<'year' | 'month' | 'time'>('year');
-  const [selectedHour, setSelectedHour] = useState(8)
-  const [selectedMinute, setSelectedMinute] = useState(0)
+  const [type, setType] = useState<"year" | "month" | "time">("year");
+  const [selectedHour, setSelectedHour] = useState(8);
+  const [selectedMinute, setSelectedMinute] = useState(0);
   const pickerRef = useRef<PickerCommonRef>(null);
   const hourMinutePickerRef = useRef<PickerCommonRef>(null);
-  const [pendingJump, setPendingJump] = useState<{ year: number; month: number } | null>(null)
+  const [pendingJump, setPendingJump] = useState<{
+    year: number;
+    month: number;
+  } | null>(null);
   const handleConfirm = () => {
-    if (type === 'year') {
-      if (searchType === 'range') {
+    if (type === "year") {
+      if (searchType === "range") {
         if (onChange) onChange(selected);
         onClose();
         return;
       }
       // 年份选择完成后，进入月份选择
-      setType('time')
-    } else if (type === 'month') {
+      setType("time");
+    } else if (type === "month") {
       // 月份选择完成后，进入时间选择
-      const value = pickerRef.current?.getValue()
+      const value = pickerRef.current?.getValue();
       if (value) {
-        const year = value[0] as number
-        const month = value[1] as number
-        if (searchType === 'range') {
-          const delta = calculateMonthDifference(selected as Date, new Date(year, month - 1, 1))
-          console.log('xxxxx', calendarRef.current)
-          setTimeout(() => {
-            calendarRef.current?.gotoMonth(delta)
-          }, 50)
-        } else {
-          setSelected(new Date(year, month - 1, 1))
+        const year = value[0] as number;
+        const month = value[1] as number;
+        setPendingJump({ year, month });
+        setType("year");
+        if (searchType === "range") {
+          const delta = calculateMonthDifference(
+            selected as Date,
+            new Date(year, month - 1, 1)
+          );
+          calendarRef.current?.gotoMonth(delta);
+          return;
         }
-        setPendingJump({ year, month })
+        setSelected(new Date(year, month - 1, 1));
       }
-      setType('year')
-    } else if (type === 'time') {
+    } else if (type === "time") {
       // 时间选择完成后，调用onNext回调
-      const value = hourMinutePickerRef.current?.getValue()
+      const value = hourMinutePickerRef.current?.getValue();
       if (value) {
-        const hour = value[0] as number
-        const minute = value[1] as number
-        setSelectedHour(hour)
-        setSelectedMinute(minute)
-        const hours = hour.toString().padStart(2, '0')
-        const minutes = minute.toString().padStart(2, '0')
-        const finalDate = new Date(dayjs(selected as Date).format('YYYY-MM-DD') + ' ' + hours + ':' + minutes)
-        if (onChange) onChange(finalDate)
-      }
-      onClose()
+        const hour = value[0] as number;
+        const minute = value[1] as number;
+        setSelectedHour(hour);
+        setSelectedMinute(minute);
+        const hours = hour.toString().padStart(2, "0");
+        const minutes = minute.toString().padStart(2, "0");
+        const finalDate = new Date(
+          dayjs(selected as Date).format("YYYY-MM-DD") +
+            " " +
+            hours +
+            ":" +
+            minutes
+        );
+        if (onChange) onChange(finalDate);
       }
+      onClose();
     }
+  };
 
   const calculateMonthDifference = (date1, date2) => {
     if (!(date1 instanceof Date) || !(date2 instanceof Date)) {
-      throw new Error('Both arguments must be Date objects');
+      throw new Error("Both arguments must be Date objects");
     }
 
     let months = (date2.getFullYear() - date1.getFullYear()) * 12;
@@ -84,63 +98,76 @@ const DialogCalendarCard: React.FC<DialogCalendarCardProps> = ({
     months += date2.getMonth();
 
     return months;
-  }
+  };
 
   const handleChange = (d: Date | Date[]) => {
-    console.log('handleChange', d)
-    if (searchType === 'range') {
+    if (searchType === "range") {
       if (Array.isArray(d)) {
         if (d.length === 2) {
-          setSelected(d as Date[])
-          return
+          return;
+        } else if (d.length === 1) {
+          debugger;
+          if (selectedBackup.length === 0 || selectedBackup.length === 2) {
+            setSelected([]);
+            setSelectedBackup([...d]);
+          } else {
+            setSelected(
+              [...selectedBackup, d[0]].sort(
+                (a, b) => a.getTime() - b.getTime()
+              )
+            );
+            setSelectedBackup([]);
           }
         }
+        return;
+      }
     }
     if (Array.isArray(d)) {
-      setSelected(d[0])
+      setSelected(d[0]);
     } else {
-      setSelected(d)
-    }
+      setSelected(d);
     }
+  };
   const onHeaderClick = (date: Date) => {
-    console.log('onHeaderClick', date)
-    setSelected(date)
-    setType('month')
-  }
+    console.log("onHeaderClick", date);
+    setSelected(date);
+    setType("month");
+  };
   const getConfirmText = () => {
-    if (type === 'time' || type === 'month') return '完成'
-    return '下一步'
-  }
+    if (type === "time" || type === "month" || searchType === "range")
+      return "完成";
+    return "下一步";
+  };
   const handleDateTimePickerChange = (value: (string | number)[]) => {
-    const year = value[0] as number
-    const month = value[1] as number
-    setSelected(new Date(year, month - 1, 1))
-  }
+    const year = value[0] as number;
+    const month = value[1] as number;
+    setSelected(new Date(year, month - 1, 1));
+  };
   const dialogClose = () => {
-    if (type === 'month') {
-      setType('year')
-    } else if (type === 'time') {
-      setType('year')
+    if (type === "month") {
+      setType("year");
+    } else if (type === "time") {
+      setType("year");
     } else {
-      onClose()
-    }
+      onClose();
     }
+  };
   useEffect(() => {
     if (visible && value) {
-      setSelected(value || new Date())
-      setSelectedHour(value ? dayjs(value as Date).hour() : 8)
-      setSelectedMinute(value ? dayjs(value as Date).minute() : 0)
+      setSelected(value || new Date());
+      setSelectedHour(value ? dayjs(value as Date).hour() : 8);
+      setSelectedMinute(value ? dayjs(value as Date).minute() : 0);
     }
-  }, [value, visible])
+  }, [value, visible]);
 
   useEffect(() => {
-    if (type === 'year' && pendingJump && calendarRef.current) {
-      calendarRef.current.jumpTo(pendingJump.year, pendingJump.month)
-      setPendingJump(null)
+    if (type === "year" && pendingJump && calendarRef.current) {
+      calendarRef.current.jumpTo(pendingJump.year, pendingJump.month);
+      setPendingJump(null);
     }
-  }, [type, pendingJump])
+  }, [type, pendingJump]);
 
-  console.log([selectedHour, selectedMinute], 'selectedHour, selectedMinute');
+  console.log([selectedHour, selectedMinute], "selectedHour, selectedMinute");
 
   return (
     <CommonPopup
@@ -149,16 +176,15 @@ const DialogCalendarCard: React.FC<DialogCalendarCardProps> = ({
       showHeader={!!title}
       title={title}
       hideFooter={false}
-      cancelText='取消'
+      cancelText="取消"
       confirmText={getConfirmText()}
       onConfirm={handleConfirm}
-      position='bottom'
+      position="bottom"
       round
       zIndex={1000}
     >
-      {
-        type === 'year' &&
-        <View className={styles['calendar-container']}>
+      {type === "year" && (
+        <View className={styles["calendar-container"]}>
           <CalendarUI
             ref={calendarRef}
             type={searchType}
@@ -166,27 +192,29 @@ const DialogCalendarCard: React.FC<DialogCalendarCardProps> = ({
             onChange={handleChange}
             showQuickActions={false}
             onHeaderClick={onHeaderClick}
-          /></View>
-      }
-      {
-        type === 'month' && <PickerCommon
+          />
+        </View>
+      )}
+      {type === "month" && (
+        <PickerCommon
           ref={pickerRef}
           onChange={handleDateTimePickerChange}
           type="month"
-          value={[(selected as Date).getFullYear(), (selected as Date).getMonth() + 1]}
+          value={[
+            (selected as Date).getFullYear(),
+            (selected as Date).getMonth() + 1,
+          ]}
         />
-
-      }
-      {
-        type === 'time' && <PickerCommon
+      )}
+      {type === "time" && (
+        <PickerCommon
           ref={hourMinutePickerRef}
           type="hour"
           value={[selectedHour, selectedMinute]}
         />
-
-      }
+      )}
     </CommonPopup>
-  )
-}
+  );
+};
 
-export default DialogCalendarCard
+export default DialogCalendarCard;

src/components/Picker/CalendarUI/CalendarUI.tsx

@@ -1,34 +1,42 @@
-import React, { useState, useEffect, useRef, useImperativeHandle } from 'react'
-import { CalendarCard } from '@nutui/nutui-react-taro'
-import { View, Text, Image } from '@tarojs/components'
-import images from '@/config/images'
-import styles from './index.module.scss'
-import { getMonth, getWeekend, getWeekendOfCurrentWeek } from '@/utils/timeUtils'
-import { PopupPicker } from '@/components/Picker/index'
-import dayjs from 'dayjs'
+import React, { useState, useEffect, useRef, useImperativeHandle } from "react";
+import { CalendarCard } from "@nutui/nutui-react-taro";
+import { View, Text, Image } from "@tarojs/components";
+import images from "@/config/images";
+import styles from "./index.module.scss";
+import {
+  getMonth,
+  getWeekend,
+  getWeekendOfCurrentWeek,
+} from "@/utils/timeUtils";
+import { PopupPicker } from "@/components/Picker/index";
+import dayjs from "dayjs";
 interface NutUICalendarProps {
-  type?: 'single' | 'range' | 'multiple'
-  value?: string | Date | String[] | Date[]
-  defaultValue?: string | string[]
-  onChange?: (value: Date | Date[]) => void,
-  isBorder?: boolean
-  showQuickActions?: boolean,
-  onHeaderClick?: (date: Date) => void
+  type?: "single" | "range" | "multiple";
+  value?: string | Date | String[] | Date[];
+  defaultValue?: string | string[];
+  onChange?: (value: Date | Date[]) => void;
+  isBorder?: boolean;
+  showQuickActions?: boolean;
+  onHeaderClick?: (date: Date) => void;
 }
 
 export interface CalendarUIRef {
-  jumpTo: (year: number, month: number) => void,
-  gotoMonth: (delta: number) => void,
+  jumpTo: (year: number, month: number) => void;
+  gotoMonth: (delta: number) => void;
 }
 
-const NutUICalendar = React.forwardRef<CalendarUIRef, NutUICalendarProps>(({
-  type = 'single',
+const NutUICalendar = React.forwardRef<CalendarUIRef, NutUICalendarProps>(
+  (
+    {
+      type = "single",
       value,
       onChange,
       isBorder = false,
       showQuickActions = true,
-  onHeaderClick
-}, ref) => {
+      onHeaderClick,
+    },
+    ref
+  ) => {
     // 根据类型初始化选中值
     //   const getInitialValue = (): Date | Date[] => {
     //     console.log(value,defaultValue,'today')
@@ -51,157 +59,208 @@ const NutUICalendar = React.forwardRef<CalendarUIRef, NutUICalendarProps>(({
     //     }
     //     return today
     //   }
-  const startOfMonth = (date: Date) => new Date(date.getFullYear(), date.getMonth(), 1)
+    const startOfMonth = (date: Date) =>
+      new Date(date.getFullYear(), date.getMonth(), 1);
 
-  const [selectedValue, setSelectedValue] = useState<Date | Date[]>()
-  const [current, setCurrent] = useState<Date>(startOfMonth(new Date()))
-  const calendarRef = useRef<any>(null)
-  const [visible, setvisible] = useState(false)
-  console.log('current', current)
+    const [selectedValue, setSelectedValue] = useState<Date | Date[]>();
+    const [current, setCurrent] = useState<Date>(startOfMonth(new Date()));
+    const calendarRef = useRef<any>(null);
+    const [visible, setvisible] = useState(false);
+    console.log("current", current);
     // 当外部 value 变化时更新内部状态
     useEffect(() => {
       if (Array.isArray(value) && value.length > 0) {
-      setSelectedValue(value.map(item => new Date(item)))
-      setCurrent(new Date(value[0] as Date))
+        setSelectedValue(value.map((item) => new Date(item)));
+        setCurrent(new Date(value[0] as Date));
       }
-    if ((typeof value === 'string' || value instanceof Date) && value) {
-      setSelectedValue(new Date(value))
-      setCurrent(new Date(value))
+      if ((typeof value === "string" || value instanceof Date) && value) {
+        setSelectedValue(new Date(value));
+        setCurrent(new Date(value));
       }
-  }, [value])
+    }, [value]);
 
     useImperativeHandle(ref, () => ({
       jumpTo: (year: number, month: number) => {
-      calendarRef.current?.jumpTo(year, month)
+        calendarRef.current?.jumpTo(year, month);
       },
       gotoMonth: (delta: number) => {
-      gotoMonth(delta)
-    }
-  }))
+        gotoMonth(delta);
+      },
+    }));
 
     const handleDateChange = (newValue: any) => {
-    setSelectedValue(newValue)
-    onChange?.(newValue as any)
-  }
-  const formatHeader = (date: Date) => `${getMonth(date)}`
+      console.log("aaaaaaaaaaaaaaaaaaaaaa", newValue);
+      setSelectedValue(newValue);
+      onChange?.(newValue as any);
+    };
+    const formatHeader = (date: Date) => `${getMonth(date)}`;
 
     const handlePageChange = (data: { year: number; month: number }) => {
       // 月份切换时的处理逻辑，如果需要的话
-    console.log('月份切换:', data)
-  }
+      console.log("月份切换:", data);
+    };
+
+    const handleDayClick = (day: any) => {
+      const { type, year, month, date } = day;
+      if (type === "next") return;
+      onChange?.([new Date(year, month - 1, date)]);
+    };
 
     const gotoMonth = (delta: number) => {
-    console.log('aaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbb', delta)
-    const base = current instanceof Date ? new Date(current) : new Date()
-    base.setMonth(base.getMonth() + delta)
-    const next = startOfMonth(base)
-    setCurrent(next)
+      const base = current instanceof Date ? new Date(current) : new Date();
+      base.setMonth(base.getMonth() + delta);
+      const next = startOfMonth(base);
+      setCurrent(next);
       // 同步底部 CalendarCard 的月份
       try {
-      calendarRef.current?.jump?.(delta)
+        calendarRef.current?.jump?.(delta);
       } catch (e) {
-      console.warn('CalendarCardRef jump 调用失败', e)
-    }
-    handlePageChange({ year: next.getFullYear(), month: next.getMonth() + 1 })
+        console.warn("CalendarCardRef jump 调用失败", e);
       }
+      handlePageChange({
+        year: next.getFullYear(),
+        month: next.getMonth() + 1,
+      });
+    };
 
     const handleHeaderClick = () => {
-    console.log('handleHeaderClick', current)
-    onHeaderClick && onHeaderClick(current)
-    setvisible(true)
-  }
-
-
+      onHeaderClick && onHeaderClick(current);
+      setvisible(true);
+    };
 
     const syncMonthTo = (anchor: Date) => {
       // 计算从 current 到目标 anchor 所在月份的偏移，调用 jump(delta)
-    const monthsDelta = (anchor.getFullYear() - current.getFullYear()) * 12 + (anchor.getMonth() - current.getMonth())
+      const monthsDelta =
+        (anchor.getFullYear() - current.getFullYear()) * 12 +
+        (anchor.getMonth() - current.getMonth());
       if (monthsDelta !== 0) {
-      gotoMonth(monthsDelta)
-    }
+        gotoMonth(monthsDelta);
       }
+    };
     const renderDay = (day: any) => {
       const { date, month, year } = day;
-    const today = new Date()
-    if (date === today.getDate() && month === today.getMonth() + 1 && year === today.getFullYear()) {
-      return (
-        <View className="day-container">
-          {date}
-        </View>
-      )
-    }
-    return date
+      const today = new Date();
+      if (
+        date === today.getDate() &&
+        month === today.getMonth() + 1 &&
+        year === today.getFullYear()
+      ) {
+        return <View className="day-container">{date}</View>;
       }
+      return date;
+    };
 
     const selectWeekend = () => {
-    const [start, end] = getWeekend()
-    setSelectedValue([start, end])
-    syncMonthTo(start)
-    onChange?.([start, end])
-  }
+      const [start, end] = getWeekend();
+      setSelectedValue([start, end]);
+      syncMonthTo(start);
+      onChange?.([start, end]);
+    };
     const selectWeek = () => {
-    const dayList = getWeekendOfCurrentWeek(7)
-    setSelectedValue(dayList)
-    syncMonthTo(dayList[0])
-    onChange?.(dayList)
-  }
+      const dayList = getWeekendOfCurrentWeek(7);
+      setSelectedValue(dayList);
+      syncMonthTo(dayList[0]);
+      onChange?.(dayList);
+    };
     const selectMonth = () => {
-    const dayList = getWeekendOfCurrentWeek(30)
-    setSelectedValue(dayList)
-    syncMonthTo(dayList[0])
-    onChange?.(dayList)
-  }
+      const dayList = getWeekendOfCurrentWeek(30);
+      setSelectedValue(dayList);
+      syncMonthTo(dayList[0]);
+      onChange?.(dayList);
+    };
 
     const handleMonthChange = (value: any) => {
       const [year, month] = value;
       const newDate = new Date(year, month - 1, 1);
       setCurrent(newDate);
-    calendarRef.current?.jumpTo(year, month)
-  }
-
+      calendarRef.current?.jumpTo(year, month);
+    };
 
     return (
       <View>
         {/* 快速操作行 */}
-      {
-        showQuickActions &&
-        <View className={styles['quick-actions']}>
-          <View className={styles['quick-action']} onClick={selectWeekend}>本周末</View>
-          <View className={styles['quick-action']} onClick={selectWeek}>一周内</View>
-          <View className={styles['quick-action']} onClick={selectMonth}>一个月</View>
+        {showQuickActions && (
+          <View className={styles["quick-actions"]}>
+            <View className={styles["quick-action"]} onClick={selectWeekend}>
+              本周末
             </View>
-      }
-      <View className={`${styles['calendar-card']} ${isBorder ? styles['border'] : ''}`}>
-        {
-          type === 'range' && (
-            <View className={styles['date-range-container']}>
-              <Text className={`${styles['date-text-placeholder']} ${value?.[0] ? styles['date-text'] : ''}`}>{value?.[0] ? dayjs(value?.[0] as Date).format('YYYY-MM-DD') : '起始时间'}</Text>
+            <View className={styles["quick-action"]} onClick={selectWeek}>
+              一周内
+            </View>
+            <View className={styles["quick-action"]} onClick={selectMonth}>
+              一个月
+            </View>
+          </View>
+        )}
+        <View
+          className={`${styles["calendar-card"]} ${
+            isBorder ? styles["border"] : ""
+          }`}
+        >
+          {type === "range" && (
+            <View className={styles["date-range-container"]}>
+              <Text
+                className={`${styles["date-text-placeholder"]} ${
+                  (value as Date[]).length === 2 ? styles["date-text"] : ""
+                }`}
+              >
+                {(value as Date[]).length === 2
+                  ? dayjs(value?.[0] as Date).format("YYYY-MM-DD")
+                  : "起始时间"}
+              </Text>
               <Text>至</Text>
-              <Text className={`${styles['date-text-placeholder']} ${value?.[1] ? styles['date-text'] : ''}`}>{value?.[1] ? dayjs(value?.[1] as Date).format('YYYY-MM-DD') : '结束时间'}</Text>
+              <Text
+                className={`${styles["date-text-placeholder"]} ${
+                  (value as Date[]).length === 2 ? styles["date-text"] : ""
+                }`}
+              >
+                {(value as Date[]).length === 2
+                  ? dayjs(value?.[1] as Date).format("YYYY-MM-DD")
+                  : "结束时间"}
+              </Text>
             </View>
-          )
-        }
+          )}
           {/* 自定义头部显示周一到周日 */}
-        <View className={styles['header']}>
-          <View className={styles['header-left']} onClick={handleHeaderClick}>
-            <Text className={styles['header-text']}>{formatHeader(current as Date)}</Text>
-            <Image src={images.ICON_RIGHT_MAX} className={`${styles['month-arrow']}`} onClick={() => gotoMonth(1)} />
+          <View className={styles["header"]}>
+            <View className={styles["header-left"]} onClick={handleHeaderClick}>
+              <Text className={styles["header-text"]}>
+                {formatHeader(current as Date)}
+              </Text>
+              <Image
+                src={images.ICON_RIGHT_MAX}
+                className={`${styles["month-arrow"]}`}
+                onClick={() => gotoMonth(1)}
+              />
             </View>
-          <View className={styles['header-actions']}>
-            <View className={styles['arrow-left-container']} onClick={() => gotoMonth(-1)}>
-              <Image src={images.ICON_RIGHT_MAX} className={`${styles['arrow']} ${styles['left']}`} />
+            <View className={styles["header-actions"]}>
+              <View
+                className={styles["arrow-left-container"]}
+                onClick={() => gotoMonth(-1)}
+              >
+                <Image
+                  src={images.ICON_RIGHT_MAX}
+                  className={`${styles["arrow"]} ${styles["left"]}`}
+                />
               </View>
-            <View className={styles['arrow-right-container']} onClick={() => gotoMonth(1)}>
-              <Image src={images.ICON_RIGHT_MAX} className={`${styles['arrow']}`} />
+              <View
+                className={styles["arrow-right-container"]}
+                onClick={() => gotoMonth(1)}
+              >
+                <Image
+                  src={images.ICON_RIGHT_MAX}
+                  className={`${styles["arrow"]}`}
+                />
               </View>
             </View>
           </View>
-        <View className={styles['week-header']}>
-          {['周日', '周一', '周二', '周三', '周四', '周五', '周六'].map((day) => (
-            <Text key={day} className={styles['week-day']}>
+          <View className={styles["week-header"]}>
+            {["周日", "周一", "周二", "周三", "周四", "周五", "周六"].map(
+              (day) => (
+                <Text key={day} className={styles["week-day"]}>
                   {day}
                 </Text>
-          ))}
+              )
+            )}
           </View>
 
           {/* NutUI CalendarCard 组件 */}
@@ -212,16 +271,21 @@ const NutUICalendar = React.forwardRef<CalendarUIRef, NutUICalendarProps>(({
             renderDay={renderDay}
             onChange={handleDateChange}
             onPageChange={handlePageChange}
+            onDayClick={handleDayClick}
           />
         </View>
-      {visible && <PopupPicker
+        {visible && (
+          <PopupPicker
             visible={visible}
             setvisible={setvisible}
             value={[current.getFullYear(), current.getMonth() + 1]}
             type="month"
-        onChange={(value) => handleMonthChange(value)} />}
+            onChange={(value) => handleMonthChange(value)}
+          />
+        )}
       </View>
-  )
-})
+    );
+  }
+);
 
-export default NutUICalendar
+export default NutUICalendar;

src/user_pages/downloadBill/index.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { View, Text, Button } from "@tarojs/components";
 import Taro, { useDidShow } from "@tarojs/taro";
-import dayjs from 'dayjs'
+import dayjs from "dayjs";
 
 import "./index.scss";
 import { DialogCalendarCard } from "@/components/index";
@@ -40,6 +40,13 @@ const DownloadBill: React.FC = () => {
   };
 
   const selectDateRange = (range: string) => {
+    if (dateType === range) {
+      if (range === "custom") {
+        setVisible(true);
+        return;
+      }
+      return;
+    }
     switch (range) {
       case "week":
         setDateType("week");
@@ -56,7 +63,9 @@ const DownloadBill: React.FC = () => {
         break;
     }
   };
-  const [currentTimeValue, setCurrentTimeValue] = useState<Date | Date[]>(new Date());
+  const [currentTimeValue, setCurrentTimeValue] = useState<Date | Date[]>(
+    new Date()
+  );
   const handleConfirm = (val: Date[]) => {
     setCurrentTimeValue(val);
     const [start, end] = val;