diff --git a/lib/pages/user/benefit_view_gen.dart b/lib/pages/user/benefit_view_gen.dart index 7858535..677330e 100644 --- a/lib/pages/user/benefit_view_gen.dart +++ b/lib/pages/user/benefit_view_gen.dart @@ -20,7 +20,7 @@ import 'package:recook/widgets/recook_back_button.dart'; class DisplayCard { num benefit = 0; num sales = 0; - int count = 0; + num count = 0; bool isPercent = false; DisplayCard({ this.benefit, @@ -91,7 +91,12 @@ class _BenefitViewGenState extends State .color(Colors.black45) .size(16.sp) .make(), - (card.count ?? 0).toString().text.black.size(24.sp).make(), + (card.isPercent ? ((card.count ?? 0) * 100) : (card.count ?? 0)) + .toString() + .text + .black + .size(24.sp) + .make(), ].column(), ].row(), ].column(), @@ -419,7 +424,7 @@ class _BenefitViewGenState extends State children: [ _buildTitle(DateUtil.formatDate(e.date, format: 'M月dd日')), _buildTitle(e.salesVolume.toStringAsFixed(2)), - _buildTitle(e.amount.toString()), + _buildTitle(e.count.toString()), _buildTitle(e.amount.toString()), ], ); @@ -429,7 +434,7 @@ class _BenefitViewGenState extends State children: [ _buildTitle(DateUtil.formatDate(e.date, format: 'M月dd日')), _buildTitle(e.salesVolume.toStringAsFixed(2)), - _buildTitle(e.amount.toString()), + _buildTitle(e.count.toString()), _buildTitle(e.amount.toString()), ], ); diff --git a/lib/pages/user/model/user_accumulate_model.dart b/lib/pages/user/model/user_accumulate_model.dart index 009203f..aca2097 100644 --- a/lib/pages/user/model/user_accumulate_model.dart +++ b/lib/pages/user/model/user_accumulate_model.dart @@ -35,12 +35,12 @@ class Data { double recommendAmount; double rewardAmount; double get allAmount => - purchaseAmount ?? - 0 + guideAmount ?? - 0 + teamAmount ?? - 0 + recommendAmount ?? - 0 + rewardAmount ?? - 0; + (purchaseAmount ?? 0) + + (guideAmount ?? 0) + + (teamAmount ?? 0) + + (recommendAmount ?? 0) + + (rewardAmount ?? 0) + + .0; Data( {this.purchaseAmount, diff --git a/lib/pages/user/model/user_benefit_expect_extra_model.dart b/lib/pages/user/model/user_benefit_expect_extra_model.dart index f462a43..d9c214e 100644 --- a/lib/pages/user/model/user_benefit_expect_extra_model.dart +++ b/lib/pages/user/model/user_benefit_expect_extra_model.dart @@ -69,7 +69,7 @@ class UserBenefitExpectExtraModel { class Team { num salesVolume; num amount; - int ratio; + num ratio; DisplayCard get card => DisplayCard( count: ratio, sales: salesVolume,