✨ feat(销售统计): 时间选择器组件

src/pages/delivery/index.tsx

@@ -13,7 +13,7 @@ import ItemList from './components/ItemList'
 import DeliveryStatusList from './components/DeliveryStatusList'
 import Popup from '@/components/popup'
 import DeliveryFilter, { SearchField } from './components/Filter'
-import TimePicker from '@/components/timePicker'
+import TimePickerPopup from '@/components/timePickerPopup'
 
 type SearchData = {
   delivery_notice_order_no?: string // 发货单号
@@ -196,7 +196,7 @@ const Delivery: FC = () => {
       <Popup show={showFilter} title='筛选列表' onClose={handlePopupClose}>
         <DeliveryFilter onSearchTime={handleSearchTime} onConfirm={handleConfirm} onReset={handleReset} />
       </Popup>
-      <TimePicker start={start} end={end} showTime={showTime} closePopup={handClose} onSelectDate={(e) => handTime(e)}></TimePicker>
+      <TimePickerPopup start={start} end={end} showTime={showTime} closePopup={handClose} onSelectDate={(e) => handTime(e)}></TimePickerPopup>
     </View>
   )
 }

src/pages/newCollection/index.tsx

@@ -12,7 +12,7 @@ import { formatDateTime, formatHashTag, formatImgUrl, formatPriceDiv, formatWeig
 import {
     mpcashManagementOrderlist
 } from "@/api/newCollection"
-import TimePicker from "@/components/timePicker"
+import TimePickerPopup from '@/components/timePickerPopup'
 import dayjs from 'dayjs'
 import IconFont from '@/components/iconfont/iconfont'
 
@@ -294,13 +294,13 @@ export default () => {
                     </View>
                 </View>
             </Popup>
-            <TimePicker
+            <TimePickerPopup
                 start={start}
                 end={end}
                 showTime={showTime}
                 closePopup={handClose}
                 onSelectDate={(e) => handTime(e)}
-            ></TimePicker>
+            ></TimePickerPopup>
         </>
     )
-}
+}

src/pages/refundPage/index.tsx

@@ -15,7 +15,7 @@ import {
     mpenumreturnType
 } from "@/api/refound"
 import Tabs from "./components/tabs"
-import TimePicker from "@/components/timePicker"
+import TimePickerPopup from '@/components/timePickerPopup'
 import dayjs from 'dayjs'
 import IconFont from '@/components/iconfont/iconfont'
 export default () => {
@@ -395,13 +395,13 @@ export default () => {
                     {/* <View className={styles.areaBox}></View> */}
                 </View>
             </Popup>
-            <TimePicker
+            <TimePickerPopup
                 start={start}
                 end={end}
                 showTime={showTime}
                 closePopup={handClose}
                 onSelectDate={(e) => handTime(e)}
-            ></TimePicker>
+            ></TimePickerPopup>
         </>
     )
 }

src/pages/saleStatistic/index.tsx

@@ -1,5 +1,12 @@
+import AtCalendar from '@/components/calendar'
 import DropDownItem, { DropDownOptions } from '@/components/dropDown-item'
+import SelectMarketingDepartment from '@/components/SelectMarketingDepartment'
+import SelectSaleType from '@/components/SelectSaleType'
+import SelectTimePicker from '@/components/SelectTimePicker'
+import TimePicker from '@/components/timePicker'
 import { View } from '@tarojs/components'
+import classnames from 'classnames'
+import dayjs from 'dayjs'
 import { useState } from 'react'
 import styles from './index.module.scss'
 
@@ -17,13 +24,30 @@ const saleStatistic = () => {
       text: 'name2',
       value: 2,
     },
+    {
+      text: 'name3',
+      value: 3,
+    },
   ])
 
+  const onChangeTimePicker = (value) => {
+    console.log(value)
+  }
+  const onChangeSaleType = (saleType) => {
+    console.log(saleType)
+
+  }
+  const onChangeDepartment = (department) => {
+    console.log(department)
+
+  }
+
   return (
     <View className={styles.saleStatistic}>
       <View className={styles['saleStatistic--filterBar']}>
-        <View>sdflkajsfdlk</View>
-        <DropDownItem title='name' activeColor='#337fff' options={options}></DropDownItem>
+        <SelectSaleType onChange={onChangeSaleType}></SelectSaleType>
+        <SelectMarketingDepartment onChange={onChangeDepartment}></SelectMarketingDepartment>
+        <SelectTimePicker onChange={onChangeTimePicker}></SelectTimePicker>
       </View>
     </View>
   )

src/pages/takeDelivery/index.tsx

@@ -13,7 +13,7 @@ import ItemList from './components/ItemList'
 import DeliveryStatusList from './components/DeliveryStatusList'
 import Popup from '@/components/popup'
 import DeliveryFilter, { SearchField } from './components/Filter'
-import TimePicker from '@/components/timePicker'
+import TimePickerPopup from '@/components/timePickerPopup'
 
 type SearchData = {
   take_goods_order_no?: string // 提货单号
@@ -191,7 +191,7 @@ const Delivery: FC = () => {
       <Popup show={showFilter} title='筛选列表' onClose={handlePopupClose}>
         <DeliveryFilter onSearchTime={handleSearchTime} onConfirm={handleConfirm} onReset={handleReset} />
       </Popup>
-      <TimePicker start={start} end={end} showTime={showTime} closePopup={handClose} onSelectDate={(e) => handTime(e)}></TimePicker>
+      <TimePickerPopup start={start} end={end} showTime={showTime} closePopup={handClose} onSelectDate={(e) => handTime(e)}></TimePickerPopup>
     </View>
   )
 }