diff --git a/marking_app/lib/components/ReturnToHomepage.dart b/marking_app/lib/components/ReturnToHomepage.dart index 1d0bc08..98003d8 100644 --- a/marking_app/lib/components/ReturnToHomepage.dart +++ b/marking_app/lib/components/ReturnToHomepage.dart @@ -5,7 +5,8 @@ import 'package:marking_app/utils/anti_shake_throttling.dart'; // 返回首页 class ReturnToHomepage extends StatelessWidget { - const ReturnToHomepage({super.key}); + final Color? bgColor; + const ReturnToHomepage({super.key,this.bgColor = const Color.fromRGBO(135, 135, 135, 1)}); @override Widget build(BuildContext context) { @@ -16,7 +17,7 @@ class ReturnToHomepage extends StatelessWidget { child: Container( padding: EdgeInsets.only(right: 4.5.w), alignment: Alignment.center, - child: Icon(Icons.home_rounded, size: 22.sp, color: Color.fromRGBO(135, 135, 135, 1)), + child: Icon(Icons.home_rounded, size: 22.sp, color: bgColor), ), ); } diff --git a/marking_app/lib/pages/homework_correction/job_personal_detail.dart b/marking_app/lib/pages/homework_correction/job_personal_detail.dart index 18cdbf1..99b67c7 100644 --- a/marking_app/lib/pages/homework_correction/job_personal_detail.dart +++ b/marking_app/lib/pages/homework_correction/job_personal_detail.dart @@ -7,6 +7,7 @@ import 'package:functional_widget_annotation/functional_widget_annotation.dart'; import 'package:marking_app/common/mixin/common.dart'; import 'package:marking_app/common/model/common/base_structure_result.dart'; import 'package:marking_app/common/model/job/job_student_history.dart'; +import 'package:marking_app/components/ReturnToHomepage.dart'; import 'package:marking_app/pages/homework_correction/widget/personal_detail_topbar.dart'; import 'package:marking_app/routes/RouterManager.dart'; import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart'; @@ -112,12 +113,7 @@ class _JobPersonalDetailState extends State with CommonMixin, onPressed: () => Navigator.of(context).pop(), ), actions: [ - InkWell( - onTap: (){ - CommonUtils.JumpPage('job', 2); - }, - child: homeIcon(), - ) + ReturnToHomepage(), ], elevation: 0, ), diff --git a/marking_app/lib/pages/homework_correction/job_priority_review_set.dart b/marking_app/lib/pages/homework_correction/job_priority_review_set.dart index 90e8c70..b42de7d 100644 --- a/marking_app/lib/pages/homework_correction/job_priority_review_set.dart +++ b/marking_app/lib/pages/homework_correction/job_priority_review_set.dart @@ -7,6 +7,7 @@ import 'package:marking_app/common/model/common/base_structure_result.dart'; import 'package:marking_app/common/model/job/job_level_set_params.dart'; import 'package:marking_app/common/model/job/job_review_submission.dart'; import 'package:marking_app/common/model/job/job_student_level.dart'; +import 'package:marking_app/components/ReturnToHomepage.dart'; import 'package:marking_app/routes/RouterManager.dart'; import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart'; import 'package:marking_app/utils/index.dart'; @@ -86,6 +87,9 @@ class _JobPriorityReviewSetState extends State icon: Icon(Icons.arrow_back_ios, color: Colors.black), onPressed: () => Navigator.of(context).pop(), ), + actions: [ + ReturnToHomepage(), + ], ), body: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/marking_app/lib/pages/homework_correction/job_report.dart b/marking_app/lib/pages/homework_correction/job_report.dart index 4c8b150..810008f 100644 --- a/marking_app/lib/pages/homework_correction/job_report.dart +++ b/marking_app/lib/pages/homework_correction/job_report.dart @@ -8,6 +8,7 @@ import 'package:marking_app/common/model/common/base_structure_result.dart'; import 'package:marking_app/common/model/job/job_report_join_class.dart'; import 'package:marking_app/common/model/job/job_report_knowledge_model.dart'; import 'package:marking_app/common/model/job/job_report_model.dart'; +import 'package:marking_app/components/ReturnToHomepage.dart'; import 'package:marking_app/pages/homework_correction/widget/report_table.dart'; import 'package:marking_app/pages/homework_correction/widget/top_count.dart'; import 'package:marking_app/pages/mainPage.dart'; @@ -255,12 +256,7 @@ class _JobReportState extends State with CommonMixin { onPressed: () => Navigator.of(context).pop(), ), actions: [ - InkWell( - onTap: (){ - CommonUtils.JumpPage('job', 2); - }, - child: homeIcon(), - ) + ReturnToHomepage(), ], /*actions: [ // 下拉框 diff --git a/marking_app/lib/pages/homework_correction/job_student_group.dart b/marking_app/lib/pages/homework_correction/job_student_group.dart index 53a16c5..dcb5294 100644 --- a/marking_app/lib/pages/homework_correction/job_student_group.dart +++ b/marking_app/lib/pages/homework_correction/job_student_group.dart @@ -7,6 +7,7 @@ import 'package:marking_app/common/mixin/common.dart'; import 'package:marking_app/common/model/common/base_structure_result.dart'; import 'package:marking_app/common/model/job/job_student_goups.dart'; import 'package:marking_app/common/model/user/user_info.dart'; +import 'package:marking_app/components/ReturnToHomepage.dart'; import 'package:marking_app/routes/RouterManager.dart'; import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart'; import 'package:marking_app/utils/fast_data.dart'; @@ -78,6 +79,9 @@ class _JobStudentGroupState extends State with CommonMixin { icon: Icon(Icons.arrow_back_ios, color: Colors.black), onPressed: () => Navigator.of(context).pop(), ), + actions: [ + ReturnToHomepage(), + ], ), body: Padding( padding: EdgeInsets.only(top: 15.r, left: 14.r, right: 14.r), diff --git a/marking_app/lib/pages/homework_correction/pages/job_favorite.dart b/marking_app/lib/pages/homework_correction/pages/job_favorite.dart index 1de3fc4..a29cbb7 100644 --- a/marking_app/lib/pages/homework_correction/pages/job_favorite.dart +++ b/marking_app/lib/pages/homework_correction/pages/job_favorite.dart @@ -8,6 +8,7 @@ import 'package:marking_app/common/model/common/base_structure_result.dart'; import 'package:marking_app/common/model/job/job_fav_student.dart'; import 'package:marking_app/common/model/job/job_favorite_item_model.dart'; import 'package:marking_app/common/model/job/job_report_join_class.dart'; +import 'package:marking_app/components/ReturnToHomepage.dart'; import 'package:marking_app/pages/homework_correction/pages/favorite_student_dialog.dart'; import 'package:marking_app/utils/easy_refresh/MyEmptyWidget.dart'; import 'package:marking_app/utils/index.dart'; @@ -199,6 +200,9 @@ class _JobFavoriteState extends State with CommonMixin { title: quickText('收藏夹'), centerTitle: true, backgroundColor: Colors.white, + actions: [ + ReturnToHomepage(), + ], ), body: MyFutureBuilder.buildFutureBuilderOfSingleInstance>( context, diff --git a/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart b/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart index 08d7530..45f22cb 100644 --- a/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart +++ b/marking_app/lib/pages/homework_correction/pages/job_list_participate_in_class.dart @@ -9,6 +9,7 @@ import 'package:marking_app/common/model/job/job_concerned_with_student.dart'; import 'package:marking_app/common/model/job/job_concerned_with_student_params.dart'; import 'package:marking_app/common/model/job/job_favorite_model.dart'; import 'package:marking_app/common/model/job/job_task_item.dart'; +import 'package:marking_app/components/ReturnToHomepage.dart'; import 'package:marking_app/routes/RouterManager.dart'; import 'package:marking_app/utils/index.dart'; import 'package:marking_app/utils/my_text.dart'; @@ -408,6 +409,9 @@ class _JobListParticipateInClassState extends State w alignment: Alignment.center, ), backgroundColor: Colors.white, + actions: [ + ReturnToHomepage(), + ], ), body: RefreshIndicator( onRefresh: () async { diff --git a/marking_app/lib/pages/homework_correction/quick_check_personal.dart b/marking_app/lib/pages/homework_correction/quick_check_personal.dart index f53fe44..329e951 100644 --- a/marking_app/lib/pages/homework_correction/quick_check_personal.dart +++ b/marking_app/lib/pages/homework_correction/quick_check_personal.dart @@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:marking_app/common/mixin/common.dart'; import 'package:marking_app/common/model/common/base_structure_result.dart'; import 'package:marking_app/common/model/job/job_data_report.dart'; +import 'package:marking_app/components/ReturnToHomepage.dart'; import 'package:marking_app/pages/homework_correction/widget/student_kg_table.dart'; import 'package:marking_app/pages/homework_correction/widget/student_zg_table.dart'; import 'package:marking_app/routes/RouterManager.dart'; @@ -72,15 +73,7 @@ class _QuickCheckPersonalState extends State onPressed: () => Navigator.of(context).pop(), ), actions: [ - InkWell( - onTap: (){ - CommonUtils.JumpPage('job', 2); - }, - child: Padding( - padding: EdgeInsets.only(top:5.r,right: 8.r), - child: Image.asset('assets/images/home_icon_black.png',width: 18.r,height: 18.r,), - ), - ), + ReturnToHomepage(), /* Title( color: Color(0xFF6888FD), child: Container( diff --git a/marking_app/lib/pages/homework_correction/quick_data_check.dart b/marking_app/lib/pages/homework_correction/quick_data_check.dart index 5cf1b9e..cdd9a52 100644 --- a/marking_app/lib/pages/homework_correction/quick_data_check.dart +++ b/marking_app/lib/pages/homework_correction/quick_data_check.dart @@ -7,6 +7,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:marking_app/common/mixin/common.dart'; import 'package:marking_app/common/model/common/base_structure_result.dart'; import 'package:marking_app/common/model/job/job_data_report.dart'; +import 'package:marking_app/components/ReturnToHomepage.dart'; import 'package:marking_app/pages/homework_correction/widget/quick_data_check_bottom.dart'; import 'package:marking_app/pages/homework_correction/widget/quick_student_data_table.dart'; import 'package:marking_app/pages/homework_correction/widget/report_table.dart'; @@ -150,12 +151,7 @@ class _QuickDataCheckPageState extends State style: TextStyle(fontSize: 14.sp, color: Colors.white), )), )), - InkWell( - onTap: (){ - CommonUtils.JumpPage('job', 2); - }, - child: homeIcon(color: 'white'), - ), + ReturnToHomepage(bgColor: Colors.white,), ], ), SizedBox(height: 10.r), diff --git a/marking_app/lib/utils/common_utils.dart b/marking_app/lib/utils/common_utils.dart index e795daa..e7bb2a8 100644 --- a/marking_app/lib/utils/common_utils.dart +++ b/marking_app/lib/utils/common_utils.dart @@ -18,6 +18,4 @@ class CommonUtils { // 这里其实就是 digest.toString() return hex.encode(digest.bytes); } - - static JumpPage(name,index) {} }