Compare commits
No commits in common. "cec4aec9d58e6a674d51c64599c30fa9bf0aa1ef" and "952e181e4564c5c8b54c391935c19b3c9cc74103" have entirely different histories.
cec4aec9d5
...
952e181e45
Binary file not shown.
|
Before Width: | Height: | Size: 4.4 KiB After Width: | Height: | Size: 3.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 6.0 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 21 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 483 B After Width: | Height: | Size: 544 B |
Binary file not shown.
|
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 468 B |
|
|
@ -92,7 +92,7 @@ class _AnnotateClassPageState extends State<AnnotateClassPage> {
|
|||
return AnnotateItem(
|
||||
homeworkId: homeworkId,
|
||||
item: item,
|
||||
font: 11.sp,
|
||||
font: 8.sp,
|
||||
name: state.name.value,
|
||||
logic: logic,
|
||||
);
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ class _FavStudentPageState extends State<FavStudentPage> {
|
|||
.width,
|
||||
height: 1.r,
|
||||
decoration: const BoxDecoration(
|
||||
color: Color(0xFFEEEEEE),
|
||||
color: Color(0xFFCCCCCC),
|
||||
),
|
||||
),
|
||||
Obx((){
|
||||
|
|
|
|||
|
|
@ -59,11 +59,11 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
|
|||
|
||||
final personalInfoTitleStly = TextStyle(
|
||||
color: const Color.fromRGBO(80, 87, 103, 1),
|
||||
fontSize: 13.sp,
|
||||
fontSize: 16.sp,
|
||||
);
|
||||
final personalInfoValStly = TextStyle(
|
||||
color: const Color.fromRGBO(148, 163, 182, 1),
|
||||
fontSize: 13.sp,
|
||||
fontSize: 16.sp,
|
||||
);
|
||||
|
||||
return AnnotatedRegion(
|
||||
|
|
@ -80,7 +80,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
|
|||
child: Column(
|
||||
children: [
|
||||
Container(
|
||||
height: 220.h,
|
||||
height: 240.h,
|
||||
width: double.infinity,
|
||||
decoration: const BoxDecoration(
|
||||
image: DecorationImage(
|
||||
|
|
@ -105,14 +105,45 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
|
|||
alignment: const FractionalOffset(0.04, 0.1),
|
||||
children: [
|
||||
Container(
|
||||
height: 180.h,
|
||||
height: 200.h,
|
||||
alignment: Alignment.center,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
SizedBox(height: 10.r,),
|
||||
Image.asset('assets/images/default_user_dead.png',),
|
||||
SizedBox(height: 10.r,),
|
||||
ClipRRect(
|
||||
borderRadius: BorderRadius.circular(80.w),
|
||||
child: Container(
|
||||
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(
|
||||
onTap: () {
|
||||
/*if (tokenState == '' || userState.id == '') {
|
||||
|
|
@ -120,10 +151,10 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
|
|||
}*/
|
||||
},
|
||||
child: Container(
|
||||
margin: EdgeInsets.only(top: 0.h),
|
||||
margin: EdgeInsets.only(top: 16.h),
|
||||
child: Text(
|
||||
userInfo.value?.name ?? '请前往登录',
|
||||
style: TextStyle(fontSize: 13.sp, color: Colors.white),
|
||||
style: TextStyle(fontSize: 16.sp, color: Colors.white),
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -140,7 +171,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
|
|||
Container(
|
||||
margin: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
|
||||
padding: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
|
||||
height: 180.h,
|
||||
height: 240.h,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.all(Radius.circular(6.w)),
|
||||
color: Colors.white,
|
||||
|
|
@ -214,7 +245,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
|
|||
Icon(
|
||||
Icons.arrow_forward_ios,
|
||||
color: const Color.fromRGBO(80, 87, 103, 1),
|
||||
size: 13.sp,
|
||||
size: 16.sp,
|
||||
)
|
||||
],
|
||||
),
|
||||
|
|
@ -254,7 +285,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
|
|||
children: [
|
||||
Icon(
|
||||
Icons.exit_to_app_outlined,
|
||||
size: 13.sp,
|
||||
size: 16.sp,
|
||||
color: const Color.fromRGBO(148, 163, 182, 1),
|
||||
),
|
||||
Container(
|
||||
|
|
@ -262,7 +293,7 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
|
|||
),
|
||||
Text(
|
||||
'退出登录',
|
||||
style: TextStyle(color: const Color.fromRGBO(148, 163, 182, 1), fontSize: 13.sp),
|
||||
style: TextStyle(color: const Color.fromRGBO(148, 163, 182, 1), fontSize: 16.sp),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
|
|||
|
|
@ -290,7 +290,6 @@ Widget $reviewedItem({
|
|||
padding: padEdg,
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
|
||||
children: [
|
||||
Container(
|
||||
width: 32.w,
|
||||
|
|
@ -311,19 +310,23 @@ Widget $reviewedItem({
|
|||
),
|
||||
Expanded(
|
||||
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(
|
||||
padding: padEdg,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
Text(
|
||||
'已订正',
|
||||
style: TextStyle(fontSize: 10.sp, color: const Color(0xFFF16262)),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
|
||||
Padding(
|
||||
padding: padEdg,
|
||||
child: Row(
|
||||
|
|
|
|||
|
|
@ -164,9 +164,6 @@ class _TaskListItemState extends State<TaskListItem> {
|
|||
alignment: const FractionalOffset(0.95, 0),
|
||||
children: [
|
||||
Container(
|
||||
color: Colors.transparent,
|
||||
padding: EdgeInsets.only(top: 40.r),
|
||||
child: Container(
|
||||
margin: EdgeInsets.only(bottom: 16.h),
|
||||
padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 10.w),
|
||||
width: Get.width,
|
||||
|
|
@ -189,7 +186,7 @@ class _TaskListItemState extends State<TaskListItem> {
|
|||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SizedBox(height: 10.h),
|
||||
SizedBox(height: 30.h),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
|
|
@ -272,17 +269,16 @@ class _TaskListItemState extends State<TaskListItem> {
|
|||
],
|
||||
),
|
||||
),
|
||||
SizedBox(width: 130.r,),
|
||||
SizedBox(width: 100.r,),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
Container(
|
||||
padding: EdgeInsets.all(9.r),
|
||||
decoration: const BoxDecoration(shape: BoxShape.circle, color: Colors.white),
|
||||
child: CircularPercentIndicator(
|
||||
radius: 50.r,
|
||||
lineWidth: 18.r,
|
||||
radius: 40.r,
|
||||
lineWidth: 10.r,
|
||||
animation: true,
|
||||
percent: widget.jobTaskItem.annotateRate == null ? 0 : widget.jobTaskItem.annotateRate! / 100,
|
||||
center: Text.rich(TextSpan(children: [
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
|
|||
@override
|
||||
Widget build(BuildContext context) {
|
||||
super.build(context);
|
||||
var spaceWidth = SizedBox(height: ScreenUtil().screenWidth / 30);
|
||||
var spaceWidth = SizedBox(height: ScreenUtil().screenWidth / 19);
|
||||
return SafeArea(
|
||||
child: AnnotatedRegion(
|
||||
value: const SystemUiOverlayStyle(
|
||||
|
|
@ -63,7 +63,6 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
|
|||
},
|
||||
child: Column(
|
||||
children: [
|
||||
SizedBox(height: 15.r,),
|
||||
/* Container(
|
||||
height: 200.h,
|
||||
width: double.infinity,
|
||||
|
|
@ -106,7 +105,7 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
|
|||
navigationUrl: '')
|
||||
],
|
||||
0),*/
|
||||
SizedBox(height: 15.h),
|
||||
SizedBox(height: 16.h),
|
||||
Obx(() {
|
||||
return Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: 12.w),
|
||||
|
|
@ -123,12 +122,12 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
|
|||
});
|
||||
},
|
||||
child: Container(
|
||||
margin: EdgeInsets.only(bottom: 15.h),
|
||||
margin: EdgeInsets.only(bottom: 16.h),
|
||||
child: Column(
|
||||
children: [
|
||||
SizedBox(height: 4.h),
|
||||
Container(
|
||||
padding: EdgeInsets.symmetric(vertical: 15.h, horizontal: 10.w),
|
||||
padding: EdgeInsets.symmetric(vertical: 16.h, horizontal: 10.w),
|
||||
width: double.infinity,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(6.r),
|
||||
|
|
@ -273,17 +272,16 @@ Widget $termRow(BuildContext context, List<EntranceModel> items, int? data) {
|
|||
case 2:
|
||||
childWidget = Row(children: [
|
||||
Expanded(flex: 9, child: $TermItem(items[0], data!)),
|
||||
// const Expanded(flex: 1, child: SizedBox()),
|
||||
SizedBox(width: ScreenUtil().screenWidth / 30),
|
||||
const Expanded(flex: 1, child: SizedBox()),
|
||||
Expanded(flex: 9, child: $TermItem(items[1], data!)),
|
||||
]);
|
||||
break;
|
||||
case 3:
|
||||
double theHeight = ScreenUtil().screenWidth / 30 + 54.h * 2;
|
||||
double theHeight = ScreenUtil().screenWidth / 19 + 54.h * 2;
|
||||
childWidget = Row(
|
||||
children: [
|
||||
Expanded(child: $TermItem(items[0], data!, theHeight: theHeight)),
|
||||
SizedBox(width: ScreenUtil().screenWidth / 30),
|
||||
SizedBox(width: ScreenUtil().screenWidth / 19),
|
||||
Expanded(
|
||||
child: SizedBox(
|
||||
height: theHeight,
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ class _LoginPageState extends State<LoginPage> {
|
|||
),*/
|
||||
child: Column(children: [
|
||||
Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: 20.r),
|
||||
padding: EdgeInsets.symmetric(horizontal: 10.r),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.transparent,
|
||||
border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)),
|
||||
|
|
@ -112,14 +112,31 @@ class _LoginPageState extends State<LoginPage> {
|
|||
color: Colors.white,
|
||||
),
|
||||
border: InputBorder.none,
|
||||
prefix: Padding(
|
||||
padding: EdgeInsets.only(right: 5.r),
|
||||
child: Image.asset(
|
||||
prefixIcon: Image.asset(
|
||||
'assets/images/login_account.png',
|
||||
width: 15.r,
|
||||
height: 15.r,
|
||||
width: 10.r,
|
||||
height: 10.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();
|
||||
},
|
||||
),
|
||||
),*/
|
||||
),
|
||||
),
|
||||
),
|
||||
|
|
@ -129,7 +146,7 @@ class _LoginPageState extends State<LoginPage> {
|
|||
),
|
||||
Obx(() {
|
||||
return Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: 20.r),
|
||||
padding: EdgeInsets.symmetric(horizontal: 10.r),
|
||||
decoration: BoxDecoration(
|
||||
color: Colors.transparent,
|
||||
border: Border.all(width: 1.w, color: const Color(0xFFAECBFF)),
|
||||
|
|
@ -150,13 +167,19 @@ class _LoginPageState extends State<LoginPage> {
|
|||
),
|
||||
decoration: InputDecoration(
|
||||
hintText: "请输入密码",
|
||||
prefix: Padding(
|
||||
padding: EdgeInsets.only(right:5.r),
|
||||
child: Image.asset(
|
||||
'assets/images/login_pwd.png',
|
||||
width: 15.r,
|
||||
height: 15.r,
|
||||
/* suffix: GestureDetector(
|
||||
onTap: logic.showPassword,
|
||||
child: Icon(
|
||||
Icons.remove_red_eye,
|
||||
color: state.isShowPwd.value
|
||||
? Theme.of(context).primaryColor
|
||||
: Colors.grey,
|
||||
),
|
||||
),*/
|
||||
prefixIcon: Image.asset(
|
||||
'assets/images/login_pwd.png',
|
||||
width: 10.r,
|
||||
height: 10.r,
|
||||
),
|
||||
hintStyle: TextStyle(
|
||||
fontSize: 14.sp,
|
||||
|
|
@ -254,12 +277,10 @@ class _LoginPageState extends State<LoginPage> {
|
|||
Row(
|
||||
children: [
|
||||
Container(
|
||||
width: 25 .w,
|
||||
width: 20.w,
|
||||
padding: EdgeInsets.only(right: 0.w),
|
||||
child: Obx(() {
|
||||
return Transform.scale(
|
||||
scale: 1.2,
|
||||
child: Checkbox(
|
||||
return Checkbox(
|
||||
activeColor: Theme.of(context).primaryColor,
|
||||
checkColor: Colors.white,
|
||||
value: state.readAgreement.value,
|
||||
|
|
@ -271,7 +292,6 @@ class _LoginPageState extends State<LoginPage> {
|
|||
state.theFocus);*/
|
||||
state.readAgreement.value = value ?? false;
|
||||
},
|
||||
),
|
||||
);
|
||||
}),
|
||||
),
|
||||
|
|
|
|||
Loading…
Reference in New Issue