This commit is contained in:
2025-11-17 13:01:27 +08:00
parent 7a8fca6702
commit d16d1467c5

View File

@@ -7,6 +7,7 @@ import {pageShopDealerOrder} from '@/api/shop/shopDealerOrder'
import {useDealerUser} from '@/hooks/useDealerUser' import {useDealerUser} from '@/hooks/useDealerUser'
import type {ShopDealerOrder} from '@/api/shop/shopDealerOrder/model' import type {ShopDealerOrder} from '@/api/shop/shopDealerOrder/model'
import {useUser} from "@/hooks/useUser"; import {useUser} from "@/hooks/useUser";
// import {pageUsers} from "@/api/system/user";
interface OrderWithDetails extends ShopDealerOrder { interface OrderWithDetails extends ShopDealerOrder {
orderNo?: string orderNo?: string
@@ -14,6 +15,14 @@ interface OrderWithDetails extends ShopDealerOrder {
userCommission?: string userCommission?: string
} }
// interface PickerOption {
// text: string | number
// value: string | number
// disabled?: boolean
// children?: PickerOption[]
// className?: string | number
// }
const DealerOrder: React.FC = () => { const DealerOrder: React.FC = () => {
const [loading, setLoading] = useState<boolean>(false) const [loading, setLoading] = useState<boolean>(false)
const d = new Date() const d = new Date()
@@ -26,6 +35,9 @@ const DealerOrder: React.FC = () => {
const [orders, setOrders] = useState<OrderWithDetails[]>([]) const [orders, setOrders] = useState<OrderWithDetails[]>([])
const [currentPage, setCurrentPage] = useState<number>(1) const [currentPage, setCurrentPage] = useState<number>(1)
const [hasMore, setHasMore] = useState<boolean>(true) const [hasMore, setHasMore] = useState<boolean>(true)
// const [users, setUsers] = useState<PickerOption[]>([])
// const [visible, setVisible] = useState(false)
// const [baseDesc, setBaseDesc] = useState('')
const {dealerUser} = useDealerUser() const {dealerUser} = useDealerUser()
const {user} = useUser() const {user} = useUser()
@@ -112,11 +124,35 @@ const DealerOrder: React.FC = () => {
return user.roles.some(role => role.roleCode === roleCode); return user.roles.some(role => role.roleCode === roleCode);
} }
// const changePicker = (list: any[], option: any, columnIndex: number) => {
// console.log(columnIndex, option)
// }
// const confirmPicker = (
// options: PickerOption[],
// values: (string | number)[]
// ) => {
// let description = ''
// options.forEach((option: any) => {
// description += ` ${option.text}`
// })
// setBaseDesc(description)
// }
// const fetchUsers = ()=> {
// pageUsers({}).catch(res => {
// console.log(res)
// res.list.map(d => {
// console.log(d,'ddddd')
// })
// setUsers(res)
// })
// }
// 初始化加载数据 // 初始化加载数据
useEffect(() => { useEffect(() => {
if (dealerUser?.userId) { if (dealerUser?.userId) {
fetchOrders(1) fetchOrders(1)
// fetchUsers()
} }
}, [fetchOrders, date]) }, [fetchOrders, date])
@@ -259,6 +295,7 @@ const DealerOrder: React.FC = () => {
> >
<Text className={'text-sm'} onClick={() => setShow1(true)}>{date ? `${date}` : '请选择'}</Text> <Text className={'text-sm'} onClick={() => setShow1(true)}>{date ? `${date}` : '请选择'}</Text>
<ArrowDown size={10} className={'text-gray-400'} onClick={() => setShow1(true)}/> <ArrowDown size={10} className={'text-gray-400'} onClick={() => setShow1(true)}/>
{/*<Text onClick={() => setVisible(!visible)}>{baseDesc}</Text>*/}
</Space> </Space>
{/*账单列表*/} {/*账单列表*/}
<View className="px-4"> <View className="px-4">
@@ -305,6 +342,14 @@ const DealerOrder: React.FC = () => {
setDate(`${values[0]}${values[1]}`) setDate(`${values[0]}${values[1]}`)
}} }}
/> />
{/*<Picker*/}
{/* title="请选择"*/}
{/* visible={visible}*/}
{/* options={users}*/}
{/* onConfirm={(list, values) => confirmPicker(list, values)}*/}
{/* onClose={() => setVisible(false)}*/}
{/* onChange={changePicker}*/}
{/*/>*/}
</View> </View>
) )
} }