This commit is contained in:
sion
2026-04-06 12:15:33 +08:00
parent b44067aff7
commit a6f9053014
10 changed files with 218 additions and 428 deletions

View File

@@ -30,7 +30,7 @@ class _FundOrderCard extends StatelessWidget {
return AppColorScheme.muted;
}
} else {
// 提现状态: 1=待审批, 2=已完成, 3=已驳回, 4=已取消, 5=待财务审核
// 提现状态: 1=待审批, 2=已出款, 3=已驳回, 4=已取消, 5=待财务审核
switch (status) {
case 1:
return AppColorScheme.warning;
@@ -117,20 +117,49 @@ class _FundOrderCard extends StatelessWidget {
],
),
SizedBox(height: AppSpacing.sm),
if (!isDeposit && order.fee != null) ...[
Row(
children: [
Text('手续费(10%): ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Text('-${order.fee} USDT', style: AppTextStyles.bodyMedium(context)),
],
),
SizedBox(height: AppSpacing.xs),
Row(
children: [
Text('应收款: ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Text('${order.receivableAmount ?? "0"} USDT', style: AppTextStyles.bodyMedium(context).copyWith(fontWeight: FontWeight.w700)),
],
),
if (!isDeposit) ...[
if (order.fee != null) ...[
Row(
children: [
Text('手续费(10%): ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Text('-${order.fee} USDT', style: AppTextStyles.bodyMedium(context)),
],
),
SizedBox(height: AppSpacing.xs),
],
if (order.receivableAmount != null) ...[
Row(
children: [
Text('到账金额: ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Text('${order.receivableAmount} USDT', style: AppTextStyles.bodyMedium(context).copyWith(fontWeight: FontWeight.w700)),
],
),
SizedBox(height: AppSpacing.xs),
],
if (order.network != null) ...[
Row(
children: [
Text('提现网络: ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Text(order.network!, style: AppTextStyles.bodyMedium(context)),
],
),
SizedBox(height: AppSpacing.xs),
],
if (order.walletAddress != null) ...[
Row(
children: [
Text('提现地址: ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Expanded(
child: Text(
order.walletAddress!,
style: AppTextStyles.bodyMedium(context).copyWith(fontSize: 11),
overflow: TextOverflow.ellipsis,
),
),
],
),
SizedBox(height: AppSpacing.xs),
],
SizedBox(height: AppSpacing.sm),
],
Row(

View File

@@ -142,7 +142,7 @@ class _FundOrderCardContent extends StatelessWidget {
case 1:
return '待审批';
case 2:
return '完成';
return '出款';
case 3:
return '已驳回';
case 4:
@@ -188,6 +188,50 @@ class _FundOrderCardContent extends StatelessWidget {
],
),
SizedBox(height: AppSpacing.sm),
if (!isDeposit) ...[
if (order.fee != null) ...[
Row(
children: [
Text('手续费(10%): ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Text('-${order.fee} USDT', style: AppTextStyles.bodyMedium(context)),
],
),
SizedBox(height: AppSpacing.xs),
],
if (order.receivableAmount != null) ...[
Row(
children: [
Text('到账金额: ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Text('${order.receivableAmount} USDT', style: AppTextStyles.bodyMedium(context).copyWith(fontWeight: FontWeight.w700)),
],
),
SizedBox(height: AppSpacing.xs),
],
if (order.network != null) ...[
Row(
children: [
Text('提现网络: ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Text(order.network!, style: AppTextStyles.bodyMedium(context)),
],
),
SizedBox(height: AppSpacing.xs),
],
if (order.walletAddress != null) ...[
Row(
children: [
Text('提现地址: ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),
Expanded(
child: Text(
order.walletAddress!,
style: AppTextStyles.bodyMedium(context).copyWith(fontSize: 11),
overflow: TextOverflow.ellipsis,
),
),
],
),
SizedBox(height: AppSpacing.xs),
],
],
Row(
children: [
Text('订单号: ', style: AppTextStyles.bodyMedium(context).copyWith(color: theme.colorScheme.mutedForeground)),

View File

@@ -322,12 +322,11 @@ class _FundOrdersPageState extends State<FundOrdersPage> {
children: [
_buildDetailRow('订单号', order.orderNo),
const SizedBox(height: AppSpacing.sm - AppSpacing.xs),
if (order.walletAddress != null) ...[
_buildDetailRow(
'网络',
order.remark.isNotEmpty ? order.remark : '-',
),
if (order.network != null) ...[
_buildDetailRow('网络', order.network!),
const SizedBox(height: AppSpacing.sm - AppSpacing.xs),
],
if (order.walletAddress != null) ...[
_buildDetailRow(
'地址',
_truncateAddress(order.walletAddress!),
@@ -340,9 +339,6 @@ class _FundOrdersPageState extends State<FundOrdersPage> {
),
),
const SizedBox(height: AppSpacing.sm - AppSpacing.xs),
] else if (order.remark.isNotEmpty) ...[
_buildDetailRow('网络', order.remark),
const SizedBox(height: AppSpacing.sm - AppSpacing.xs),
],
if (order.fee != null && !order.isDeposit) ...[
_buildDetailRow('手续费', '${order.fee}%'),