master
张萌 3 years ago
parent f18b94a8a6
commit 21b431685f

@ -4,7 +4,7 @@
In most cases you can leave this as-is, but you if you want to provide 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 additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. --> FlutterApplication and put your custom class here. -->
<application android:label="小蜜蜂管家" <application android:label="小蜜蜂管家"
android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true"> android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
<service android:name="com.amap.api.location.APSService"/> <service android:name="com.amap.api.location.APSService"/>
<meta-data android:name="com.amap.api.v2.apikey" android:value="0c11d9ba47089d971dc4d889b66593ab"/> <meta-data android:name="com.amap.api.v2.apikey" android:value="0c11d9ba47089d971dc4d889b66593ab"/>

@ -71,11 +71,12 @@ class _HouseholdAuditPageState extends State<HouseholdAuditPage>
onRefresh: () async { onRefresh: () async {
_models = []; _models = [];
_page = 1; _page = 1;
var base = await NetUtil().getList(SAASAPI.householdAudit.list,params: { var base = await NetUtil().getList(SAASAPI.householdAudit.list,
'pageNum': _page, params: {
'size': _size, 'pageNum': _page,
'status':index==0?null:index 'size': _size,
}); 'status': index == 0 ? null : index
});
_models = base.rows _models = base.rows
.map((e) => HouseholdAuditListModel.fromJson(e)) .map((e) => HouseholdAuditListModel.fromJson(e))
.toList(); .toList();
@ -83,11 +84,12 @@ class _HouseholdAuditPageState extends State<HouseholdAuditPage>
}, },
onLoad: () async { onLoad: () async {
_page++; _page++;
var base = await NetUtil().getList(SAASAPI.householdAudit.list,params: { var base = await NetUtil().getList(SAASAPI.householdAudit.list,
'pageNum': _page, params: {
'size': _size, 'pageNum': _page,
'status':index==0?null:index 'size': _size,
}); 'status': index == 0 ? null : index
});
if (_models.length < base.total) { if (_models.length < base.total) {
_models.addAll(base.rows _models.addAll(base.rows
.map((e) => HouseholdAuditListModel.fromJson(e)) .map((e) => HouseholdAuditListModel.fromJson(e))
@ -134,7 +136,7 @@ class _HouseholdAuditPageState extends State<HouseholdAuditPage>
])), ])),
child: Row( child: Row(
children: [ children: [
'2栋1单元502室' '${model.houseName}'
.text .text
.size(32.sp) .size(32.sp)
.color(Colors.black.withOpacity(0.85)) .color(Colors.black.withOpacity(0.85))
@ -173,13 +175,12 @@ class _HouseholdAuditPageState extends State<HouseholdAuditPage>
children: [ children: [
SizedBox( SizedBox(
width: 160.w, width: 160.w,
child: '申请身份' child: '联系方式'
.text .text
.size(28.sp) .size(28.sp)
.color(Colors.black.withOpacity(0.45)) .color(Colors.black.withOpacity(0.45))
.make()), .make()),
_identity[model.identity]! model.tel.text
.text
.size(28.sp) .size(28.sp)
.color(Colors.black.withOpacity(0.85)) .color(Colors.black.withOpacity(0.85))
.make(), .make(),

@ -1,13 +1,6 @@
import 'dart:ui'; 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:equatable/equatable.dart';
import 'package:get/get.dart';
class ApplicationUtil { class ApplicationUtil {
ApplicationUtil(this.titles); ApplicationUtil(this.titles);
@ -33,31 +26,7 @@ class ApplicationUtil {
} }
} }
List<AppElement> get allApplications => [ List<AppElement> 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());
})
];
} }
class AppElement extends Equatable { class AppElement extends Equatable {
@ -65,11 +34,11 @@ class AppElement extends Equatable {
final String imgPath; final String imgPath;
final VoidCallback onTap; final VoidCallback onTap;
const AppElement({ const AppElement(
required this.title, this.title,
required this.imgPath, this.imgPath,
required this.onTap, this.onTap,
}); );
@override @override
List<Object?> get props => [ List<Object?> get props => [

@ -16,9 +16,12 @@ class HouseholdAuditListModel extends Equatable {
final String idCard; final String idCard;
final int status; final int status;
final String estateTypeName; final String estateTypeName;
factory HouseholdAuditListModel.fromJson(Map<String, dynamic> json) => factory HouseholdAuditListModel.fromJson(Map<String, dynamic> json) =>
_$HouseholdAuditListModelFromJson(json); _$HouseholdAuditListModelFromJson(json);
String get houseName => buildingName + '' + unitName + '单元' + estateName;
const HouseholdAuditListModel({ const HouseholdAuditListModel({
required this.estateReviewId, required this.estateReviewId,
required this.name, required this.name,
@ -32,6 +35,7 @@ class HouseholdAuditListModel extends Equatable {
required this.status, required this.status,
required this.estateTypeName, required this.estateTypeName,
}); });
@override @override
List<Object?> get props => [ List<Object?> get props => [
estateReviewId, estateReviewId,

@ -29,6 +29,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@Deprecated('废弃,酌情删除')
class AppApplication { class AppApplication {
String name; String name;
String assetPath; String assetPath;

Loading…
Cancel
Save