Merge branch 'dev'

* dev:
  add decoration page
  add check page
  报事报修页面更新

# Conflicts:
#	lib/ui/home/application/applications_page.dart
hmxc
小赖 4 years ago
commit 70f233fe6e

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

@ -10,7 +10,60 @@ enum FIXER_TYPE {
} }
class FixerModel { class FixerModel {
FIXER_TYPE type;
String name; String name;
String phone; String phone;
FixerModel({this.name, this.phone});
}
class FixerTypedModel {
FIXER_TYPE type;
String get typeName {
switch (type) {
case FIXER_TYPE.AIR_CONDITION:
return '空调组';
break;
case FIXER_TYPE.ELECTRIC:
return '电力组';
break;
case FIXER_TYPE.CEMENT:
return '水泥组';
break;
default:
return '';
}
}
List<FixerModel> fixers;
FixerTypedModel({
this.type,
this.fixers,
});
static List<FixerTypedModel> models = [
FixerTypedModel(
type: FIXER_TYPE.AIR_CONDITION,
fixers: [
FixerModel(name: '刘能建师傅', phone: '18923747283'),
FixerModel(name: '李惠政师傅', phone: '18910298345'),
FixerModel(name: '李慧珍师傅', phone: '17872342382'),
FixerModel(name: '林 芝师傅', phone: '18292847752'),
],
),
FixerTypedModel(
type: FIXER_TYPE.CEMENT,
fixers: [
FixerModel(name: '李雷师傅', phone: '18923747283'),
FixerModel(name: '林智师傅', phone: '18910298345'),
FixerModel(name: '刘凯欣师傅', phone: '17872342382'),
FixerModel(name: '张亮师傅', phone: '18292847752'),
],
),
FixerTypedModel(
type: FIXER_TYPE.ELECTRIC,
fixers: [
FixerModel(name: '李建国师傅', phone: '18923747283'),
FixerModel(name: '李历程师傅', phone: '18910298345'),
],
),
];
} }

@ -18,16 +18,26 @@ class UserInfoModel {
String nickName; String nickName;
File avatar; File avatar;
USER_ROLE role; USER_ROLE role;
String phone;
String get securePhone {
if (phone.length < 8)
return phone;
else
return '${phone.substring(0, 3)}****${phone.substring(7)}';
}
UserInfoModel({ UserInfoModel({
this.nickName, this.nickName,
this.avatar, this.avatar,
this.role, this.role,
this.phone,
}); });
UserInfoModel.empty({ UserInfoModel.empty({
this.nickName = '', this.nickName = '',
this.avatar, this.avatar,
this.role = USER_ROLE.EMPTY, this.role = USER_ROLE.EMPTY,
this.phone = '',
}); });
/// ///
@ -36,6 +46,7 @@ class UserInfoModel {
this.nickName = '李管家', this.nickName = '李管家',
this.avatar, this.avatar,
this.role = USER_ROLE.MANAGER, this.role = USER_ROLE.MANAGER,
this.phone = '18819289976',
}); });
/// ///
@ -44,6 +55,7 @@ class UserInfoModel {
this.nickName = '王师傅', this.nickName = '王师傅',
this.avatar, this.avatar,
this.role = USER_ROLE.FIXER, this.role = USER_ROLE.FIXER,
this.phone = '18927139123',
}); });
/// ///
@ -52,5 +64,6 @@ class UserInfoModel {
this.nickName = '林保安', this.nickName = '林保安',
this.avatar, this.avatar,
this.role = USER_ROLE.SECURITY, this.role = USER_ROLE.SECURITY,
this.phone = '13918237877',
}); });
} }

@ -1,4 +1,5 @@
import 'package:aku_community_manager/mock_models/fix/fix_model.dart'; import 'package:aku_community_manager/mock_models/fix/fix_model.dart';
import 'package:aku_community_manager/mock_models/fix/fixer_model.dart';
import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart';
import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/provider/user_provider.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -55,4 +56,7 @@ class FixProvider extends ChangeNotifier {
break; break;
} }
} }
List<FixerTypedModel> _fixerModels = FixerTypedModel.models;
List<FixerTypedModel> get fixerModels => _fixerModels;
} }

@ -1,6 +1,5 @@
import 'dart:io'; import 'dart:io';
import 'package:aku_community_manager/const/resource.dart';
import 'package:aku_community_manager/mock_models/users/user_info_model.dart'; import 'package:aku_community_manager/mock_models/users/user_info_model.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';

@ -1,6 +1,7 @@
import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_page.dart'; import 'package:aku_community_manager/ui/manage_pages/green_manage/green_manage_page.dart';
import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_page.dart'; import 'package:aku_community_manager/ui/manage_pages/inspection_manage/inspection_manage_page.dart';
import 'package:aku_community_manager/ui/sub_pages/activity_manager/activity_manager_page.dart'; import 'package:aku_community_manager/ui/sub_pages/activity_manager/activity_manager_page.dart';
import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_page.dart';
import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart'; import 'package:aku_community_manager/ui/sub_pages/visitor_manager/visitor_manager_page.dart';
import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:aku_ui/common_widgets/aku_material_button.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -50,10 +51,13 @@ class _ApplicationPageState extends State<ApplicationPage>
AppApplication('一键报警', R.ASSETS_HOME_IC_POLICE_PNG, Scaffold()), AppApplication('一键报警', R.ASSETS_HOME_IC_POLICE_PNG, Scaffold()),
AppApplication('问卷调查', '', Scaffold()), AppApplication('问卷调查', '', Scaffold()),
]; ];
List<AppApplication> _wisdomApplications=[ List<AppApplication> _wisdomApplications = [
AppApplication('绿化管理', R.ASSETS_HOME_IC_GREENING_PNG, GreenManagePage()), AppApplication('绿化管理', R.ASSETS_HOME_IC_GREENING_PNG, GreenManagePage()),
AppApplication('巡检管理', R.ASSETS_HOME_IC_PATROL_PNG, InspectionManagePage()), AppApplication('巡检管理', R.ASSETS_HOME_IC_PATROL_PNG, InspectionManagePage()),
]; AppApplication(
'装修管理', R.ASSETS_HOME_IC_DECORATION_PNG, DecorationManagerPage()),
];
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final appProvider = Provider.of<AppProvider>(context); final appProvider = Provider.of<AppProvider>(context);
@ -204,7 +208,7 @@ List<AppApplication> _wisdomApplications=[
}, },
itemCount: _recommandApplications.length, itemCount: _recommandApplications.length,
), ),
GridView.builder( GridView.builder(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 3, crossAxisCount: 3,
), ),

@ -275,17 +275,25 @@ class _HomePageState extends State<HomePage> {
]), ]),
), ),
SizedBox(height: 24.w), SizedBox(height: 24.w),
Container( GestureDetector(
margin: EdgeInsets.only( onTap: () {
left: 32.w, if (!userProvider.isSigned) Get.to(LoginPage());
), },
height: 67.w, child: Container(
child: Text( margin: EdgeInsets.only(
'HI李大海', left: 32.w,
style: TextStyle( ),
height: 67.w,
child: Text(
userProvider.isSigned
? 'HI${userProvider.userInfoModel.nickName}'
: '登录/注册',
style: TextStyle(
color: AppStyle.primaryTextColor, color: AppStyle.primaryTextColor,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 48.sp), fontSize: 48.sp,
),
),
), ),
), ),
SizedBox(height: 16.w), SizedBox(height: 16.w),

@ -26,7 +26,7 @@ class _UserInfoPageState extends State<UserInfoPage> {
AkuTile( AkuTile(
onTap: () { onTap: () {
akuPickImage().then((file) { akuPickImage().then((file) {
userProvider.setAvatar(file); if (file != null) userProvider.setAvatar(file);
}); });
}, },
title: Text('头像'), title: Text('头像'),
@ -50,6 +50,7 @@ class _UserInfoPageState extends State<UserInfoPage> {
AkuTile( AkuTile(
onTap: () {}, onTap: () {},
title: Text('手机'), title: Text('手机'),
suffix: Text(userProvider.userInfoModel.securePhone),
), ),
], ],
), ),

@ -4,12 +4,17 @@ import 'package:aku_community_manager/mock_models/users/user_info_model.dart';
import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/provider/user_provider.dart';
import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/style/app_style.dart';
import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_more_time_page.dart';
import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_work_finish_page.dart';
import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fixer_department_page.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:aku_community_manager/ui/widgets/inner/aku_title_box.dart';
import 'package:aku_community_manager/ui/widgets/inner/show_bottom_sheet.dart'; import 'package:aku_community_manager/ui/widgets/inner/show_bottom_sheet.dart';
import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:aku_ui/common_widgets/aku_material_button.dart';
import 'package:common_utils/common_utils.dart'; import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:aku_community_manager/tools/screen_tool.dart'; import 'package:aku_community_manager/tools/screen_tool.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
class BusinessAndFixDetailPage extends StatefulWidget { class BusinessAndFixDetailPage extends StatefulWidget {
@ -122,7 +127,9 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
onPressed: detailModel.type != null && onPressed: detailModel.type != null &&
detailModel.subType != null && detailModel.subType != null &&
detailModel.limit != null detailModel.limit != null
? () {} ? () {
Get.to(FixerDepartmentPage(model: widget.model));
}
: null, : null,
child: Text( child: Text(
'立即派单', '立即派单',
@ -136,7 +143,12 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
return AkuMaterialButton( return AkuMaterialButton(
color: AppStyle.primaryColor, color: AppStyle.primaryColor,
nullColor: AppStyle.minorColor, nullColor: AppStyle.minorColor,
onPressed: () {}, onPressed: () {
Get.to(FixerDepartmentPage(
model: widget.model,
changeType: true,
));
},
child: Text( child: Text(
'改派', '改派',
style: TextStyle( style: TextStyle(
@ -148,7 +160,16 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
return AkuMaterialButton( return AkuMaterialButton(
color: AppStyle.primaryColor, color: AppStyle.primaryColor,
nullColor: AppStyle.minorColor, nullColor: AppStyle.minorColor,
onPressed: () {}, onPressed: () {
final userProvider =
Provider.of<UserProvider>(context, listen: false);
detailModel.fixStatuses.add(FixStatus(
title: '${userProvider.userInfoModel.nickName}已接单',
date: DateTime.now(),
));
widget.model.type = FIX_ENUM.PROCESSING;
Get.back();
},
child: Text( child: Text(
'立即接单', '立即接单',
style: TextStyle( style: TextStyle(
@ -185,7 +206,9 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
color: AppStyle.primaryColor, color: AppStyle.primaryColor,
), ),
), ),
onPressed: () {}, onPressed: () {
Get.to(FixMoreTimePage(model: widget.model));
},
child: Text( child: Text(
'申请延时', '申请延时',
style: TextStyle( style: TextStyle(
@ -199,7 +222,9 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
minWidth: 304.w, minWidth: 304.w,
radius: 4.w, radius: 4.w,
color: AppStyle.primaryColor, color: AppStyle.primaryColor,
onPressed: () {}, onPressed: () {
Get.to(FixWorkFinishPage(model: widget.model));
},
child: Text( child: Text(
'处理完成', '处理完成',
style: TextStyle( style: TextStyle(
@ -219,7 +244,7 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
} }
_buildInfo() { _buildInfo() {
return _buildRawBox( return AkuTitleBox(
title: '报修信息', title: '报修信息',
suffix: fixTypeWidget, suffix: fixTypeWidget,
children: [ children: [
@ -269,7 +294,7 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
} }
_buildType(bool canTap) { _buildType(bool canTap) {
return _buildRawBox( return AkuTitleBox(
title: '工单类型', title: '工单类型',
children: [ children: [
_buildTypeTile( _buildTypeTile(
@ -331,7 +356,7 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
} }
_buildProcess() { _buildProcess() {
return _buildRawBox( return AkuTitleBox(
title: '报修进程', title: '报修进程',
children: detailModel.fixStatuses.map((e) { children: detailModel.fixStatuses.map((e) {
return _buildProcessTile( return _buildProcessTile(
@ -343,7 +368,7 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
} }
_buildResult() { _buildResult() {
return _buildRawBox( return AkuTitleBox(
title: '处理情况', title: '处理情况',
spacing: 24, spacing: 24,
children: [ children: [
@ -398,7 +423,15 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
children: detailModel.result.imgs.map((e) { children: detailModel.result.imgs.map((e) {
return ClipRRect( return ClipRRect(
borderRadius: BorderRadius.circular(4.w), borderRadius: BorderRadius.circular(4.w),
child: (e is String) ? Image.asset(e) : Image.file(e), child: (e is String)
? Image.asset(
e,
fit: BoxFit.cover,
)
: Image.file(
e,
fit: BoxFit.cover,
),
); );
}).toList(), }).toList(),
), ),
@ -407,7 +440,7 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
} }
_buildRating() { _buildRating() {
return _buildRawBox( return AkuTitleBox(
title: '评价信息', title: '评价信息',
spacing: 24, spacing: 24,
children: [ children: [
@ -552,39 +585,4 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
children: children..removeLast(), children: children..removeLast(),
); );
} }
_buildRawBox({
String title,
List<Widget> children,
Widget suffix,
double spacing = 0,
}) {
return Container(
padding: EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w),
color: Colors.white,
margin: EdgeInsets.only(bottom: 16.w),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
title,
style: TextStyle(
color: AppStyle.primaryTextColor,
fontWeight: FontWeight.bold,
fontSize: 36.sp,
),
),
Spacer(),
suffix ?? SizedBox(),
],
),
AkuBox.h(spacing),
...children,
],
),
);
}
} }

@ -4,6 +4,8 @@ import 'package:aku_community_manager/provider/user_provider.dart';
import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/style/app_style.dart';
import 'package:aku_community_manager/tools/widget_tool.dart'; import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart'; import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart';
import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_more_time_page.dart';
import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_work_finish_page.dart';
import 'package:aku_ui/common_widgets/aku_material_button.dart'; import 'package:aku_ui/common_widgets/aku_material_button.dart';
import 'package:common_utils/common_utils.dart'; import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -176,7 +178,9 @@ class _BusinessFixCardState extends State<BusinessFixCard> {
fontSize: 28.sp, fontSize: 28.sp,
), ),
), ),
onPressed: () {}, onPressed: () {
Get.to(FixMoreTimePage(model: widget.model));
},
) )
: SizedBox(), : SizedBox(),
widget.model.type == FIX_ENUM.PROCESSING widget.model.type == FIX_ENUM.PROCESSING
@ -184,7 +188,9 @@ class _BusinessFixCardState extends State<BusinessFixCard> {
: SizedBox(), : SizedBox(),
widget.model.type == FIX_ENUM.PROCESSING widget.model.type == FIX_ENUM.PROCESSING
? AkuMaterialButton( ? AkuMaterialButton(
onPressed: () {}, onPressed: () {
Get.to(FixWorkFinishPage(model: widget.model));
},
radius: 4.w, radius: 4.w,
color: AppStyle.primaryColor, color: AppStyle.primaryColor,
minWidth: 160.w, minWidth: 160.w,
@ -200,7 +206,16 @@ class _BusinessFixCardState extends State<BusinessFixCard> {
: SizedBox(), : SizedBox(),
widget.model.type == FIX_ENUM.WAIT_PICKUP widget.model.type == FIX_ENUM.WAIT_PICKUP
? AkuMaterialButton( ? AkuMaterialButton(
onPressed: () {}, onPressed: () {
final userProvider =
Provider.of<UserProvider>(context, listen: false);
widget.model.detail.fixStatuses.add(FixStatus(
title: '${userProvider.userInfoModel.nickName}已接单',
date: DateTime.now(),
));
widget.model.type = FIX_ENUM.PROCESSING;
Get.back();
},
radius: 4.w, radius: 4.w,
color: AppStyle.primaryColor, color: AppStyle.primaryColor,
minWidth: 160.w, minWidth: 160.w,

@ -0,0 +1,168 @@
import 'package:aku_community_manager/const/resource.dart';
import 'package:aku_community_manager/mock_models/fix/fix_model.dart';
import 'package:aku_community_manager/provider/user_provider.dart';
import 'package:aku_community_manager/style/app_style.dart';
import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:aku_ui/common_widgets/aku_material_button.dart';
import 'package:flutter/material.dart';
import 'package:aku_community_manager/tools/screen_tool.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart';
class FixMoreTimePage extends StatefulWidget {
final FixModel model;
FixMoreTimePage({Key key, @required this.model}) : super(key: key);
@override
_FixMoreTimePageState createState() => _FixMoreTimePageState();
}
class _FixMoreTimePageState extends State<FixMoreTimePage> {
String _nowSelect = '24h';
@override
Widget build(BuildContext context) {
return AkuScaffold(
title: '申请延时',
backgroundColor: Colors.white,
body: ListView(
children: [
Container(
height: 16.w,
color: Color(0xFFF9F9F9),
),
Container(
padding: EdgeInsets.symmetric(
vertical: 24.w,
horizontal: 32.w,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisSize: MainAxisSize.min,
children: [
Text(
'延长时间',
style: TextStyle(
color: AppStyle.primaryTextColor,
fontWeight: FontWeight.bold,
fontSize: 32.sp,
),
),
AkuBox.h(24),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: ['24h', '48h', '72h', '未知'].map((e) {
return GestureDetector(
onTap: () {
setState(() {
_nowSelect = e;
});
},
child: Stack(
children: [
Container(
width: 160.w,
height: 80.w,
alignment: Alignment.center,
child: Text(
e,
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 28.sp,
),
),
decoration: BoxDecoration(
color: Color(0xFFF9F9F9),
borderRadius: BorderRadius.circular(4.w),
border: _nowSelect == e
? Border.all(
width: 3.w,
color: AppStyle.primaryTextColor,
)
: null,
),
),
Positioned(
left: 3.w,
top: 3.w,
child: _nowSelect == e
? Image.asset(
R.ASSETS_MANAGE_CHECK_PNG,
height: 30.w,
width: 30.w,
)
: SizedBox(),
),
],
),
);
}).toList(),
),
AkuBox.h(40),
Text(
'备注',
style: TextStyle(
color: AppStyle.primaryTextColor,
fontWeight: FontWeight.bold,
fontSize: 32.sp,
),
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
border: Border.all(
width: 2.w,
color: Color(0xFFE8E8E8),
),
),
margin: EdgeInsets.only(
top: 24.w,
bottom: 340.w,
),
padding: EdgeInsets.symmetric(
vertical: 16.w,
horizontal: 24.w,
),
child: TextField(
minLines: 7,
maxLines: 7,
decoration: InputDecoration(
contentPadding: EdgeInsets.zero,
border: InputBorder.none,
hintText: '请输入延长时间说明…',
),
),
),
Padding(
padding: EdgeInsets.symmetric(horizontal: 32.w),
child: AkuMaterialButton(
onPressed: () {
final userProvider =
Provider.of<UserProvider>(context, listen: false);
widget.model.detail.fixStatuses.add(
FixStatus(
title: '${userProvider.userInfoModel.nickName}申请延时',
date: DateTime.now()),
);
Get.back();
},
radius: 8.w,
child: Text(
'确定',
style: TextStyle(
color: AppStyle.primaryTextColor,
fontWeight: FontWeight.bold,
fontSize: 32.sp,
),
),
color: AppStyle.primaryColor,
),
),
],
),
),
],
),
);
}
}

@ -0,0 +1,277 @@
import 'dart:io';
import 'package:aku_community_manager/mock_models/fix/fix_model.dart';
import 'package:aku_community_manager/style/app_style.dart';
import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:aku_community_manager/tools/screen_tool.dart';
import 'package:aku_community_manager/ui/widgets/inner/aku_title_box.dart';
import 'package:aku_community_manager/ui/widgets/inner/pick_image.dart';
import 'package:aku_ui/common_widgets/aku_material_button.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
class FixWorkFinishPage extends StatefulWidget {
final FixModel model;
FixWorkFinishPage({Key key, @required this.model}) : super(key: key);
@override
_FixWorkFinishPageState createState() => _FixWorkFinishPageState();
}
class _FixWorkFinishPageState extends State<FixWorkFinishPage> {
List<File> _imgs = [];
TextEditingController _descriptionController = TextEditingController();
TextEditingController _materialController = TextEditingController();
@override
Widget build(BuildContext context) {
return AkuScaffold(
title: '处理完成',
body: ListView(
padding: EdgeInsets.symmetric(
vertical: 16.w,
),
children: [
AkuTitleBox(
title: '报修信息',
spacing: 24,
children: [
Text(
widget.model.title,
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 28.w,
),
),
AkuBox.h(16),
GridView.builder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 4,
crossAxisSpacing: 16.w,
mainAxisSpacing: 16.w,
),
itemBuilder: (context, index) {
final img = widget.model.imgs[index];
return ClipRRect(
borderRadius: BorderRadius.circular(4.w),
child: (img is String) ? Image.asset(img) : Image.file(img),
);
},
itemCount: widget.model.imgs.length,
),
],
),
AkuTitleBox(
title: '处理情况',
spacing: 24.w,
children: [
Text(
'处理描述',
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 28.w,
),
),
AkuBox.h(24),
TextField(
controller: _descriptionController,
minLines: 4,
maxLines: 99,
decoration: InputDecoration(
contentPadding: EdgeInsets.symmetric(
vertical: 16.w,
horizontal: 24.w,
),
hintText: '请输入处理描述…',
hintStyle: TextStyle(
color: AppStyle.minorTextColor,
fontSize: 28.w,
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Color(0xFFE8E8E8),
width: 2.w,
),
),
border: OutlineInputBorder(
borderSide: BorderSide(
color: Color(0xFFE8E8E8),
width: 2.w,
),
),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Color(0xFFE8E8E8),
width: 2.w,
),
),
),
),
AkuBox.h(32),
Text(
'更换材料(含辅料)',
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 28.w,
),
),
AkuBox.h(24),
TextField(
controller: _materialController,
minLines: 3,
maxLines: 99,
decoration: InputDecoration(
contentPadding: EdgeInsets.symmetric(
vertical: 16.w,
horizontal: 24.w,
),
hintText: '请输入材料描述…',
hintStyle: TextStyle(
color: AppStyle.minorTextColor,
fontSize: 28.w,
),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Color(0xFFE8E8E8),
width: 2.w,
),
),
border: OutlineInputBorder(
borderSide: BorderSide(
color: Color(0xFFE8E8E8),
width: 2.w,
),
),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(
color: Color(0xFFE8E8E8),
width: 2.w,
),
),
),
),
AkuBox.h(32),
Text(
'上传维修完成照片',
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 28.w,
),
),
AkuBox.h(24),
GridView.builder(
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 4,
crossAxisSpacing: 16.w,
mainAxisSpacing: 16.w,
),
itemBuilder: (context, index) {
if (index == 0)
return AkuMaterialButton(
radius: 8.w,
onPressed: () {
akuPickImage().then((file) {
setState(() {
if (file != null) _imgs.insert(0, file);
});
});
},
child: Container(
alignment: Alignment.center,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.image,
size: 60.w,
color: AppStyle.minorTextColor,
),
Text(
'上传图片',
style: TextStyle(
color: AppStyle.minorTextColor,
fontSize: 22.sp,
),
),
],
),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8.w),
border: Border.all(
color: AppStyle.minorTextColor,
width: 2.w,
),
),
),
);
else
return Stack(
children: [
Positioned(
top: 0,
left: 0,
right: 0,
bottom: 0,
child: ClipRRect(
borderRadius: BorderRadius.circular(4.w),
child: Image.file(
_imgs[index - 1],
fit: BoxFit.cover,
),
),
),
Positioned(
right: 0,
top: 0,
child: GestureDetector(
onTap: () {
_imgs.removeAt(index - 1);
setState(() {});
},
child: Icon(CupertinoIcons.clear_circled_solid),
),
),
],
);
},
itemCount: _imgs.length + 1,
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
)
],
),
AkuTitleBox(
title: '费用明细',
children: [
],
),
],
),
bottom: AkuMaterialButton(
child: Text(
'立即提交',
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 32.sp,
fontWeight: FontWeight.bold,
),
),
height: 96.w,
color: AppStyle.primaryColor,
onPressed: () {
widget.model.detail.result = FixResult(
detail: _descriptionController.text,
material: _materialController.text,
imgs: _imgs,
);
widget.model.type = FIX_ENUM.DONE;
Get.back();
},
),
);
}
}

@ -0,0 +1,205 @@
import 'package:aku_community_manager/const/resource.dart';
import 'package:aku_community_manager/mock_models/fix/fix_model.dart';
import 'package:aku_community_manager/mock_models/fix/fixer_model.dart';
import 'package:aku_community_manager/provider/fix_provider.dart';
import 'package:aku_community_manager/style/app_style.dart';
import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:aku_community_manager/tools/screen_tool.dart';
import 'package:aku_ui/common_widgets/aku_material_button.dart';
import 'package:expandable/expandable.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:provider/provider.dart';
class FixerDepartmentPage extends StatefulWidget {
final FixModel model;
final bool changeType;
FixerDepartmentPage({Key key, @required this.model, this.changeType = false})
: super(key: key);
@override
_FixerDepartmentPageState createState() => _FixerDepartmentPageState();
}
class _FixerDepartmentPageState extends State<FixerDepartmentPage> {
List<FixerModel> _pickedFixers = [];
@override
Widget build(BuildContext context) {
final fixProvider = Provider.of<FixProvider>(context);
return AkuScaffold(
title: '房屋管理维修部',
body: ListView.builder(
padding: EdgeInsets.symmetric(vertical: 16.w),
itemBuilder: (context, index) {
return _buildItem(fixProvider.fixerModels[index], index);
},
itemCount: fixProvider.fixerModels.length,
),
bottom: AkuMaterialButton(
height: 96.w,
onPressed: _pickedFixers.isEmpty
? null
: () {
if (widget.changeType) {
Get.back();
_pickedFixers.forEach((element) {
widget.model.detail.fixStatuses.add(
FixStatus(
title: '改派给${element.name}', date: DateTime.now()),
);
});
} else {
Get.back();
Get.back();
widget.model.type = FIX_ENUM.WAIT_PICKUP;
_pickedFixers.forEach((element) {
widget.model.detail.fixStatuses.add(
FixStatus(
title: '分配给${element.name}', date: DateTime.now()),
);
});
}
},
color: AppStyle.primaryColor,
nullColor: AppStyle.primaryColor.withOpacity(0.5),
child: Text(
'立即派单',
style: TextStyle(
color: _pickedFixers.isEmpty
? AppStyle.minorTextColor
: AppStyle.primaryTextColor,
fontSize: 32.w,
fontWeight: FontWeight.bold,
),
),
),
);
}
_buildItem(FixerTypedModel model, int index) {
return Container(
decoration: BoxDecoration(
border: Border(
top: index == 0
? BorderSide.none
: BorderSide(color: Color(0xFFE8E8E8), width: 1.w),
bottom: BorderSide(color: Color(0xFFE8E8E8), width: 1.w),
),
),
child: Material(
color: Colors.white,
child: ExpandablePanel(
controller: ExpandableController(initialExpanded: true),
header: Container(
height: 96.w,
alignment: Alignment.centerLeft,
padding: EdgeInsets.symmetric(horizontal: 32.w),
child: Text(
model.typeName,
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 32.sp,
fontWeight: FontWeight.bold,
),
),
),
collapsed: SizedBox(),
expanded: Column(
mainAxisSize: MainAxisSize.min,
children: [
Divider(
color: Color(0xFFE8E8E8),
height: 1.w,
thickness: 1.w,
),
...model.fixers.map((e) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
AkuMaterialButton(
height: 96.w,
onPressed: () {
if (_pickedFixers.indexOf(e) == -1) {
_pickedFixers.add(e);
} else {
_pickedFixers.remove(e);
}
setState(() {});
},
child: Row(
children: [
AkuBox.w(72),
Checkbox(
checkColor: AppStyle.primaryTextColor,
activeColor: AppStyle.primaryColor,
value: _pickedFixers.indexOf(e) != -1,
onChanged: (state) {
if (_pickedFixers.indexOf(e) == -1) {
_pickedFixers.add(e);
} else {
_pickedFixers.remove(e);
}
setState(() {});
},
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
),
Image.asset(
R.ASSETS_MESSAGE_IC_PEOPLE_PNG,
height: 40.w,
width: 40.w,
),
Text(
e.name,
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 28.w,
fontWeight: FontWeight.bold,
),
),
Spacer(),
Image.asset(
R.ASSETS_MESSAGE_IC_PHONE_PNG,
height: 40.w,
width: 40.w,
),
Text(
e.phone,
style: TextStyle(
color: AppStyle.primaryTextColor,
fontSize: 28.w,
fontWeight: FontWeight.bold,
),
),
AkuBox.w(101),
],
),
),
model.fixers.last == e
? SizedBox()
: Divider(
indent: 32.w,
endIndent: 32.w,
height: 1.w,
thickness: 1.w,
color: Color(0xFFE8E8E8),
),
],
);
}).toList()
],
),
theme: ExpandableThemeData(
tapHeaderToExpand: true,
iconPlacement: ExpandablePanelIconPlacement.right,
iconPadding: EdgeInsets.only(top: 32.w, right: 32.w),
iconSize: 32.w,
iconColor: AppStyle.minorTextColor,
),
),
),
);
}
}

@ -0,0 +1,18 @@
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
import 'package:flutter/material.dart';
class DecorationManagerPage extends StatefulWidget {
DecorationManagerPage({Key key}) : super(key: key);
@override
_DecorationManagerPageState createState() => _DecorationManagerPageState();
}
class _DecorationManagerPageState extends State<DecorationManagerPage> {
@override
Widget build(BuildContext context) {
return AkuScaffold(
title: '装修管理',
);
}
}

@ -0,0 +1,49 @@
import 'package:aku_community_manager/style/app_style.dart';
import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:flutter/material.dart';
import 'package:aku_community_manager/tools/screen_tool.dart';
class AkuTitleBox extends StatelessWidget {
final String title;
final Widget suffix;
final double spacing;
final List<Widget> children;
const AkuTitleBox({
Key key,
@required this.title,
this.suffix,
this.spacing = 0,
this.children,
}) : super(key: key);
@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.symmetric(vertical: 24.w, horizontal: 32.w),
color: Colors.white,
margin: EdgeInsets.only(bottom: 16.w),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Text(
title,
style: TextStyle(
color: AppStyle.primaryTextColor,
fontWeight: FontWeight.bold,
fontSize: 36.sp,
),
),
Spacer(),
suffix ?? SizedBox(),
],
),
AkuBox.h(spacing),
...children,
],
),
);
}
}

@ -101,6 +101,13 @@ packages:
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.3.5" version: "0.3.5"
expandable:
dependency: "direct main"
description:
name: expandable
url: "https://pub.flutter-io.cn"
source: hosted
version: "4.1.4"
extended_text: extended_text:
dependency: "direct main" dependency: "direct main"
description: description:

@ -52,6 +52,8 @@ dependencies:
flutter_rating_bar: ^3.0.1+1 flutter_rating_bar: ^3.0.1+1
expandable: ^4.1.4
aku_ui: aku_ui:
git: git:
url: http://test.akuhotel.com:8099/aku_fe/aku_ui.git url: http://test.akuhotel.com:8099/aku_fe/aku_ui.git

Loading…
Cancel
Save