Merge remote-tracking branch 'origin/1.1.1' into android_1.0.1

This commit is contained in:
yangyuhao 2023-08-25 09:58:47 +07:00
commit 4eb62bb766

View File

@ -59,12 +59,7 @@ class InvitePage extends StatelessWidget {
// ), // ),
}); });
getTextSpanList(
'Tip您已成功邀请 ${logic.homeData!.inviteCount! ?? 0}位同好,免费获得会员${logic.homeData!.achieveRewardDay! ?? '0'}天, 再邀请${logic.homeData!.diffAwardCount}位同友可领取更多奖励~',
Color(0xFFDC5BFD),
12.sp,
searchContent: 'Tip');
allSpan.addAll(getTextSpanList( allSpan.addAll(getTextSpanList(
'Tip您已成功邀请', 'Tip您已成功邀请',
Color(0xFF0DF5F7), Color(0xFF0DF5F7),
@ -81,7 +76,7 @@ class InvitePage extends StatelessWidget {
12.sp, 12.sp,
searchContent: '${logic.homeData!.achieveRewardDay! ?? '0'} ')); searchContent: '${logic.homeData!.achieveRewardDay! ?? '0'} '));
allSpan.addAll(getTextSpanList( allSpan.addAll(getTextSpanList(
' 再邀请 ${logic.homeData!.diffAwardCount} 位同可领取更多奖励~', ' 再邀请 ${logic.homeData!.diffAwardCount} 位同可领取更多奖励~',
Color(0xFFDC5BFD), Color(0xFFDC5BFD),
12.sp, 12.sp,
searchContent: '${logic.homeData!.diffAwardCount}')); searchContent: '${logic.homeData!.diffAwardCount}'));
@ -222,7 +217,7 @@ class InvitePage extends StatelessWidget {
data['inviter_name'], data['inviter_name'],
style: TextStyle( style: TextStyle(
color: Color(0xff0DF5F7), color: Color(0xff0DF5F7),
fontSize: 14.sp, fontSize: 16.sp,
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
), ),
Container( Container(
@ -232,14 +227,14 @@ class InvitePage extends StatelessWidget {
'邀请', '邀请',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 14.sp, fontSize: 16.sp,
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
)), )),
Text( Text(
data['invitee_name'], data['invitee_name'],
style: TextStyle( style: TextStyle(
color: Color(0xff0DF5F7), color: Color(0xff0DF5F7),
fontSize: 14.sp, fontSize: 16.sp,
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
), ),
Container( Container(
@ -248,7 +243,7 @@ class InvitePage extends StatelessWidget {
'加入微乐园', '加入微乐园',
style: TextStyle( style: TextStyle(
color: Colors.white, color: Colors.white,
fontSize: 14.sp, fontSize: 16.sp,
fontWeight: FontWeight.w500), fontWeight: FontWeight.w500),
)), )),
], ],