master #1

Open
gxwebsoft wants to merge 108 commits from developer/template-10584:master into master
2 changed files with 7 additions and 2 deletions
Showing only changes of commit e07fd4091e - Show all commits

View File

@@ -350,7 +350,7 @@ const DealerWithdraw: React.FC = () => {
}
}
const quickAmounts = ['0.2','100', '300', '500', '1000']
const quickAmounts = ['100', '300', '500', '1000']
const setQuickAmount = (amount: string) => {
formRef.current?.setFieldsValue({amount})

View File

@@ -14,12 +14,17 @@ import {useThemeStyles} from "@/hooks/useTheme";
const UserCard = forwardRef<any, any>((_, ref) => {
const {data, refresh} = useUserData()
const {getDisplayName, getRoleName} = useUser();
const {getDisplayName} = useUser();
const [IsLogin, setIsLogin] = useState<boolean>(false)
const [userInfo, setUserInfo] = useState<User>()
const themeStyles = useThemeStyles();
// 角色名称:优先取用户 roles 数组的第一个角色名称
const getRoleName = () => {
return userInfo?.roles?.[0]?.roleName || userInfo?.roleName || '注册用户'
}
// 下拉刷新
const handleRefresh = async () => {
await refresh()