diff --git a/making_school_asignment_app/assets/images/register_bg.png b/making_school_asignment_app/assets/images/register_bg.png new file mode 100644 index 0000000..b71c74a Binary files /dev/null and b/making_school_asignment_app/assets/images/register_bg.png differ diff --git a/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_result.dart b/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_result.dart index ed45bd8..b01a3b8 100644 --- a/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_result.dart +++ b/making_school_asignment_app/lib/common/job/marking_models/do_paper_details_result.dart @@ -189,7 +189,7 @@ class StudentQuestions extends Object { int correctRate; @JsonKey(name: 'height') - double height; + double? height; @JsonKey(name: 'useTime') int? useTime; diff --git a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart index cddba44..f241f2b 100644 --- a/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart +++ b/making_school_asignment_app/lib/page/home_page/children/homework_review/components/question_paper_view.dart @@ -363,7 +363,7 @@ Widget $scoringQuestionsView( ? EdgeInsets.only(top: 6.4.h) : EdgeInsets.symmetric(vertical: 2.h); return Container( - height: item.height * scaleRatio, + height: item.height! * scaleRatio, padding: EdgeInsets.zero, child: item.useTime == 0?Container():Stack( alignment: const FractionalOffset(0, 0), diff --git a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart index e791d77..d720c2a 100644 --- a/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart +++ b/making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart @@ -375,7 +375,7 @@ Widget $reviewedItem({ ], ), child: Row(children: [ - if (!jobTaskItem.isFixed!) + /*if (!jobTaskItem.isFixed!) Expanded( flex: 1, child: GestureDetector( @@ -394,7 +394,7 @@ Widget $reviewedItem({ child: quickText('收集订正', color: const Color(0xFF8C68FF), size: 11.sp), ), ), - ), + ),*/ Expanded( flex: 1, child: GestureDetector( diff --git a/making_school_asignment_app/lib/page/login_page/children/register.dart b/making_school_asignment_app/lib/page/login_page/children/register.dart index f88454b..d2fe094 100644 --- a/making_school_asignment_app/lib/page/login_page/children/register.dart +++ b/making_school_asignment_app/lib/page/login_page/children/register.dart @@ -109,7 +109,7 @@ class _RegisterState extends State with RequestToolMixin { alignment: Alignment.center, decoration: const BoxDecoration( image: DecorationImage( - image: AssetImage('assets/images/login_bg.png'), + image: AssetImage('assets/images/register_bg.png'), fit: BoxFit.fill, // 完全填充 ), ), @@ -254,7 +254,17 @@ class _RegisterState extends State with RequestToolMixin { child: quickText( '《用户协议》', size: 12.sp, - color: Colors.deepOrangeAccent, + color: Theme.of(context).primaryColor, + ), + ), + InkWell( + onTap: () { + Get.toNamed(Routes.agreementPage, arguments: {"type": AGREEMENT_KEY.PRIVACY_GREEMENT.name}); + }, + child: quickText( + '《隐私协议》', + size: 12.sp, + color:Theme.of(context).primaryColor, ), ), ], diff --git a/making_school_asignment_app/lib/page/login_page/login_view.dart b/making_school_asignment_app/lib/page/login_page/login_view.dart index e921349..7cbe15b 100644 --- a/making_school_asignment_app/lib/page/login_page/login_view.dart +++ b/making_school_asignment_app/lib/page/login_page/login_view.dart @@ -365,6 +365,16 @@ class _LoginPageState extends State { style: TextStyle(fontSize: 12.r, color: Theme.of(context).primaryColor), ), ), + InkWell( + onTap: () { + Get.toNamed(Routes.agreementPage, arguments: {"type": AGREEMENT_KEY.PRIVACY_GREEMENT.name}); + }, + child: quickText( + '《隐私协议》', + size: 12.sp, + color:Theme.of(context).primaryColor, + ), + ), ], ), ]),