fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into remove_uniapp

ff_new
fmk 3 years ago
parent
8dc778acc1 9bd7cb08a8
commit
66473f1675
2 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      lib/mine/mine_vip/mine_vip_core.dart
  2. 22
      lib/view_widget/mine_vip_view.dart

6
lib/mine/mine_vip/mine_vip_core.dart
Unescape View File

@ -257,9 +257,9 @@ class _MineVipCore extends State<MineVipCore> {
? "vip" ? "vip"
: "", : "",
padding: 6.w, padding: 6.w,
rank: !(ranks != null && ranks.isNotEmpty) // rank: !(ranks != null && ranks.isNotEmpty)
? 0 // ? 0
: widget.arguments["expendAmount"] ?? 0, // : widget.arguments["expendAmount"] ?? 0,
rankMax: !(ranks != null && ranks.isNotEmpty) rankMax: !(ranks != null && ranks.isNotEmpty)
? 0 ? 0
: ranks[position].rankOrigin, : ranks[position].rankOrigin,

22
lib/view_widget/mine_vip_view.dart
Unescape View File

@ -221,7 +221,7 @@ class MineVipView extends StatelessWidget {
// rank > rankMax // rank > rankMax
// ? S.of(context).dangqiandengji // ? S.of(context).dangqiandengji
// : "${S.of(context).jifen_(rankMax - rank)} ${S.of(context).daoxiayidengji}", // : "${S.of(context).jifen_(rankMax - rank)} ${S.of(context).daoxiayidengji}",
(vipLevel == 3)?"":((vipLevel < curLevel)?"":(((rank ?? 0) > rankMax || curLevel == 3 || curLevel ==2) !(showRank??true)?"":((vipLevel < curLevel)?"":(((rank ?? 0) > rankMax || curLevel == 3 || curLevel ==2)
? S.of(context).dangqiandengji ? S.of(context).dangqiandengji
: "消费￥${rankMax - (rank ?? 0)}元 ${S.of(context).daoxiayidengji}")), : "消费￥${rankMax - (rank ?? 0)}元 ${S.of(context).daoxiayidengji}")),
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
@ -237,7 +237,7 @@ class MineVipView extends StatelessWidget {
TextSpan( TextSpan(
children: [ children: [
TextSpan( TextSpan(
text: vipLevel == 3?"":((vipLevel <= curLevel)?rankMax.toString():rank.toString()), text: !(showRank??true)?(vipLevel == 3?"":rankMax.toString()):((vipLevel < curLevel)?rankMax.toString():rank.toString()),
style: TextStyle( style: TextStyle(
fontSize: 26.sp, fontSize: 26.sp,
fontWeight: MyFontWeight.semi_bold, fontWeight: MyFontWeight.semi_bold,
@ -253,15 +253,15 @@ class MineVipView extends StatelessWidget {
color: textColor, color: textColor,
), ),
), ),
// if ((rank ?? 0) <= rankMax) if ((rank ?? 0) <= rankMax && (showRank??true))
// TextSpan( TextSpan(
// text: rankMax > 0 ? "/$rankMax" : "/0", text: rankMax > 0 ? "/$rankMax" : "/0",
// style: TextStyle( style: TextStyle(
// fontSize: 14.sp, fontSize: 14.sp,
// fontWeight: MyFontWeight.regular, fontWeight: MyFontWeight.regular,
// color: textColor, color: textColor,
// ), ),
// ), ),
], ],
), ),
), ),

Write Preview
Loading…
Cancel
Save