|
|
@ -376,7 +376,7 @@ class _MineWalletPage extends State<MineWalletPage> { |
|
|
|
double surplusMoney = double.tryParse(surplusGreenMoney ?? "0"); |
|
|
|
double surplusMoney = double.tryParse(surplusGreenMoney ?? "0"); |
|
|
|
double surplusActivity = double.tryParse(surplusActivityMoney ?? "0"); |
|
|
|
double surplusActivity = double.tryParse(surplusActivityMoney ?? "0"); |
|
|
|
|
|
|
|
|
|
|
|
double balance = tbalance - (surplusMoney ?? 0) - (surplusActivity ?? 0); |
|
|
|
// double balance = tbalance - (surplusMoney ?? 0) - (surplusActivity ?? 0); |
|
|
|
String greenMoney = userBill.greenMoney; |
|
|
|
String greenMoney = userBill.greenMoney; |
|
|
|
String activityMoney = userBill.activityMoney; |
|
|
|
String activityMoney = userBill.activityMoney; |
|
|
|
|
|
|
|
|
|
|
@ -392,21 +392,21 @@ class _MineWalletPage extends State<MineWalletPage> { |
|
|
|
"${userBill.pm == 0 ? '-' : '+'}$activity" |
|
|
|
"${userBill.pm == 0 ? '-' : '+'}$activity" |
|
|
|
]; |
|
|
|
]; |
|
|
|
} |
|
|
|
} |
|
|
|
if (balance > 0) { |
|
|
|
if (tbalance > 0) { |
|
|
|
return [S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}$balance"]; |
|
|
|
return [S.of(context).yue, "${userBill.pm == 0 ? '-' : '+'}$tbalance"]; |
|
|
|
} |
|
|
|
} |
|
|
|
return []; |
|
|
|
return []; |
|
|
|
} else if (index == 1) { |
|
|
|
} else if (index == 1) { |
|
|
|
if (activity > 0) { |
|
|
|
if (money > 0 && activity > 0) { |
|
|
|
return [ |
|
|
|
return [ |
|
|
|
S.of(context).huodongyue, |
|
|
|
S.of(context).huodongyue, |
|
|
|
"${userBill.pm == 0 ? '-' : '+'}$activity" |
|
|
|
"${userBill.pm == 0 ? '-' : '+'}$activity" |
|
|
|
]; |
|
|
|
]; |
|
|
|
} |
|
|
|
} |
|
|
|
if (money > 0 && (balance - money) > 0) { |
|
|
|
if (money > 0 && (tbalance - money) > 0) { |
|
|
|
return [ |
|
|
|
return [ |
|
|
|
S.of(context).yue, |
|
|
|
S.of(context).yue, |
|
|
|
"${userBill.pm == 0 ? '-' : '+'}${(balance - money)}" |
|
|
|
"${userBill.pm == 0 ? '-' : '+'}${(tbalance - money)}" |
|
|
|
]; |
|
|
|
]; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return []; |
|
|
|
return []; |
|
|
@ -415,7 +415,7 @@ class _MineWalletPage extends State<MineWalletPage> { |
|
|
|
if (activity > 0 && money > 0) { |
|
|
|
if (activity > 0 && money > 0) { |
|
|
|
return [ |
|
|
|
return [ |
|
|
|
S.of(context).yue, |
|
|
|
S.of(context).yue, |
|
|
|
"${userBill.pm == 0 ? '-' : '+'}${(balance - money - activity)}" |
|
|
|
"${userBill.pm == 0 ? '-' : '+'}${(tbalance - money - activity)}" |
|
|
|
]; |
|
|
|
]; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return []; |
|
|
|
return []; |
|
|
|