店铺 "本考核期截止至2021-01-01, 将于2021-01-22进行考核" 说明,该字段由后端提供“content”

master
laiiihz 5 years ago
parent ef229b7ad6
commit 70256b00ea

@ -256,6 +256,7 @@ class MyShoppingWithTime {
return data;
}
}
class TeamIncomeWithTime {
TeamInToday today;
TeamInToday thisMonth;
@ -264,7 +265,8 @@ class TeamIncomeWithTime {
TeamIncomeWithTime({this.today, this.thisMonth, this.prevMonth});
TeamIncomeWithTime.fromJson(Map<String, dynamic> json) {
today = json['today'] != null ? new TeamInToday.fromJson(json['today']) : null;
today =
json['today'] != null ? new TeamInToday.fromJson(json['today']) : null;
thisMonth = json['thisMonth'] != null
? new TeamInToday.fromJson(json['thisMonth'])
: null;
@ -370,8 +372,16 @@ class Assessment {
UpStandard keepStandard;
Upper upper;
Upper keeper;
String content;
Assessment({this.aTime, this.upStandard, this.keepStandard, this.upper, this.keeper});
Assessment({
this.aTime,
this.upStandard,
this.keepStandard,
this.upper,
this.keeper,
this.content,
});
Assessment.fromJson(Map<String, dynamic> json) {
aTime = json['aTime'];
@ -383,6 +393,7 @@ class Assessment {
: null;
upper = json['upper'] != null ? new Upper.fromJson(json['upper']) : null;
keeper = json['keeper'] != null ? new Upper.fromJson(json['keeper']) : null;
content = json['content'];
}
Map<String, dynamic> toJson() {
@ -400,6 +411,7 @@ class Assessment {
data['keeper'] = this.keeper.toJson();
}
data['aTime'] = this.aTime;
data['content'] = this.content;
return data;
}
}

@ -94,7 +94,6 @@ class _ShopPageUpgradeProgressState
String goldIconPersonKeep = "assets/shop_page_progress_icon_gold_person.png";
List<Widget> returnList = [];
DateTime date = DateTime.parse(_shopSummaryModel.data.assessment.aTime);
double upSale = double.parse(_shopSummaryModel.data.assessment.upper.sale);
int upPerson = int.parse(_shopSummaryModel.data.assessment.upper.developNew);
double keepSale = double.parse(_shopSummaryModel.data.assessment.keeper.sale);
@ -105,7 +104,7 @@ class _ShopPageUpgradeProgressState
int standardPerson = _shopSummaryModel.data.assessment.upStandard.role300.person.toInt();
bool fullSale = upSale >= standardSale;
bool fullPerson = upPerson>=standardPerson;
String expireDate = "" + "${date.year}-${date.month}-${date.day}前完成升级";
String expireDate = _shopSummaryModel.data.assessment.content;
returnList.add(
Expanded(
child: _itemWidget(
@ -135,7 +134,7 @@ class _ShopPageUpgradeProgressState
int standardPerson = _shopSummaryModel.data.assessment.keepStandard.role200.person.toInt();
bool fullSale = keepSale >= standardSale;
bool fullPerson = keepPerson>=standardPerson;
String expireDate = "" + "${date.year}-${date.month}-${date.day}前完成保级";
String expireDate = _shopSummaryModel.data.assessment.content;
returnList.add(
Expanded(
child: _itemWidget(
@ -170,7 +169,7 @@ class _ShopPageUpgradeProgressState
int keepStandardPerson = _shopSummaryModel.data.assessment.keepStandard.role300.person.toInt();
bool fullKeepSale = keepSale >= keepStandardSale;
bool fullKeepPerson = keepPerson >= keepStandardPerson;
String expireDate = "" + "${date.year}-${date.month}-${date.day}前完成升级";
String expireDate = _shopSummaryModel.data.assessment.content;
returnList.add(
Expanded(
child: _itemWidget(

Loading…
Cancel
Save