xjw/circle_app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yangyuhao 2023-08-25 15:29:52 +07:00
commit 548b548f82
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
circle_app/lib/app/invite/view.dart
View File

@ -69,7 +69,7 @@ class InvitePage extends StatelessWidget {
12.sp, 12.sp,
searchContent: 'Tip：')); searchContent: 'Tip：'));
allSpan.addAll(getTextSpanList( allSpan.addAll(getTextSpanList(
' ${logic.homeData!.inviteCount! ?? 0} 位同好，', ' ${logic.homeData!.inviteCount! ?? 0} 位圈友，',
Color(0xFFDC5BFD), Color(0xFFDC5BFD),
12.sp, 12.sp,
searchContent: '${logic.homeData!.inviteCount! ?? 0}')); searchContent: '${logic.homeData!.inviteCount! ?? 0}'));
@ -78,11 +78,21 @@ class InvitePage extends StatelessWidget {
Color(0xFFDC5BFD), Color(0xFFDC5BFD),
12.sp, 12.sp,
searchContent: '${logic.homeData!.achieveRewardDay! ?? '0'} ')); searchContent: '${logic.homeData!.achieveRewardDay! ?? '0'} '));
int maxCount = logic.homeData!.inviteAwardConf!.last.inviteCount ?? 0;
if (logic.homeData!.inviteCount! >= maxCount) {
allSpan.addAll(getTextSpanList( allSpan.addAll(getTextSpanList(
' 再邀请 ${logic.homeData!.diffAwardCount} 位同好可领取更多奖励~', ' 再邀请可领取更多奖励~',
Color(0xFFDC5BFD),
12.sp,
searchContent: ''));
} else {
allSpan.addAll(getTextSpanList(
' 再邀请 ${logic.homeData!.diffAwardCount} 位圈友可领取更多奖励~',
Color(0xFFDC5BFD), Color(0xFFDC5BFD),
12.sp, 12.sp,
searchContent: '${logic.homeData!.diffAwardCount}')); searchContent: '${logic.homeData!.diffAwardCount}'));
}
} }
@ -271,7 +281,7 @@ class InvitePage extends StatelessWidget {
child: Column( child: Column(
children: [ children: [
Container( Container(
margin: EdgeInsets.only(top: 15.sp), margin: EdgeInsets.only(top: 15.sp,left: 35.sp,right: 35.sp),
alignment: Alignment.center, alignment: Alignment.center,
child: Image.asset(getMineImage('invite_title'),height: 22.sp,), child: Image.asset(getMineImage('invite_title'),height: 22.sp,),
), ),
@ -462,7 +472,7 @@ void showCodePicker(InviteLogic logic) {
Container( Container(
margin: EdgeInsets.only(top: 20.sp, left: 20.sp), margin: EdgeInsets.only(top: 20.sp, left: 20.sp),
child: Text( child: Text(
'请输入邀请您加入APP的同好的邀请码', '请输入邀请您加入APP的圈友的邀请码',
style: TextStyle(color: Colors.white, fontSize: 14.sp), style: TextStyle(color: Colors.white, fontSize: 14.sp),
), ),
), ),