diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index fbdea2e..9d14606 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -4,7 +4,7 @@ In most cases you can leave this as-is, but you if you want to provide additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> - diff --git a/lib/new_ui/household_audit/household_audit_page.dart b/lib/new_ui/household_audit/household_audit_page.dart index e66152a..8dbbca5 100644 --- a/lib/new_ui/household_audit/household_audit_page.dart +++ b/lib/new_ui/household_audit/household_audit_page.dart @@ -71,11 +71,12 @@ class _HouseholdAuditPageState extends State onRefresh: () async { _models = []; _page = 1; - var base = await NetUtil().getList(SAASAPI.householdAudit.list,params: { - 'pageNum': _page, - 'size': _size, - 'status':index==0?null:index - }); + var base = await NetUtil().getList(SAASAPI.householdAudit.list, + params: { + 'pageNum': _page, + 'size': _size, + 'status': index == 0 ? null : index + }); _models = base.rows .map((e) => HouseholdAuditListModel.fromJson(e)) .toList(); @@ -83,11 +84,12 @@ class _HouseholdAuditPageState extends State }, onLoad: () async { _page++; - var base = await NetUtil().getList(SAASAPI.householdAudit.list,params: { - 'pageNum': _page, - 'size': _size, - 'status':index==0?null:index - }); + var base = await NetUtil().getList(SAASAPI.householdAudit.list, + params: { + 'pageNum': _page, + 'size': _size, + 'status': index == 0 ? null : index + }); if (_models.length < base.total) { _models.addAll(base.rows .map((e) => HouseholdAuditListModel.fromJson(e)) @@ -134,7 +136,7 @@ class _HouseholdAuditPageState extends State ])), child: Row( children: [ - '2栋1单元502室' + '${model.houseName}' .text .size(32.sp) .color(Colors.black.withOpacity(0.85)) @@ -173,13 +175,12 @@ class _HouseholdAuditPageState extends State children: [ SizedBox( width: 160.w, - child: '申请身份' + child: '联系方式' .text .size(28.sp) .color(Colors.black.withOpacity(0.45)) .make()), - _identity[model.identity]! - .text + model.tel.text .size(28.sp) .color(Colors.black.withOpacity(0.85)) .make(), diff --git a/lib/new_ui/new_home/application_util.dart b/lib/new_ui/new_home/application_util.dart index cdd08a7..026ebf0 100644 --- a/lib/new_ui/new_home/application_util.dart +++ b/lib/new_ui/new_home/application_util.dart @@ -1,13 +1,6 @@ import 'dart:ui'; -import 'package:aku_new_community_manager/gen/assets.gen.dart'; -import 'package:aku_new_community_manager/new_ui/household_audit/household_audit_page.dart'; -import 'package:aku_new_community_manager/new_ui/work_order/distributor/work_order_distributor_page.dart'; -import 'package:aku_new_community_manager/new_ui/work_order/receiver/work_order_receiver_page.dart'; -import 'package:aku_new_community_manager/tools/user_tool.dart'; -import 'package:aku_new_community_manager/ui/manage_pages/inspection_manage/inspection_manage_page.dart'; import 'package:equatable/equatable.dart'; -import 'package:get/get.dart'; class ApplicationUtil { ApplicationUtil(this.titles); @@ -33,31 +26,7 @@ class ApplicationUtil { } } - List get allApplications => [ - AppElement( - title: '巡检管理', - imgPath: Assets.home.icPatrol.path, - onTap: () async { - await Get.to(() => InspectionManagePage()); - }), - AppElement( - title: '工单管理', - imgPath: Assets.home.icArticle.path, - onTap: () async { - if (UserTool.userProvider.userInfoModel!.workOrderJurisdiction == - 1) { - Get.to(() => WorkOrderDistributorPage()); - } else { - Get.to(() => WorkOrderReceiverPage()); - } - }), - AppElement( - title: '住户审核', - imgPath: Assets.home.icVisitors.path, - onTap: () async { - Get.to(() => HouseholdAuditPage()); - }) - ]; + List get allApplications => []; } class AppElement extends Equatable { @@ -65,11 +34,11 @@ class AppElement extends Equatable { final String imgPath; final VoidCallback onTap; - const AppElement({ - required this.title, - required this.imgPath, - required this.onTap, - }); + const AppElement( + this.title, + this.imgPath, + this.onTap, + ); @override List get props => [ diff --git a/lib/saas_models/household_audit/household_audit_list_model.dart b/lib/saas_models/household_audit/household_audit_list_model.dart index 4f91f68..7e95b74 100644 --- a/lib/saas_models/household_audit/household_audit_list_model.dart +++ b/lib/saas_models/household_audit/household_audit_list_model.dart @@ -16,9 +16,12 @@ class HouseholdAuditListModel extends Equatable { final String idCard; final int status; final String estateTypeName; + factory HouseholdAuditListModel.fromJson(Map json) => _$HouseholdAuditListModelFromJson(json); + String get houseName => buildingName + '栋' + unitName + '单元' + estateName; + const HouseholdAuditListModel({ required this.estateReviewId, required this.name, @@ -32,6 +35,7 @@ class HouseholdAuditListModel extends Equatable { required this.status, required this.estateTypeName, }); + @override List get props => [ estateReviewId, diff --git a/lib/ui/home/application/applications_page.dart b/lib/ui/home/application/applications_page.dart index 1057c1b..21fc8f4 100644 --- a/lib/ui/home/application/applications_page.dart +++ b/lib/ui/home/application/applications_page.dart @@ -29,6 +29,7 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:provider/provider.dart'; +@Deprecated('废弃,酌情删除') class AppApplication { String name; String assetPath;