hailin
/
rwadurian
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "revert(profile): 回滚profile_page.dart到稳定版本" 

This reverts commit b06f186836.
This commit is contained in:
hailin 2025-12-24 03:16:39 -08:00
parent b06f186836
commit a38727eb7f
1 changed files with 53 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
frontend/mobile-app/lib/features/profile/presentation/pages/profile_page.dart
View File

@ -609,9 +609,10 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
nickname: r.nickname, nickname: r.nickname,
avatarUrl: r.avatarUrl, avatarUrl: r.avatarUrl,
completedCount: r.completedCount, completedCount: r.completedCount,
targetCount: 50000, // 省公司目标5万 targetCount: 50000, // 省公司目标固定5万
monthlyEarnings: r.monthlyEarnings, monthlyEarnings: r.monthlyEarnings,
isCurrentUser: r.isCurrentUser, isCurrentUser: r.isCurrentUser,
accountSequence: r.accountSequence,
)).toList(); )).toList();
}); });
} }
@ -642,9 +643,10 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
nickname: r.nickname, nickname: r.nickname,
avatarUrl: r.avatarUrl, avatarUrl: r.avatarUrl,
completedCount: r.completedCount, completedCount: r.completedCount,
targetCount: 10000, // 市公司目标1万 targetCount: 10000, // 市公司目标固定1万
monthlyEarnings: r.monthlyEarnings, monthlyEarnings: r.monthlyEarnings,
isCurrentUser: r.isCurrentUser, isCurrentUser: r.isCurrentUser,
accountSequence: r.accountSequence,
)).toList(); )).toList();
}); });
} }
@ -2203,18 +2205,29 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
), ),
), ),
), ),
// 第三行：备注信息 // 第三行：来源信息（从 memo 中提取，去掉权益类型前缀）
if (item.memo.isNotEmpty) ...[ if (item.memo.isNotEmpty) ...[
const SizedBox(height: 4), const SizedBox(height: 4),
Text( Builder(
item.memo, builder: (context) {
style: const TextStyle( // memo 格式如 "分享权益：来自用户D25122400000的认种"
fontSize: 11, // 去掉前缀，只显示 "来自用户xxx的认种" 部分
fontFamily: 'Inter', String displayMemo = item.memo;
color: Color(0x995D4037), final colonIndex = displayMemo.indexOf('：');
), if (colonIndex != -1 && colonIndex < displayMemo.length - 1) {
maxLines: 2, displayMemo = displayMemo.substring(colonIndex + 1);
overflow: TextOverflow.ellipsis, }
return Text(
displayMemo,
style: const TextStyle(
fontSize: 11,
fontFamily: 'Inter',
color: Color(0x995D4037),
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
);
},
), ),
], ],
], ],
@ -2431,7 +2444,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
StackedCardsView<SettleableRewardItem>( StackedCardsView<SettleableRewardItem>(
items: _settleableRewards, items: _settleableRewards,
peekHeight: 28, peekHeight: 28,
expandedCardHeight: 90, expandedCardHeight: 110,
enableSound: true, enableSound: true,
itemBuilder: (item, isSelected, index) => _buildStackedSettleableRewardCard(item, isSelected), itemBuilder: (item, isSelected, index) => _buildStackedSettleableRewardCard(item, isSelected),
), ),
@ -2604,7 +2617,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
final amountText = amountParts.isNotEmpty ? amountParts.join(' ') : '0 绿积分'; final amountText = amountParts.isNotEmpty ? amountParts.join(' ') : '0 绿积分';
return Container( return Container(
height: isSelected ? 90 : 48, height: isSelected ? 110 : 48,
decoration: BoxDecoration( decoration: BoxDecoration(
color: isSelected ? Colors.white : const Color(0xFFFFFDF8), color: isSelected ? Colors.white : const Color(0xFFFFFDF8),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
@ -2653,7 +2666,7 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
), ),
], ],
), ),
const SizedBox(height: 8), const SizedBox(height: 6),
// 第二行：金额信息 // 第二行：金额信息
FittedBox( FittedBox(
fit: BoxFit.scaleDown, fit: BoxFit.scaleDown,
@ -2668,6 +2681,31 @@ class _ProfilePageState extends ConsumerState<ProfilePage> {
), ),
), ),
), ),
// 第三行：来源信息（从 memo 中提取，去掉权益类型前缀）
if (item.memo.isNotEmpty) ...[
const SizedBox(height: 4),
Builder(
builder: (context) {
// memo 格式如 "分享权益：来自用户D25122400000的认种"
// 去掉前缀，只显示 "来自用户xxx的认种" 部分
String displayMemo = item.memo;
final colonIndex = displayMemo.indexOf('：');
if (colonIndex != -1 && colonIndex < displayMemo.length - 1) {
displayMemo = displayMemo.substring(colonIndex + 1);
}
return Text(
displayMemo,
style: const TextStyle(
fontSize: 11,
fontFamily: 'Inter',
color: Color(0x995D4037),
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
);
},
),
],
], ],
), ),
) )