diff --git a/assets/manage/submit_success.png b/assets/manage/submit_success.png new file mode 100644 index 0000000..9b52831 Binary files /dev/null and b/assets/manage/submit_success.png differ diff --git a/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart b/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart index 352382b..f3df6cf 100644 --- a/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart +++ b/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart @@ -227,7 +227,7 @@ class _BusinessAndFixDetailPageState extends State { color: AppStyle.primaryColor, onPressed: () { Get.to(FixWorkFinishPage( - reportDetail: widget.model.reportDetail, + fixModel :widget.model, model: _detailModel, dispatchType: _detailModel.dispatchType.dispatchType == 1)); diff --git a/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart b/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart new file mode 100644 index 0000000..e5239e0 --- /dev/null +++ b/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart @@ -0,0 +1,29 @@ +import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/business_fix_card.dart'; +import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart'; +import 'package:flutter/material.dart'; +import 'package:aku_community_manager/const/resource.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:velocity_x/velocity_x.dart'; +class FixSubmitFinishPage extends StatelessWidget { + final BussinessAndFixModel model; + const FixSubmitFinishPage({Key key, this.model}) : super(key: key); + + @override + Widget build(BuildContext context) { + return AkuScaffold( + title: '处理完成', + body:Container( + width:double.infinity, + child: Column( + children: [ + Image.asset(R.ASSETS_MANAGE_SUBMIT_SUCCESS_PNG,width:587.w,height:350.w), + '您已处理完成该报修'.text.black.size(40.sp).bold.make(), + 120.w.heightBox, + BusinessFixCard(model: this.model), + ], + ), + ), + ); + } +} \ No newline at end of file diff --git a/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart b/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart index 7f4385d..218b13d 100644 --- a/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart @@ -4,6 +4,7 @@ import 'dart:io'; // Flutter imports: import 'package:aku_community_manager/models/manager/bussiness_and_fix/bussiness_and_fix_model.dart'; import 'package:aku_community_manager/models/manager/bussiness_and_fix/fixed_detail_model.dart'; +import 'package:aku_community_manager/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart'; import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/manage_func.dart'; import 'package:bot_toast/bot_toast.dart'; @@ -22,16 +23,17 @@ 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/pick_image.dart'; import 'package:get/get.dart'; +import 'package:aku_community_manager/tools/extensions/router_extension_tool.dart'; class FixWorkFinishPage extends StatefulWidget { final FixedDetailModel model; - final String reportDetail; + final BussinessAndFixModel fixModel; final bool dispatchType; FixWorkFinishPage( {Key key, @required this.model, @required this.dispatchType, - @required this.reportDetail}) + @required this.fixModel}) : super(key: key); @override @@ -71,7 +73,7 @@ class _FixWorkFinishPageState extends State { spacing: 24, children: [ Text( - widget.reportDetail, + widget.fixModel.reportDetail, style: TextStyle( color: AppStyle.primaryTextColor, fontSize: 28.w, @@ -395,7 +397,9 @@ class _FixWorkFinishPageState extends State { humanPrice + materialPrice, 1, []); if (baseModel.status) { - Get.back(); //TODO 处理完成 + FixSubmitFinishPage( + model:widget.fixModel, + ).to(); } else { BotToast.showText(text: baseModel.message); }