diff --git a/lib/pages/manager_func.dart b/lib/pages/manager_func.dart index 5a6ebc73..390878c7 100644 --- a/lib/pages/manager_func.dart +++ b/lib/pages/manager_func.dart @@ -30,7 +30,7 @@ class ManagerFunc { 'reportDetail': reportDetail, 'fileUrls': fileUrls, }, - showMessage: true, + showMessage: false, ); return baseModel; } diff --git a/lib/pages/things_page/widget/add_fixed_submit_page.dart b/lib/pages/things_page/widget/add_fixed_submit_page.dart index f62af570..5496c338 100644 --- a/lib/pages/things_page/widget/add_fixed_submit_page.dart +++ b/lib/pages/things_page/widget/add_fixed_submit_page.dart @@ -1,16 +1,17 @@ import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/pages/manager_func.dart'; +import 'package:akuCommunity/pages/things_page/widget/finish_fixed_submit_page.dart'; import 'package:akuCommunity/provider/user_provider.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/extensions/widget_list_ext.dart'; +import 'package:akuCommunity/extensions/page_router.dart'; class AddFixedSubmitPage extends StatefulWidget { AddFixedSubmitPage({Key key}) : super(key: key); @@ -94,7 +95,7 @@ class _AddFixedSubmitPageState extends State { }); }, child: title.text - .color(_selectType == value ? ktextPrimary : ktextSubColor) + .color(_selectType == value ? ktextPrimary : Color(0xFF979797)) .size(32.sp) .make(), padding: EdgeInsets.symmetric(horizontal: 34.w, vertical: 14.w), @@ -174,15 +175,18 @@ class _AddFixedSubmitPageState extends State { InkWell( onTap: () {}, child: Container( - alignment: Alignment.center, - width: 218.w, - height: 218.w, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8.w), - border: Border.all(color: Color(0xFF979797), width: 1.w), - ), - child: '+'.text.black.size(100).bold.make(), - ), + alignment: Alignment.center, + width: 218.w, + height: 218.w, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8.w), + border: Border.all(color: Color(0xFF979797), width: 1.w), + ), + child: Icon( + CupertinoIcons.plus, + size: 80.w, + color:Color(0xFFD8D8D8) , + )), ), ], ), @@ -216,7 +220,7 @@ class _AddFixedSubmitPageState extends State { onPressed: () { ManagerFunc.reportRepairInsert( _selectType + 1, _textEditingController.text, []); - Get.back(); + FinishFixedSubmitPage().to(); }, child: '确认提交'.text.black.bold.size(32.sp).make(), color: kPrimaryColor, diff --git a/lib/pages/things_page/widget/finish_fixed_submit_page.dart b/lib/pages/things_page/widget/finish_fixed_submit_page.dart new file mode 100644 index 00000000..e34cb7be --- /dev/null +++ b/lib/pages/things_page/widget/finish_fixed_submit_page.dart @@ -0,0 +1,49 @@ +import 'package:akuCommunity/base/base_style.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:velocity_x/velocity_x.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; + +class FinishFixedSubmitPage extends StatelessWidget { + const FinishFixedSubmitPage({Key key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return BeeScaffold( + title: '报事报修', + body: Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + 76.w.heightBox, + SizedBox( + width: 128.w, + height: 128.w, + child: Container( + width: 110.w, + height: 110.w, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(110.w), + color: kPrimaryColor), + child: Icon( + CupertinoIcons.check_mark, + color: Colors.white, + size: 70.w, + ), + )), + 48.w.heightBox, + '提交成功'.text.black.size(36.sp).make(), + 16.w.heightBox, + '您的报修已受理,预计36小时内完成' + .text + .size(26.sp) + .color(ktextSubColor) + .maxLines(2) + .make(), + ], + ), + ), + ); + } +}