mcy_new #1

Merged
wangyang merged 179 commits from mcy_new into master 2025-08-28 10:10:45 +08:00
6 changed files with 26 additions and 6 deletions
Showing only changes of commit 33d5481773 - Show all commits

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 KiB

View File

@ -189,7 +189,7 @@ class StudentQuestions extends Object {
int correctRate;
@JsonKey(name: 'height')
double height;
double? height;
@JsonKey(name: 'useTime')
int? useTime;

View File

@ -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),

View File

@ -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(

View File

@ -109,7 +109,7 @@ class _RegisterState extends State<Register> 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<Register> 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,
),
),
],

View File

@ -365,6 +365,16 @@ class _LoginPageState extends State<LoginPage> {
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,
),
),
],
),
]),