111
This commit is contained in:
@@ -75,9 +75,11 @@ class OrderFund {
|
||||
final String username;
|
||||
final int type; // 1=充值, 2=提现
|
||||
final String amount;
|
||||
final String? fee; // 手续费
|
||||
final String? receivableAmount; // 应收款项
|
||||
final int status;
|
||||
// 充值状态: 1=待付款, 2=待确认, 3=已完成, 4=已驳回, 5=已取消
|
||||
// 提现状态: 1=待审批, 2=已完成, 3=已驳回, 4=已取消
|
||||
// 提现状态: 1=待审批, 2=已完成, 3=已驳回, 4=已取消, 5=待财务审核
|
||||
final int? walletId; // 冷钱包ID(充值)
|
||||
final String? walletAddress; // 钱包地址(充值/提现)
|
||||
final String? withdrawContact; // 提现联系方式
|
||||
@@ -95,6 +97,8 @@ class OrderFund {
|
||||
required this.username,
|
||||
required this.type,
|
||||
required this.amount,
|
||||
this.fee,
|
||||
this.receivableAmount,
|
||||
required this.status,
|
||||
this.walletId,
|
||||
this.walletAddress,
|
||||
@@ -115,6 +119,8 @@ class OrderFund {
|
||||
username: json['username'] as String? ?? '',
|
||||
type: json['type'] as int? ?? 1,
|
||||
amount: json['amount']?.toString() ?? '0.00',
|
||||
fee: json['fee']?.toString(),
|
||||
receivableAmount: json['receivableAmount']?.toString(),
|
||||
status: json['status'] as int? ?? 1,
|
||||
walletId: json['walletId'] as int?,
|
||||
walletAddress: json['walletAddress'] as String?,
|
||||
@@ -166,6 +172,8 @@ class OrderFund {
|
||||
return '已驳回';
|
||||
case 4:
|
||||
return '已取消';
|
||||
case 5:
|
||||
return '待财务审核';
|
||||
default:
|
||||
return '未知';
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import 'package:google_fonts/google_fonts.dart';
|
||||
import '../../../core/theme/app_color_scheme.dart';
|
||||
import '../../../core/theme/app_spacing.dart';
|
||||
import '../../../core/utils/toast_utils.dart';
|
||||
import '../../../core/event/app_event_bus.dart';
|
||||
import '../../../data/services/bonus_service.dart';
|
||||
import '../../../providers/asset_provider.dart';
|
||||
import '../../../providers/auth_provider.dart';
|
||||
@@ -576,6 +577,7 @@ class _WelfareCenterPageState extends State<WelfareCenterPage> {
|
||||
|
||||
if (response.success) {
|
||||
context.read<AssetProvider>().refreshAll(force: true);
|
||||
context.read<AppEventBus>().fire(AppEventType.assetChanged);
|
||||
ToastUtils.show('领取成功!100 USDT 已到账');
|
||||
_loadData();
|
||||
} else {
|
||||
@@ -597,6 +599,7 @@ class _WelfareCenterPageState extends State<WelfareCenterPage> {
|
||||
|
||||
if (response.success) {
|
||||
context.read<AssetProvider>().refreshAll(force: true);
|
||||
context.read<AppEventBus>().fire(AppEventType.assetChanged);
|
||||
ToastUtils.show('领取成功!100 USDT 已到账');
|
||||
_loadData();
|
||||
} else {
|
||||
|
||||
@@ -29,7 +29,7 @@ class _FundOrderCard extends StatelessWidget {
|
||||
return AppColorScheme.muted;
|
||||
}
|
||||
} else {
|
||||
// 提现状态: 1=待审批, 2=已完成, 3=已驳回, 4=已取消
|
||||
// 提现状态: 1=待审批, 2=已完成, 3=已驳回, 4=已取消, 5=待财务审核
|
||||
switch (status) {
|
||||
case 1:
|
||||
return AppColorScheme.warning;
|
||||
@@ -39,6 +39,8 @@ class _FundOrderCard extends StatelessWidget {
|
||||
return AppColorScheme.error;
|
||||
case 4:
|
||||
return AppColorScheme.muted;
|
||||
case 5:
|
||||
return AppColorScheme.info;
|
||||
default:
|
||||
return AppColorScheme.muted;
|
||||
}
|
||||
@@ -71,6 +73,8 @@ class _FundOrderCard extends StatelessWidget {
|
||||
return '已驳回';
|
||||
case 4:
|
||||
return '已取消';
|
||||
case 5:
|
||||
return '待财务审核';
|
||||
default:
|
||||
return '未知';
|
||||
}
|
||||
@@ -112,6 +116,22 @@ class _FundOrderCard extends StatelessWidget {
|
||||
],
|
||||
),
|
||||
SizedBox(height: AppSpacing.sm),
|
||||
if (!isDeposit && order.fee != null) ...[
|
||||
Row(
|
||||
children: [
|
||||
Text('手续费(10%): ', style: theme.textTheme.muted),
|
||||
Text('-${order.fee} USDT', style: theme.textTheme.small),
|
||||
],
|
||||
),
|
||||
SizedBox(height: AppSpacing.xs),
|
||||
Row(
|
||||
children: [
|
||||
Text('应收款项: ', style: theme.textTheme.muted),
|
||||
Text('${order.receivableAmount ?? "0"} USDT', style: theme.textTheme.small.copyWith(fontWeight: FontWeight.bold)),
|
||||
],
|
||||
),
|
||||
SizedBox(height: AppSpacing.sm),
|
||||
],
|
||||
Row(
|
||||
children: [
|
||||
Text('订单号: ', style: theme.textTheme.muted),
|
||||
|
||||
Reference in New Issue
Block a user