marking
/
Making.School.Asignment.app
19
1
Fork 0
Code Pull Requests Actions Releases Activity

样式修改

This commit is contained in:
machuanyu 2024-06-24 17:37:55 +08:00
parent d3509a2eee
commit 091f82581e
14 changed files with 173 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
making_school_asignment_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB

BIN
making_school_asignment_app/assets/images/login_account.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 544 B

After

Width:  |  Height:  |  Size: 483 B

BIN
making_school_asignment_app/assets/images/login_pwd.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 432 B

2
making_school_asignment_app/lib/page/home_page/children/annotate_class/annotate_class_view.dart
View File

@ -92,7 +92,7 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
return AnnotateItem( return AnnotateItem(
homeworkId: homeworkId, homeworkId: homeworkId,
item: item, item: item,
font: 8.sp, font: 11.sp,
name: state.name.value, name: state.name.value,
logic: logic, logic: logic,
); );

2
making_school_asignment_app/lib/page/home_page/children/fav_student/fav_student_view.dart
View File

@ -161,7 +161,7 @@ class _FavStudentPageState extends State<FavStudentPage> {
.width, .width,
height: 1.r, height: 1.r,
decoration: const BoxDecoration( decoration: const BoxDecoration(
color: Color(0xFFCCCCCC), color: Color(0xFFEEEEEE),
), ),
), ),
Obx((){ Obx((){

57
making_school_asignment_app/lib/page/home_page/children/my_info.dart
View File

@ -59,11 +59,11 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
final personalInfoTitleStly = TextStyle( final personalInfoTitleStly = TextStyle(
color: const Color.fromRGBO(80, 87, 103, 1), color: const Color.fromRGBO(80, 87, 103, 1),
fontSize: 16.sp, fontSize: 13.sp,
); );
final personalInfoValStly = TextStyle( final personalInfoValStly = TextStyle(
color: const Color.fromRGBO(148, 163, 182, 1), color: const Color.fromRGBO(148, 163, 182, 1),
fontSize: 16.sp, fontSize: 13.sp,
); );
return AnnotatedRegion( return AnnotatedRegion(
@ -80,7 +80,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
child: Column( child: Column(
children: [ children: [
Container( Container(
height: 240.h, height: 220.h,
width: double.infinity, width: double.infinity,
decoration: const BoxDecoration( decoration: const BoxDecoration(
image: DecorationImage( image: DecorationImage(
@ -105,45 +105,14 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
alignment: const FractionalOffset(0.04, 0.1), alignment: const FractionalOffset(0.04, 0.1),
children: [ children: [
Container( Container(
height: 200.h, height: 180.h,
alignment: Alignment.center, alignment: Alignment.center,
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
ClipRRect( SizedBox(height: 10.r,),
borderRadius: BorderRadius.circular(80.w), Image.asset('assets/images/default_user_dead.png',),
child: Container( SizedBox(height: 10.r,),
width: 80.w,
height: 80.w,
padding: EdgeInsets.all(4.w),
decoration: BoxDecoration(
border: Border.all(
width: 1.w,
color: Colors.white,
),
borderRadius: BorderRadius.all(
Radius.circular(40.w),
),
boxShadow: [
BoxShadow(
color: const Color.fromRGBO(46, 91, 255, 0.2),
offset: Offset(4.w, 6.h), //阴影y轴偏移量
blurRadius: 8, //阴影模糊程度
spreadRadius: 0.2, //阴影扩散程度
)
],
),
child: Image.asset('assets/images/default_user_dead.png')
/* CachedNetworkImage(
fit: BoxFit.cover,
imageUrl:'',
placeholder: (context, url) => Image.asset('assets/images/default_user_dead.png'),
errorWidget: (context, url, error) =>
Image.asset('assets/images/default_user_dead.png'),
),*/
),
),
InkWell( InkWell(
onTap: () { onTap: () {
/*if (tokenState == '' || userState.id == '') { /*if (tokenState == '' || userState.id == '') {
@ -151,10 +120,10 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
}*/ }*/
}, },
child: Container( child: Container(
margin: EdgeInsets.only(top: 16.h), margin: EdgeInsets.only(top: 0.h),
child: Text( child: Text(
userInfo.value?.name ?? '请前往登录', userInfo.value?.name ?? '请前往登录',
style: TextStyle(fontSize: 16.sp, color: Colors.white), style: TextStyle(fontSize: 13.sp, color: Colors.white),
), ),
), ),
), ),
@ -171,7 +140,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
Container( Container(
margin: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w), margin: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
padding: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w), padding: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
height: 240.h, height: 180.h,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6.w)), borderRadius: BorderRadius.all(Radius.circular(6.w)),
color: Colors.white, color: Colors.white,
@ -245,7 +214,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
Icon( Icon(
Icons.arrow_forward_ios, Icons.arrow_forward_ios,
color: const Color.fromRGBO(80, 87, 103, 1), color: const Color.fromRGBO(80, 87, 103, 1),
size: 16.sp, size: 13.sp,
) )
], ],
), ),
@ -285,7 +254,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
children: [ children: [
Icon( Icon(
Icons.exit_to_app_outlined, Icons.exit_to_app_outlined,
size: 16.sp, size: 13.sp,
color: const Color.fromRGBO(148, 163, 182, 1), color: const Color.fromRGBO(148, 163, 182, 1),
), ),
Container( Container(
@ -293,7 +262,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
), ),
Text( Text(
'退出登录', '退出登录',
style: TextStyle(color: const Color.fromRGBO(148, 163, 182, 1), fontSize: 16.sp), style: TextStyle(color: const Color.fromRGBO(148, 163, 182, 1), fontSize: 13.sp),
), ),
], ],
), ),

25
making_school_asignment_app/lib/page/home_page/children/read_over/widget/annotate_list.dart
View File

@ -290,6 +290,7 @@ Widget $reviewedItem({
padding: padEdg, padding: padEdg,
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(
width: 32.w, width: 32.w,
@ -310,23 +311,19 @@ Widget $reviewedItem({
), ),
Expanded( Expanded(
child: quickText(jobTaskItem.name, size: 14.sp, color: const Color.fromRGBO(70, 70, 70, 1), maxLines: 2), child: quickText(jobTaskItem.name, size: 14.sp, color: const Color.fromRGBO(70, 70, 70, 1), maxLines: 2),
) ),
if (jobTaskItem.isFixed!)
Padding(
padding: EdgeInsets.only(top: 3.r),
child: Text(
'已订正',
style: TextStyle(fontSize: 10.sp, color: const Color(0xFFF16262)),
),
),
], ],
), ),
), ),
if (jobTaskItem.isFixed!)
Padding(
padding: padEdg,
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Text(
'已订正',
style: TextStyle(fontSize: 10.sp, color: const Color(0xFFF16262)),
),
],
),
),
Padding( Padding(
padding: padEdg, padding: padEdg,
child: Row( child: Row(

210
making_school_asignment_app/lib/page/home_page/children/read_over/widget/task_list_item.dart
View File

@ -164,121 +164,125 @@ class _TaskListItemState extends State<TaskListItem> {
alignment: const FractionalOffset(0.95, 0), alignment: const FractionalOffset(0.95, 0),
children: [ children: [
Container( Container(
margin: EdgeInsets.only(bottom: 16.h), color: Colors.transparent,
padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 10.w), padding: EdgeInsets.only(top: 40.r),
width: Get.width, child: Container(
decoration: BoxDecoration( margin: EdgeInsets.only(bottom: 16.h),
borderRadius: BorderRadius.circular(6.r), padding: EdgeInsets.symmetric(vertical: 16.h,horizontal: 10.w),
color: const Color.fromRGBO(255, 255, 255, 1), width: Get.width,
boxShadow: const [ decoration: BoxDecoration(
BoxShadow( borderRadius: BorderRadius.circular(6.r),
color: Color.fromRGBO(210, 216, 241, 1), color: const Color.fromRGBO(255, 255, 255, 1),
offset: Offset.zero, //阴影y轴偏移量 boxShadow: const [
blurRadius: 5.8, //阴影模糊程度 BoxShadow(
spreadRadius: 0, //阴影扩散程度 color: Color.fromRGBO(210, 216, 241, 1),
) offset: Offset.zero, //阴影y轴偏移量
], blurRadius: 5.8, //阴影模糊程度
), spreadRadius: 0, //阴影扩散程度
child: Row( )
children: [ ],
Expanded( ),
child: Column( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
crossAxisAlignment: CrossAxisAlignment.start, Expanded(
children: [ child: Column(
SizedBox(height: 30.h), mainAxisAlignment: MainAxisAlignment.spaceBetween,
Row( crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, children: [
children: [ SizedBox(height: 10.h),
Container( Row(
width: Utils.isPad() ? 32.w : 38.w, crossAxisAlignment: CrossAxisAlignment.start,
height: 18.h, children: [
alignment: Alignment.center, Container(
padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w), width: Utils.isPad() ? 32.w : 38.w,
height: 18.h,
alignment: Alignment.center,
padding: EdgeInsets.only(left: Utils.isPad() ? 2.w : 3.w),
decoration: BoxDecoration(
color: widget.type == 1 ? const Color.fromRGBO(104, 136, 253, 1) : const Color.fromRGBO(255, 175, 56, 1),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(14.r),
topRight: Radius.circular(3.r),
bottomLeft: Radius.circular(4.r),
bottomRight: Radius.circular(4.r),
),
),
margin: EdgeInsets.only(right: 4.w),
child: quickText(widget.type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp),
),
Expanded(
child: quickText(
widget.jobTaskItem.name,
maxLines: 2,
size: Utils.isPad() ? 14.sp : 16.sp,
color: const Color.fromRGBO(70, 70, 70, 1),
fontWeight: FontWeight.bold,
),
)
],
),
SizedBox(height: 10.h),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
quickText(
EnumUtils.formatSubject(widget.jobTaskItem.subject),
color: const Color.fromRGBO(97, 97, 97, 1),
size: 12.sp,
),
quickText(' / ', color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp, fontWeight: FontWeight.w500),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
quickText('题量：', color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp),
quickText(
'${widget.jobTaskItem.questionCount! - widget.jobTaskItem.annotateCount!}',
color: const Color.fromRGBO(97, 97, 97, 1),
size: 13.sp,
),
],
),
quickText(' / ', color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp, fontWeight: FontWeight.w500),
quickText(DateTime.parse(widget.jobTaskItem.publishTime).toString().substring(0, 10),
color: const Color.fromRGBO(97, 97, 97, 1), size: 12.sp),
],
),
SizedBox(height: 10.h),
InkWell(
onTap: () {
if (!widget.jobTaskItem.isFixed!) {
EasyLoading.show(status: 'loading...');
widget.collectFun(widget.jobTaskItem);
}
},
child: Container(
padding: EdgeInsets.symmetric(vertical: 4.r, horizontal: 20.r),
decoration: BoxDecoration( decoration: BoxDecoration(
color: widget.type == 1 ? const Color.fromRGBO(104, 136, 253, 1) : const Color.fromRGBO(255, 175, 56, 1), color: widget.jobTaskItem.isFixed! ? Color(0xFFF4F4F4) : Color(0xFFF2FFFA),
borderRadius: BorderRadius.only( border: Border.all(width: 1.r, color: widget.jobTaskItem.isFixed! ? Colors.transparent : Color(0xFF4CC793)),
topLeft: Radius.circular(14.r), borderRadius: BorderRadius.all(Radius.circular(20.r)),
topRight: Radius.circular(3.r),
bottomLeft: Radius.circular(4.r),
bottomRight: Radius.circular(4.r),
),
), ),
margin: EdgeInsets.only(right: 4.w), child: Text(
child: quickText(widget.type == 1 ? '作业' : '考试', color: Colors.white, size: 10.sp), widget.jobTaskItem.isFixed! ? '已订正' : '收集订正',
), style: TextStyle(fontSize: 10.sp, color: const Color(0xFF4CC793)),
Expanded(
child: quickText(
widget.jobTaskItem.name,
maxLines: 2,
size: Utils.isPad() ? 14.sp : 16.sp,
color: const Color.fromRGBO(70, 70, 70, 1),
fontWeight: FontWeight.bold,
), ),
)
],
),
SizedBox(height: 10.h),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
quickText(
EnumUtils.formatSubject(widget.jobTaskItem.subject),
color: const Color.fromRGBO(97, 97, 97, 1),
size: 12.sp,
),
quickText(' / ', color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp, fontWeight: FontWeight.w500),
Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
quickText('题量：', color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp),
quickText(
'${widget.jobTaskItem.questionCount! - widget.jobTaskItem.annotateCount!}',
color: const Color.fromRGBO(97, 97, 97, 1),
size: 13.sp,
),
],
),
quickText(' / ', color: const Color.fromRGBO(130, 130, 130, 1), size: 11.sp, fontWeight: FontWeight.w500),
quickText(DateTime.parse(widget.jobTaskItem.publishTime).toString().substring(0, 10),
color: const Color.fromRGBO(97, 97, 97, 1), size: 12.sp),
],
),
SizedBox(height: 10.h),
InkWell(
onTap: () {
if (!widget.jobTaskItem.isFixed!) {
EasyLoading.show(status: 'loading...');
widget.collectFun(widget.jobTaskItem);
}
},
child: Container(
padding: EdgeInsets.symmetric(vertical: 4.r, horizontal: 20.r),
decoration: BoxDecoration(
color: widget.jobTaskItem.isFixed! ? Color(0xFFF4F4F4) : Color(0xFFF2FFFA),
border: Border.all(width: 1.r, color: widget.jobTaskItem.isFixed! ? Colors.transparent : Color(0xFF4CC793)),
borderRadius: BorderRadius.all(Radius.circular(20.r)),
),
child: Text(
widget.jobTaskItem.isFixed! ? '已订正' : '收集订正',
style: TextStyle(fontSize: 10.sp, color: const Color(0xFF4CC793)),
), ),
), ),
), // FavoriteButton(jobTaskItem.id, jobTaskItem.title),
// FavoriteButton(jobTaskItem.id, jobTaskItem.title), ],
], ),
), ),
), SizedBox(width: 130.r,),
SizedBox(width: 100.r,), ],
], ),
), ),
), ),
Container( Container(
padding: EdgeInsets.all(9.r), padding: EdgeInsets.all(9.r),
decoration: const BoxDecoration(shape: BoxShape.circle, color: Colors.white), decoration: const BoxDecoration(shape: BoxShape.circle, color: Colors.white),
child: CircularPercentIndicator( child: CircularPercentIndicator(
radius: 40.r, radius: 50.r,
lineWidth: 10.r, lineWidth: 18.r,
animation: true, animation: true,
percent: widget.jobTaskItem.annotateRate == null ? 0 : widget.jobTaskItem.annotateRate! / 100, percent: widget.jobTaskItem.annotateRate == null ? 0 : widget.jobTaskItem.annotateRate! / 100,
center: Text.rich(TextSpan(children: [ center: Text.rich(TextSpan(children: [

16
making_school_asignment_app/lib/page/home_page/home_view.dart
View File

@ -34,7 +34,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
super.build(context); super.build(context);
var spaceWidth = SizedBox(height: ScreenUtil().screenWidth / 19); var spaceWidth = SizedBox(height: ScreenUtil().screenWidth / 30);
return SafeArea( return SafeArea(
child: AnnotatedRegion( child: AnnotatedRegion(
value: const SystemUiOverlayStyle( value: const SystemUiOverlayStyle(
@ -63,6 +63,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
}, },
child: Column( child: Column(
children: [ children: [
SizedBox(height: 15.r,),
/* Container( /* Container(
height: 200.h, height: 200.h,
width: double.infinity, width: double.infinity,
@ -105,7 +106,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
navigationUrl: '') navigationUrl: '')
], ],
0),*/ 0),*/
SizedBox(height: 16.h), SizedBox(height: 15.h),
Obx(() { Obx(() {
return Container( return Container(
padding: EdgeInsets.symmetric(horizontal: 12.w), padding: EdgeInsets.symmetric(horizontal: 12.w),
@ -122,12 +123,12 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
}); });
}, },
child: Container( child: Container(
margin: EdgeInsets.only(bottom: 16.h), margin: EdgeInsets.only(bottom: 15.h),
child: Column( child: Column(
children: [ children: [
SizedBox(height: 4.h), SizedBox(height: 4.h),
Container( Container(
padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 10.w), padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 10.w),
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(6.r), borderRadius: BorderRadius.circular(6.r),
@ -272,16 +273,17 @@ Widget $termRow(BuildContext context, List<EntranceModel> items, int? data) {
case 2: case 2:
childWidget = Row(children: [ childWidget = Row(children: [
Expanded(flex: 9, child: $TermItem(items[0], data!)), Expanded(flex: 9, child: $TermItem(items[0], data!)),
const Expanded(flex: 1, child: SizedBox()), // const Expanded(flex: 1, child: SizedBox()),
SizedBox(width: ScreenUtil().screenWidth / 30),
Expanded(flex: 9, child: $TermItem(items[1], data!)), Expanded(flex: 9, child: $TermItem(items[1], data!)),
]); ]);
break; break;
case 3: case 3:
double theHeight = ScreenUtil().screenWidth / 19 + 54.h * 2; double theHeight = ScreenUtil().screenWidth / 30 + 54.h * 2;
childWidget = Row( childWidget = Row(
children: [ children: [
Expanded(child: $TermItem(items[0], data!, theHeight: theHeight)), Expanded(child: $TermItem(items[0], data!, theHeight: theHeight)),
SizedBox(width: ScreenUtil().screenWidth / 19), SizedBox(width: ScreenUtil().screenWidth / 30),
Expanded( Expanded(
child: SizedBox( child: SizedBox(
height: theHeight, height: theHeight,

82
making_school_asignment_app/lib/page/login_page/login_view.dart
View File

@ -80,7 +80,7 @@ class _LoginPageState extends State<LoginPage> {
),*/ ),*/
child: Column(children: [ child: Column(children: [
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 10.r), padding: EdgeInsets.symmetric(horizontal: 20.r),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.transparent, color: Colors.transparent,
border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)), border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)),
@ -112,31 +112,14 @@ class _LoginPageState extends State<LoginPage> {
color: Colors.white, color: Colors.white,
), ),
border: InputBorder.none, border: InputBorder.none,
prefixIcon: Image.asset( prefix: Padding(
'assets/images/login_account.png', padding: EdgeInsets.only(right: 5.r),
width: 10.r, child: Image.asset(
height: 10.r, 'assets/images/login_account.png',
width: 15.r,
height: 15.r,
),
), ),
/* suffixIcon: !state.hasNameVal
? null
: Transform.translate(
offset:
Offset(10, 10), // 根据原始组件的padding值来设置偏移量
child: IconButton(
alignment: Alignment.center,
padding: EdgeInsets.zero,
icon: Icon(
Icons.highlight_off_sharp,
color: Colors.grey,
size: 16.r,
),
onPressed: () {
state.userNameController
.clear(); // 清空文本框内容
state.passwordController.clear();
},
),
),*/
), ),
), ),
), ),
@ -146,7 +129,7 @@ class _LoginPageState extends State<LoginPage> {
), ),
Obx(() { Obx(() {
return Container( return Container(
padding: EdgeInsets.symmetric(horizontal: 10.r), padding: EdgeInsets.symmetric(horizontal: 20.r),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.transparent, color: Colors.transparent,
border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)), border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)),
@ -167,19 +150,13 @@ class _LoginPageState extends State<LoginPage> {
), ),
decoration: InputDecoration( decoration: InputDecoration(
hintText: "请输入密码", hintText: "请输入密码",
/* suffix: GestureDetector( prefix: Padding(
onTap: logic.showPassword, padding: EdgeInsets.only(right:5.r),
child: Icon( child: Image.asset(
Icons.remove_red_eye, 'assets/images/login_pwd.png',
color: state.isShowPwd.value width: 15.r,
? Theme.of(context).primaryColor height: 15.r,
: Colors.grey,
), ),
),*/
prefixIcon: Image.asset(
'assets/images/login_pwd.png',
width: 10.r,
height: 10.r,
), ),
hintStyle: TextStyle( hintStyle: TextStyle(
fontSize: 14.sp, fontSize: 14.sp,
@ -277,21 +254,24 @@ class _LoginPageState extends State<LoginPage> {
Row( Row(
children: [ children: [
Container( Container(
width: 20.w, width: 25 .w,
padding: EdgeInsets.only(right: 0.w), padding: EdgeInsets.only(right: 0.w),
child: Obx(() { child: Obx(() {
return Checkbox( return Transform.scale(
activeColor: Theme.of(context).primaryColor, scale: 1.2,
checkColor: Colors.white, child: Checkbox(
value: state.readAgreement.value, activeColor: Theme.of(context).primaryColor,
onChanged: (value) { checkColor: Colors.white,
Utils.hideKeyboard(); value: state.readAgreement.value,
/* FocusScope.of(context).requestFocus( onChanged: (value) {
state.pwdFocus); Utils.hideKeyboard();
FocusScope.of(context).requestFocus( /* FocusScope.of(context).requestFocus(
state.theFocus);*/ state.pwdFocus);
state.readAgreement.value = value ?? false; FocusScope.of(context).requestFocus(
}, state.theFocus);*/
state.readAgreement.value = value ?? false;
},
),
); );
}), }),
), ),