diff --git a/lib/models/house/lease_detail_model.dart b/lib/models/house/lease_detail_model.dart index 52190de7..f5f99174 100644 --- a/lib/models/house/lease_detail_model.dart +++ b/lib/models/house/lease_detail_model.dart @@ -20,6 +20,7 @@ class LeaseDetailModel extends Equatable { final num indoorArea; final num rentStandard; final num margin; + final String? marginPayDate; final String leaseDateStart; final String leaseDateEnd; final List? imgUrls; @@ -52,6 +53,7 @@ class LeaseDetailModel extends Equatable { required this.indoorArea, required this.rentStandard, required this.margin, + required this.marginPayDate, required this.leaseDateStart, required this.leaseDateEnd, required this.imgUrls, @@ -85,8 +87,12 @@ class LeaseDetailModel extends Equatable { roomName, type, estateType, + estateStructure, + constructionArea, + indoorArea, rentStandard, margin, + marginPayDate, leaseDateStart, leaseDateEnd, imgUrls, @@ -101,6 +107,10 @@ class LeaseDetailModel extends Equatable { payBank, bankAccountName, bankAccount, + takeDate, + notMeterRentDate, + requiredRent, + depositRefundReviewRemake, ]; } diff --git a/lib/models/house/lease_detail_model.g.dart b/lib/models/house/lease_detail_model.g.dart index a2115157..9b26e7c7 100644 --- a/lib/models/house/lease_detail_model.g.dart +++ b/lib/models/house/lease_detail_model.g.dart @@ -21,6 +21,7 @@ LeaseDetailModel _$LeaseDetailModelFromJson(Map json) { indoorArea: json['indoorArea'] as num, rentStandard: json['rentStandard'] as num, margin: json['margin'] as num, + marginPayDate: json['marginPayDate'] as String?, leaseDateStart: json['leaseDateStart'] as String, leaseDateEnd: json['leaseDateEnd'] as String, imgUrls: (json['imgUrls'] as List?) diff --git a/lib/models/house/lease_list_model.dart b/lib/models/house/lease_list_model.dart index 163a79c1..a2fe2602 100644 --- a/lib/models/house/lease_list_model.dart +++ b/lib/models/house/lease_list_model.dart @@ -59,6 +59,20 @@ class LeaseListModel extends Equatable { return '待支付'; case 6: return '已完成'; + case 11: + return '申请终止合同'; + case 12: + return '申请终止失败'; + case 13: + return '申请终止成功'; + case 14: + return '已支付剩余租金'; + case 15: + return '申请退还保证金'; + case 16: + return '申请退还保证金驳回'; + case 17: + return '申请退还保证金成功'; default: return '未知'; } diff --git a/lib/ui/profile/house/contract_stop/refund_bond_result_page.dart b/lib/ui/profile/house/contract_stop/refund_bond_result_page.dart index 916e7657..eab951fc 100644 --- a/lib/ui/profile/house/contract_stop/refund_bond_result_page.dart +++ b/lib/ui/profile/house/contract_stop/refund_bond_result_page.dart @@ -8,7 +8,6 @@ import 'package:get/get.dart'; import 'package:velocity_x/velocity_x.dart'; class RefundBondResultPage extends StatefulWidget { - ///也可以从```UserTool.appProveider.selectedHouse```中获取 final int status; final String name; final double bond; diff --git a/lib/ui/profile/house/house_owners_page.dart b/lib/ui/profile/house/house_owners_page.dart index f239f5a0..1c4b6c03 100644 --- a/lib/ui/profile/house/house_owners_page.dart +++ b/lib/ui/profile/house/house_owners_page.dart @@ -3,6 +3,7 @@ import 'package:aku_community/ui/profile/house/contract_stop/contract_stop_page. import 'package:aku_community/ui/profile/house/contract_stop/pay_result_page.dart'; import 'package:aku_community/ui/profile/house/contract_stop/refund_bond_result_page.dart'; import 'package:aku_community/ui/profile/house/contract_stop/submit_finish_page.dart'; +import 'package:flustars/flustars.dart'; import 'package:flutter/material.dart'; import 'package:bot_toast/bot_toast.dart'; @@ -239,7 +240,7 @@ class _HouseOwnersPageState extends State { Get.to(() => PayResultPage( name: model.name, bond: model.margin.toDouble(), - date: DateTime.now().toString(), + date: DateUtil.formatDateStr(model.marginPayDate!), id: model.id, )); break; @@ -250,7 +251,7 @@ class _HouseOwnersPageState extends State { status: model.status, name: model.name, bond: model.margin.toDouble(), - date: DateTime.now().toString(), + date: DateUtil.formatDateStr(model.marginPayDate!), id: model.id, )); break;