Compare commits
No commits in common. "e95bf53b7a0da8dddeee0fa9b8b39d500f5c9fa7" and "b217b9859854bdebce7e38c7ff630418ca340c46" have entirely different histories.
e95bf53b7a
...
b217b98598
|
|
@ -66,119 +66,109 @@ class _MyInfoState extends State<MyInfo> with AutomaticKeepAliveClientMixin {
|
||||||
fontSize: 13.sp,
|
fontSize: 13.sp,
|
||||||
);
|
);
|
||||||
|
|
||||||
return OrientationBuilder(builder: (BuildContext context, Orientation orientation) {
|
return AnnotatedRegion(
|
||||||
return AnnotatedRegion(
|
value: const SystemUiOverlayStyle(
|
||||||
value: const SystemUiOverlayStyle(
|
statusBarColor: Colors.transparent,
|
||||||
statusBarColor: Colors.transparent,
|
systemNavigationBarIconBrightness: Brightness.light,
|
||||||
systemNavigationBarIconBrightness: Brightness.light,
|
statusBarIconBrightness: Brightness.light,
|
||||||
statusBarIconBrightness: Brightness.light,
|
statusBarBrightness: Brightness.dark,
|
||||||
statusBarBrightness: Brightness.dark,
|
),
|
||||||
),
|
child: Stack(
|
||||||
child: Stack(
|
children: [
|
||||||
children: [
|
SizedBox(
|
||||||
SizedBox(
|
height: double.infinity,
|
||||||
height: double.infinity,
|
child: Column(
|
||||||
child: Column(
|
children: [
|
||||||
children: [
|
Container(
|
||||||
Container(
|
height: 220.h,
|
||||||
height: 220.h,
|
width: double.infinity,
|
||||||
width: double.infinity,
|
decoration: const BoxDecoration(
|
||||||
decoration: const BoxDecoration(
|
image: DecorationImage(
|
||||||
image: DecorationImage(
|
image: AssetImage('assets/images/personal_bgi.png'),
|
||||||
image: AssetImage('assets/images/personal_bgi.png'),
|
fit: BoxFit.cover,
|
||||||
fit: BoxFit.cover,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Expanded(
|
),
|
||||||
child: Container(
|
Expanded(
|
||||||
color: const Color.fromRGBO(248, 248, 248, 1),
|
child: Container(
|
||||||
))
|
color: const Color.fromRGBO(248, 248, 248, 1),
|
||||||
],
|
))
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
SafeArea(
|
),
|
||||||
child: Scaffold(
|
SafeArea(
|
||||||
backgroundColor: Colors.transparent,
|
child: Scaffold(
|
||||||
body: Column(
|
backgroundColor: Colors.transparent,
|
||||||
children: [
|
body: Column(
|
||||||
Stack(
|
children: [
|
||||||
alignment: const FractionalOffset(0.04, 0.1),
|
Stack(
|
||||||
children: [
|
alignment: const FractionalOffset(0.04, 0.1),
|
||||||
Container(
|
children: [
|
||||||
height: 180.h,
|
Container(
|
||||||
alignment: Alignment.center,
|
height: 180.h,
|
||||||
child: Column(
|
alignment: Alignment.center,
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
child: Column(
|
||||||
children: [
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
SizedBox(
|
children: [
|
||||||
height: 10.r,
|
SizedBox(height: 10.r,),
|
||||||
),
|
Image.asset('assets/images/default_user_dead.png',),
|
||||||
Image.asset(
|
SizedBox(height: 10.r,),
|
||||||
'assets/images/default_user_dead.png',
|
InkWell(
|
||||||
),
|
onTap: () {
|
||||||
SizedBox(
|
/*if (tokenState == '' || userState.id == '') {
|
||||||
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, //阴影扩散程度
|
||||||
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
SizedBox(height: 14.h),
|
child: Column(
|
||||||
Container(
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
margin: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
|
children: [
|
||||||
padding: EdgeInsets.symmetric(vertical: 22.h, horizontal: 16.w),
|
Row(
|
||||||
height: 180.h,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
decoration: BoxDecoration(
|
children: [Text('账号', style: personalInfoTitleStly), Text(userInfo.value?.name ?? '请前往登录', style: personalInfoValStly)],
|
||||||
borderRadius: BorderRadius.all(Radius.circular(6.w)),
|
),
|
||||||
color: Colors.white,
|
Container(
|
||||||
boxShadow: const [
|
height: 1.w,
|
||||||
BoxShadow(
|
color: const Color.fromRGBO(240, 243, 255, 1),
|
||||||
color: Color.fromRGBO(46, 91, 255, 0.1),
|
),
|
||||||
offset: Offset.zero, //阴影y轴偏移量
|
Row(
|
||||||
blurRadius: 20, //阴影模糊程度
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
spreadRadius: 10, //阴影扩散程度
|
children: [Text('所在学校', style: personalInfoTitleStly), Text(userInfo.value?.schoolName ?? '', style: personalInfoValStly)],
|
||||||
)
|
),
|
||||||
],
|
/* 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),
|
||||||
|
|
@ -210,88 +200,87 @@ 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(
|
||||||
Expanded(
|
Icons.exit_to_app_outlined,
|
||||||
child: Column(
|
size: 13.sp,
|
||||||
children: [
|
color: const Color.fromRGBO(148, 163, 182, 1),
|
||||||
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,
|
Container(
|
||||||
boxShadow: [
|
width: 6.w,
|
||||||
BoxShadow(
|
),
|
||||||
color: const Color.fromRGBO(46, 91, 255, 0.2),
|
Text(
|
||||||
offset: Offset(2.w, 2.h), //阴影y轴偏移量
|
'退出登录',
|
||||||
blurRadius: 14, //阴影模糊程度
|
style: TextStyle(color: const Color.fromRGBO(148, 163, 182, 1), fontSize: 13.sp),
|
||||||
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);
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
|
onTap: () {
|
||||||
|
_showAlertDialog(context);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
);
|
),
|
||||||
});
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,7 @@ 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,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue