master #1

Open
gxwebsoft wants to merge 108 commits from developer/template-10584:master into master
Showing only changes of commit b22ff991f0 - Show all commits

View File

@@ -1,8 +1,7 @@
import {Avatar, Cell, Space, Empty, Tabs, Button, TabPane, Image, Dialog} from '@nutui/nutui-react-taro'
import {Avatar, Cell, Space, Empty, Tabs, Button, TabPane, Image, Dialog, PullToRefresh, InfiniteLoading} from '@nutui/nutui-react-taro'
import {useEffect, useState, useCallback, useRef, CSSProperties} from "react";
import {View, Text} from '@tarojs/components'
import Taro from '@tarojs/taro';
import {InfiniteLoading} from '@nutui/nutui-react-taro'
import dayjs from "dayjs";
import {
pageShopOrder,
@@ -685,6 +684,14 @@ function OrderList(props: OrderListProps) {
})
}
</Tabs>
<PullToRefresh
onRefresh={async () => {
setHasMore(true)
await reload(true)
props.onReload?.()
}}
headHeight={60}
>
<View style={getInfiniteUlStyle(props.showSearch)} id="scroll">
{error ? (
<View className="flex flex-col items-center justify-center h-64">
@@ -872,6 +879,7 @@ function OrderList(props: OrderListProps) {
</InfiniteLoading>
)}
</View>
</PullToRefresh>
{/* 取消订单确认对话框 */}
<Dialog