Showing
3 changed files
with
29 additions
and
14 deletions
| @@ -358,7 +358,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> { | @@ -358,7 +358,7 @@ class _BaseInfoPageState extends State<BaseInfoPage> { | ||
| 358 | _uploadImageProvider = | 358 | _uploadImageProvider = |
| 359 | Provider.of<UploadImageProvider>(context, listen: true); | 359 | Provider.of<UploadImageProvider>(context, listen: true); |
| 360 | _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true); | 360 | _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true); |
| 361 | - return Scaffold( | 361 | + return Scaffold( |
| 362 | backgroundColor: MyColours.color_fefefe, | 362 | backgroundColor: MyColours.color_fefefe, |
| 363 | appBar: SystemAppBar( | 363 | appBar: SystemAppBar( |
| 364 | '填写信息', | 364 | '填写信息', |
| @@ -367,7 +367,11 @@ class _BaseInfoPageState extends State<BaseInfoPage> { | @@ -367,7 +367,11 @@ class _BaseInfoPageState extends State<BaseInfoPage> { | ||
| 367 | Navigator.of(context).pop(); | 367 | Navigator.of(context).pop(); |
| 368 | }, | 368 | }, |
| 369 | ), | 369 | ), |
| 370 | - body: InkWell( | 370 | + body: WillPopScope( |
| 371 | + onWillPop: () { | ||
| 372 | + EventBus().emit('changeStatusColor'); | ||
| 373 | + Navigator.of(context).pop(); | ||
| 374 | + },child: InkWell( | ||
| 371 | onTap: () { | 375 | onTap: () { |
| 372 | FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 | 376 | FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 |
| 373 | }, | 377 | }, |
| @@ -442,6 +446,6 @@ class _BaseInfoPageState extends State<BaseInfoPage> { | @@ -442,6 +446,6 @@ class _BaseInfoPageState extends State<BaseInfoPage> { | ||
| 442 | width: double.infinity, | 446 | width: double.infinity, |
| 443 | radius: ScreenUtil().setWidth(10), | 447 | radius: ScreenUtil().setWidth(10), |
| 444 | )) | 448 | )) |
| 445 | - ]))); | ||
| 446 | - } | 449 | + ]))) |
| 450 | + );} | ||
| 447 | } | 451 | } |
| @@ -219,11 +219,11 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | @@ -219,11 +219,11 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver { | ||
| 219 | bottom: ScreenUtil().setWidth(120), | 219 | bottom: ScreenUtil().setWidth(120), |
| 220 | child: RoundButton( | 220 | child: RoundButton( |
| 221 | image: Utils.getImgPath('edit'), | 221 | image: Utils.getImgPath('edit'), |
| 222 | - text: '编辑', | 222 | + text: '个人信息', |
| 223 | gradientStart: Color.fromRGBO(255, 255, 255, 0.1), | 223 | gradientStart: Color.fromRGBO(255, 255, 255, 0.1), |
| 224 | gradientEnd: Color.fromRGBO(255, 255, 255, 0.1), | 224 | gradientEnd: Color.fromRGBO(255, 255, 255, 0.1), |
| 225 | borderColor: Color.fromRGBO(255, 255, 255, 0.2), | 225 | borderColor: Color.fromRGBO(255, 255, 255, 0.2), |
| 226 | - width: ScreenUtil().setWidth(160), | 226 | + width: ScreenUtil().setWidth(195), |
| 227 | height: ScreenUtil().setWidth(60), | 227 | height: ScreenUtil().setWidth(60), |
| 228 | fontSize: 28, | 228 | fontSize: 28, |
| 229 | isBold: false, | 229 | isBold: false, |
| @@ -70,14 +70,25 @@ class NotebookItemState extends State<NoteBookItem> { | @@ -70,14 +70,25 @@ class NotebookItemState extends State<NoteBookItem> { | ||
| 70 | horizontal: ScreenUtil().setWidth(14), | 70 | horizontal: ScreenUtil().setWidth(14), |
| 71 | vertical: ScreenUtil().setWidth(40)), | 71 | vertical: ScreenUtil().setWidth(40)), |
| 72 | alignment: Alignment.center, | 72 | alignment: Alignment.center, |
| 73 | - child: Text( | ||
| 74 | - notebook.tableinfoStr?.trim(), | ||
| 75 | - maxLines: 30, | ||
| 76 | - overflow: TextOverflow.ellipsis, | ||
| 77 | - style: TextStyle( | ||
| 78 | - color: textColor, | ||
| 79 | - // fontWeight: FontWeight.bold, | ||
| 80 | - fontSize: ScreenUtil().setSp(30)), | 73 | + child: Column( |
| 74 | + children: [ | ||
| 75 | + Text( | ||
| 76 | + '${notebook.tableinfoStr?.trim()}', | ||
| 77 | + maxLines: 30, | ||
| 78 | + overflow: TextOverflow.ellipsis, | ||
| 79 | + style: TextStyle( | ||
| 80 | + color: textColor, | ||
| 81 | + // fontWeight: FontWeight.bold, | ||
| 82 | + fontSize: ScreenUtil().setSp(30)), | ||
| 83 | + ), | ||
| 84 | + notebook.type == '1' | ||
| 85 | + ? Text('online', | ||
| 86 | + style: TextStyle( | ||
| 87 | + color: Colors.blue, | ||
| 88 | + // fontWeight: FontWeight.bold, | ||
| 89 | + fontSize: ScreenUtil().setSp(26))) | ||
| 90 | + : SizedBox() | ||
| 91 | + ], | ||
| 81 | ), | 92 | ), |
| 82 | ), | 93 | ), |
| 83 | MyDivider( | 94 | MyDivider( |
-
Please register or login to post a comment