diff --git a/lib/pages/home/SafeCheck/CheckPersonSign/safeCheck_sign_list_page.dart b/lib/pages/home/SafeCheck/CheckPersonSign/safeCheck_sign_list_page.dart index 14c7bd6..3e6f21b 100644 --- a/lib/pages/home/SafeCheck/CheckPersonSign/safeCheck_sign_list_page.dart +++ b/lib/pages/home/SafeCheck/CheckPersonSign/safeCheck_sign_list_page.dart @@ -242,8 +242,10 @@ class _SafecheckSignListPageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - "检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}", + Expanded( + child: Text( + "检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}", + ), ), ], ), diff --git a/lib/pages/home/SafeCheck/DangeCheck/safeCheck_danger_list_page.dart b/lib/pages/home/SafeCheck/DangeCheck/safeCheck_danger_list_page.dart index 41af91b..40f39ea 100644 --- a/lib/pages/home/SafeCheck/DangeCheck/safeCheck_danger_list_page.dart +++ b/lib/pages/home/SafeCheck/DangeCheck/safeCheck_danger_list_page.dart @@ -251,9 +251,12 @@ class _SafecheckDangerListPageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - "检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}", + Expanded( + child: Text( + "检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}", + ), ), + ], ), const SizedBox(height: 8), diff --git a/lib/pages/home/SafeCheck/Record/defend_record_list_page.dart b/lib/pages/home/SafeCheck/Record/defend_record_list_page.dart index d1bbefb..fb43f16 100644 --- a/lib/pages/home/SafeCheck/Record/defend_record_list_page.dart +++ b/lib/pages/home/SafeCheck/Record/defend_record_list_page.dart @@ -249,9 +249,12 @@ class _DefendRecordListPageState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text( - "检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}", + Expanded( + child: Text( + "检查时间: ${item['INSPECTION_TIME_START'] ?? ''}至${item['INSPECTION_TIME_END'] ?? ''}", + ), ), + ], ), const SizedBox(height: 8), diff --git a/lib/pages/home/SafeCheck/Start/safeCheck_defend_set_page.dart b/lib/pages/home/SafeCheck/Start/safeCheck_defend_set_page.dart index 5504813..a8cdaf7 100644 --- a/lib/pages/home/SafeCheck/Start/safeCheck_defend_set_page.dart +++ b/lib/pages/home/SafeCheck/Start/safeCheck_defend_set_page.dart @@ -135,7 +135,10 @@ setState(() { } Future _submit() async{ if (INSPECTION_STATUS == '-2') { - await pushPage(SafecheckStartDetail(INSPECTION_ID: form['INSPECTION_ID'] ?? '', type: 'edit'), context); + String text= await pushPage(SafecheckStartDetail(INSPECTION_ID: form['INSPECTION_ID'] ?? '', type: 'edit'), context); + if("success"==text){ + Navigator.of(context).pop(); + } return; } if (INSPECTION_STATUS == '3' && form['INSPECTED_EXPLAIN_REFUSE'] == '') { @@ -158,6 +161,7 @@ setState(() { }else{ ToastUtil.showError(context, '保存失败'); } + Navigator.of(context).pop(); }catch(e){} } diff --git a/lib/pages/home/SafeCheck/Start/safeCheck_start_detail.dart b/lib/pages/home/SafeCheck/Start/safeCheck_start_detail.dart index 305a713..f30313f 100644 --- a/lib/pages/home/SafeCheck/Start/safeCheck_start_detail.dart +++ b/lib/pages/home/SafeCheck/Start/safeCheck_start_detail.dart @@ -539,7 +539,7 @@ class _SafecheckStartDetailState extends State { LoadingDialogHelper.hide(); ToastUtil.showNormal(context, '提交成功'); - Navigator.of(context).pop(); + Navigator.of(context).pop("success"); } else { LoadingDialogHelper.hide(); final msgErr = diff --git a/lib/pages/home/SafeCheck/Start/safeCheck_start_list_page.dart b/lib/pages/home/SafeCheck/Start/safeCheck_start_list_page.dart index f531ac4..efbd7f1 100644 --- a/lib/pages/home/SafeCheck/Start/safeCheck_start_list_page.dart +++ b/lib/pages/home/SafeCheck/Start/safeCheck_start_list_page.dart @@ -309,7 +309,7 @@ class _SafecheckStartListPageState extends State { Row( spacing: 5, children: [ - if (item['INSPECTION_STATUS'] == '-1') + if (item['INSPECTION_STATUS'] == '-1'&&item['INSPECTION_ORIGINATOR_ID'] == SessionService.instance.loginUserId) CustomButton( text: '编辑', height: 35, @@ -318,7 +318,7 @@ class _SafecheckStartListPageState extends State { backgroundColor: Colors.green, onPressed: () => _goToDetail(item, 'edit'), ), - if (item['INSPECTION_STATUS'] == '-1') + if (item['INSPECTION_STATUS'] == '-1'&&item['INSPECTION_ORIGINATOR_ID'] == SessionService.instance.loginUserId) CustomButton( text: '查看', height: 35, diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart index bb97439..4fc4f40 100644 --- a/lib/pages/login_page.dart +++ b/lib/pages/login_page.dart @@ -113,10 +113,10 @@ class _LoginPageState extends State { ), Padding( padding: const EdgeInsets.symmetric(horizontal: 30), - child: SingleChildScrollView( + // child: SingleChildScrollView( child: Column( children: [ - const SizedBox(height: 150), + const SizedBox(height: 70), Row( children: [ Image.asset('assets/image/logo.png', height: 50), @@ -125,7 +125,7 @@ class _LoginPageState extends State { child: Text( '欢迎使用，\n智守安全云平台!', style: TextStyle( - fontSize: 22, + fontSize: 20, color: Colors.white, fontWeight: FontWeight.bold, ), @@ -185,8 +185,10 @@ class _LoginPageState extends State { style: const TextStyle(color: Colors.blue), ), ), + + Padding( - padding: const EdgeInsets.symmetric(vertical: 24), + padding: const EdgeInsets.symmetric(vertical: 0), child: SizedBox( width: double.infinity, height: 48, @@ -212,8 +214,10 @@ class _LoginPageState extends State { ), ), + Spacer(), + Padding( - padding: const EdgeInsets.all(0), + padding: const EdgeInsets.only(bottom: 10), child: Row( children: [ Checkbox( @@ -237,12 +241,14 @@ class _LoginPageState extends State { text: '我已阅读并同意', style: const TextStyle( color: Colors.white, + fontSize: 12, ), ), TextSpan( text: '《服务协议》', style: const TextStyle( color: Color(0xFF0D1D8C), + fontSize: 12, ), recognizer: TapGestureRecognizer() @@ -261,12 +267,14 @@ class _LoginPageState extends State { text: '和', style: const TextStyle( color: Colors.white, + fontSize: 12, ), ), TextSpan( text: '《隐私政策》', style: const TextStyle( color: Color(0xFF0D1D8C), + fontSize: 12, ), recognizer: TapGestureRecognizer() @@ -290,7 +298,7 @@ class _LoginPageState extends State { ), ], ), - ), + // ), ), ], ), @@ -316,7 +324,7 @@ class _LoginPageState extends State { Text( label, style: const TextStyle( - fontSize: 20, + fontSize: 15, fontWeight: FontWeight.w500, color: Colors.white, ), diff --git a/lib/pages/mine/mine_first_sign_page.dart b/lib/pages/mine/mine_first_sign_page.dart index de4c02c..35c8335 100644 --- a/lib/pages/mine/mine_first_sign_page.dart +++ b/lib/pages/mine/mine_first_sign_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'dart:io'; import 'package:flutter/services.dart'; +import 'package:qhd_prevention/customWidget/single_image_viewer.dart'; import 'package:qhd_prevention/customWidget/toast_util.dart'; import 'package:qhd_prevention/http/ApiService.dart'; import 'package:qhd_prevention/pages/my_appbar.dart'; @@ -95,20 +96,30 @@ class _SignatureUpdatePageState extends State { ), const SizedBox(width: 15), if (imagePath.isNotEmpty&&!imagePath.startsWith('http')) - Image.file( - File(imagePath), - width: 200, - height: 100, - fit: BoxFit.fill, - ), - if (imagePath.isNotEmpty&&imagePath.startsWith('http')) - Image.network( - imagePath, - width: 200, - height: 100, - fit: BoxFit.fill, + GestureDetector( + onTap: () { + presentOpaque(SingleImageViewer(imageUrl: imagePath), context); + }, + child: Image.file( + File(imagePath), + width: 200, + height: 100, + fit: BoxFit.contain , + ), ), + if (imagePath.isNotEmpty&&imagePath.startsWith('http')) + GestureDetector( + onTap: () { + presentOpaque(SingleImageViewer(imageUrl: imagePath), context); + }, + child: Image.network( + imagePath, + width: 200, + height: 100, + fit: BoxFit.contain , + ), + ), ], ), diff --git a/lib/pages/notif/notif_page.dart b/lib/pages/notif/notif_page.dart index 118243b..0f6d53d 100644 --- a/lib/pages/notif/notif_page.dart +++ b/lib/pages/notif/notif_page.dart @@ -113,12 +113,14 @@ class _NotifPageState extends State Future _getNotifEnterprise() async { // LoadingDialogHelper.show(); try { + LoadingDialogHelper.show(); final result = await ApiService.getNotifEnterprise( "-1", pageNum.toString(), keyWord, _selectedTabTwo.toString(), ); + LoadingDialogHelper.hide(); if (result['result'] == 'success') { final List newList = result['varList'] ?? []; setState(() { @@ -126,6 +128,7 @@ class _NotifPageState extends State }); } } catch (e) { + LoadingDialogHelper.hide(); print('加载出错: $e'); } finally { LoadingDialogHelper.hide();