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

Merge branch 'new_main' into mcy_new

This commit is contained in:
machuanyu 2024-06-26 14:10:14 +08:00
parent b217b98598 bcaf5c77b7
commit e95bf53b7a
2 changed files with 176 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,109 +66,119 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
fontSize: 13.sp, fontSize: 13.sp,
); );
return AnnotatedRegion( return OrientationBuilder(builder: (BuildContext context, Orientation orientation) {
value: const SystemUiOverlayStyle( return AnnotatedRegion(
statusBarColor: Colors.transparent, value: const SystemUiOverlayStyle(
systemNavigationBarIconBrightness: Brightness.light, statusBarColor: Colors.transparent,
statusBarIconBrightness: Brightness.light, systemNavigationBarIconBrightness: Brightness.light,
statusBarBrightness: Brightness.dark, statusBarIconBrightness: Brightness.light,
), statusBarBrightness: Brightness.dark,
child: Stack( ),
children: [ child: Stack(
SizedBox( children: [
height: double.infinity, SizedBox(
child: Column( height: double.infinity,
children: [ child: Column(
Container( children: [
height: 220.h, Container(
width: double.infinity, height: 220.h,
decoration: const BoxDecoration( width: double.infinity,
image: DecorationImage( decoration: const BoxDecoration(
image: AssetImage('assets/images/personal_bgi.png'), image: DecorationImage(
fit: BoxFit.cover, image: AssetImage('assets/images/personal_bgi.png'),
fit: BoxFit.cover,
),
), ),
), ),
), Expanded(
Expanded( child: Container(
child: Container( color: const Color.fromRGBO(248, 248, 248, 1),
color: const Color.fromRGBO(248, 248, 248, 1), ))
)) ],
], ),
), ),
), SafeArea(
SafeArea( child: Scaffold(
child: Scaffold( backgroundColor: Colors.transparent,
backgroundColor: Colors.transparent, body: Column(
body: Column( children: [
children: [ Stack(
Stack( alignment: const FractionalOffset(0.04, 0.1),
alignment: const FractionalOffset(0.04, 0.1), children: [
children: [ Container(
Container( height: 180.h,
height: 180.h, alignment: Alignment.center,
alignment: Alignment.center, child: Column(
child: Column( mainAxisAlignment: MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, children: [
children: [ SizedBox(
SizedBox(height: 10.r,), height: 10.r,
Image.asset('assets/images/default_user_dead.png',), ),
SizedBox(height: 10.r,), Image.asset(
InkWell( 'assets/images/default_user_dead.png',
onTap: () { ),
/*if (tokenState == '' || userState.id == '') { SizedBox(
height: 10.r,
),
InkWell(
onTap: () {
/*if (tokenState == '' || userState.id == '') {
toLoginPage(context); toLoginPage(context);
}*/ }*/
}, },
child: Container( child: Container(
margin: EdgeInsets.only(top: 0.h), margin: EdgeInsets.only(top: 0.h),
child: Text( child: Text(
userInfo.value?.name ?? '请前往登录', userInfo.value?.name ?? '请前往登录',
style: TextStyle(fontSize: 13.sp, color: Colors.white), style: TextStyle(fontSize: 13.sp, color: Colors.white),
),
), ),
), ),
), ],
], ),
), ),
), /* InkWell(
/* InkWell(
onTap: () => Get.back(), onTap: () => Get.back(),
child: Icon(Icons.arrow_back_ios_new_rounded, color: Colors.white, size: 24.sp), child: Icon(Icons.arrow_back_ios_new_rounded, color: Colors.white, size: 24.sp),
),*/ ),*/
],
),
SizedBox(height: 14.h),
Container(
margin: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
padding: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
height: 180.h,
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(6.w)),
color: Colors.white,
boxShadow: const [
BoxShadow(
color: Color.fromRGBO(46, 91, 255, 0.1),
offset: Offset.zero, //阴影y轴偏移量
blurRadius: 20, //阴影模糊程度
spreadRadius: 10, //阴影扩散程度
)
], ],
), ),
child: Column( SizedBox(height: 14.h),
mainAxisAlignment: MainAxisAlignment.spaceBetween, Container(
children: [ margin: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
Row( padding: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
mainAxisAlignment: MainAxisAlignment.spaceBetween, height: 180.h,
children: [Text('账号', style: personalInfoTitleStly), Text(userInfo.value?.name ?? '请前往登录', style: personalInfoValStly)], decoration: BoxDecoration(
), borderRadius: BorderRadius.all(Radius.circular(6.w)),
Container( color: Colors.white,
height: 1.w, boxShadow: const [
color: const Color.fromRGBO(240, 243, 255, 1), BoxShadow(
), color: Color.fromRGBO(46, 91, 255, 0.1),
Row( offset: Offset.zero, //阴影y轴偏移量
mainAxisAlignment: MainAxisAlignment.spaceBetween, blurRadius: 20, //阴影模糊程度
children: [Text('所在学校', style: personalInfoTitleStly), Text(userInfo.value?.schoolName ?? '', style: personalInfoValStly)], spreadRadius: 10, //阴影扩散程度
), )
/* Row( ],
),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [Text('账号', style: personalInfoTitleStly), Text(userInfo.value?.name ?? '请前往登录', style: personalInfoValStly)],
),
Container(
height: 1.w,
color: const Color.fromRGBO(240, 243, 255, 1),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('所在学校', style: personalInfoTitleStly),
Text(userInfo.value?.schoolName ?? '', style: personalInfoValStly)
],
),
/* Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text('担任职位', style: personalInfoTitleStly), Text('担任职位', style: personalInfoTitleStly),
@ -200,87 +210,88 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
) )
], ],
),*/ ),*/
Container(height: 1.w, color: const Color.fromRGBO(240, 243, 255, 1)), Container(height: 1.w, color: const Color.fromRGBO(240, 243, 255, 1)),
Padding( Padding(
padding: EdgeInsets.only(top: 10.h), padding: EdgeInsets.only(top: 10.h),
child: InkWell( child: InkWell(
onTap: () { onTap: () {
Get.toNamed(Routes.otherPage); Get.toNamed(Routes.otherPage);
}, },
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text('其他', style: personalInfoTitleStly), Text('其他', style: personalInfoTitleStly),
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: 13.sp, size: 13.sp,
)
],
),
),
)
],
),
),
Expanded(
child: Column(
children: [
const Expanded(child: SizedBox()),
Container(
margin: EdgeInsets.only(bottom: 40.h),
alignment: Alignment.bottomCenter,
child: InkWell(
child: Container(
padding: EdgeInsets.symmetric(vertical: 14.h),
margin: EdgeInsets.only(right: 16.w, left: 16.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(6.w),
),
color: Colors.white,
boxShadow: [
BoxShadow(
color: const Color.fromRGBO(46, 91, 255, 0.2),
offset: Offset(2.w, 2.h), //阴影y轴偏移量
blurRadius: 14, //阴影模糊程度
spreadRadius: 0.5, //阴影扩散程度
) )
], ],
), ),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.exit_to_app_outlined,
size: 13.sp,
color: const Color.fromRGBO(148, 163, 182, 1),
),
Container(
width: 6.w,
),
Text(
'退出登录',
style: TextStyle(color: const Color.fromRGBO(148, 163, 182, 1), fontSize: 13.sp),
),
],
),
), ),
onTap: () { )
_showAlertDialog(context); ],
}, ),
),
),
],
), ),
), Expanded(
], child: Column(
children: [
const Expanded(child: SizedBox()),
Container(
margin: EdgeInsets.only(bottom: 40.h),
alignment: Alignment.bottomCenter,
child: InkWell(
child: Container(
padding: EdgeInsets.symmetric(vertical: 14.h),
margin: EdgeInsets.only(right: 16.w, left: 16.w),
decoration: BoxDecoration(
borderRadius: BorderRadius.all(
Radius.circular(6.w),
),
color: Colors.white,
boxShadow: [
BoxShadow(
color: const Color.fromRGBO(46, 91, 255, 0.2),
offset: Offset(2.w, 2.h), //阴影y轴偏移量
blurRadius: 14, //阴影模糊程度
spreadRadius: 0.5, //阴影扩散程度
)
],
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.exit_to_app_outlined,
size: 13.sp,
color: const Color.fromRGBO(148, 163, 182, 1),
),
Container(
width: 6.w,
),
Text(
'退出登录',
style: TextStyle(color: const Color.fromRGBO(148, 163, 182, 1), fontSize: 13.sp),
),
],
),
),
onTap: () {
_showAlertDialog(context);
},
),
),
],
),
),
],
),
), ),
), ),
), ],
], ),
), );
); });
} }
} }

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

@ -47,7 +47,6 @@ class _HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin
), ),
child: OrientationBuilder( child: OrientationBuilder(
builder: (BuildContext context, Orientation orientation) { builder: (BuildContext context, Orientation orientation) {
print('1111111111111');
return EasyRefresh( return EasyRefresh(
firstRefresh: false, firstRefresh: false,
taskIndependence: true, taskIndependence: true,