diff --git a/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart b/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart index cee73291..d4e9f3b6 100644 --- a/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart +++ b/star_lock/lib/main/lockDetail/checkingIn/checkingInDetail/checkingInDetail_page.dart @@ -180,9 +180,10 @@ class _CheckingInDetailPageState extends State { child: Text( array[index], style: TextStyle( - color: index == 5 || index == 6 - ? const Color(0xFFC4C8D0) - : const Color(0xFF3C3E43), + color: + // index == 5 || index == 6 + // ? const Color(0xFFC4C8D0) : + const Color(0xFF3C3E43), fontSize: 26.sp), )); }, @@ -212,14 +213,14 @@ class _CheckingInDetailPageState extends State { Color backColor = Colors.white; // Color textColor = const Color(0xFFFFFFFF); if(_datas[index].workType == "1"){ - backColor = const Color(0xFFE83523); - // textColor = Colors.white; + // 迟到 + backColor = const Color(0xFFE83523); }else if( _datas[index].workType == "2"){ + // 早退 backColor = const Color(0xFFEDB459); - // textColor = Colors.white; }else if( _datas[index].workType == "3"){ + // 未打卡 backColor = const Color(0xFF666666); - // textColor = Colors.white; } return GestureDetector( onTap: () { @@ -263,17 +264,13 @@ class _CheckingInDetailPageState extends State { ? _datas[index].day.toString() : "", textAlign: TextAlign.center, - //设置选中字体颜色,以及周末和工作日颜色 + //设置选中字体颜色 休息的颜色都是黑色 其余的都是白色因为有背景色 style: (int.parse(_datas[index].workType!) > 0) ? TextStyle( fontSize: 24.sp, color: const Color(0xFFFFFFFF)) - : (index % 7 == 5 || index % 7 == 6 - ? TextStyle( - fontSize: 24.sp, - color: const Color(0xFFC4C8D0)) - : TextStyle( - fontSize: 24.sp, - color: const Color(0xFF3C3E43))), + : TextStyle( + fontSize: 24.sp, + color: Colors.black), ), ), ), @@ -336,7 +333,7 @@ class _CheckingInDetailPageState extends State { return Column( children: [ Container( - height: 70.h, + // height: 70.h, padding: EdgeInsets.only(left: 20.w, right: 10.w, top: 20.w, bottom: 20.w), child: Row( diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_logic.dart b/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_logic.dart index 74bf3c62..548f0756 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_logic.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_logic.dart @@ -20,6 +20,10 @@ class RecipientInformationLogic extends BaseGetXController{ ); if(entity.errorCode!.codeIsSuccessful){ action(entity.data!); + }else { + if(entity.errorCode! == 425){ + showToast(entity.errorMsg!); + } } } @@ -32,6 +36,7 @@ class RecipientInformationLogic extends BaseGetXController{ ); if(entity.errorCode!.codeIsSuccessful){ Get.back(result: "scuess"); + eventBus.fire(RefreshLockListInfoDataEvent()); } } diff --git a/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart b/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart index 4365d8e1..020b4c37 100644 --- a/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart +++ b/star_lock/lib/mine/mineSet/transferSmartLock/recipientInformation/recipientInformation_page.dart @@ -227,12 +227,13 @@ class _RecipientInformationPageState extends State { showCupertinoAlertDialog(context, v); }); } else { - Get.toNamed(Routers.selectBranchPage, arguments: { - "idList": state.idList.value, - "countryCode": state.countryCode.value, - "number": state.numberController.text, - "isFromType": state.isFromType.value, - }); + logic.showToast("暂不支持跨平台转移,敬请期待"); + // Get.toNamed(Routers.selectBranchPage, arguments: { + // "idList": state.idList.value, + // "countryCode": state.countryCode.value, + // "number": state.numberController.text, + // "isFromType": state.isFromType.value, + // }); } } else { // 转移网关 @@ -241,12 +242,14 @@ class _RecipientInformationPageState extends State { showCupertinoAlertDialog(context, v); }); } else { - Get.toNamed(Routers.selectBranchPage, arguments: { - "idList": state.idList.value, - "countryCode": state.countryCode.value, - "number": state.numberController.text, - "isFromType": state.isFromType.value - }); + logic.showToast("暂不支持跨平台转移,敬请期待"); + + // Get.toNamed(Routers.selectBranchPage, arguments: { + // "idList": state.idList.value, + // "countryCode": state.countryCode.value, + // "number": state.numberController.text, + // "isFromType": state.isFromType.value + // }); } } }); diff --git a/star_lock/lib/network/api_provider_base.dart b/star_lock/lib/network/api_provider_base.dart index 668add51..fcecaa40 100644 --- a/star_lock/lib/network/api_provider_base.dart +++ b/star_lock/lib/network/api_provider_base.dart @@ -40,6 +40,7 @@ class BaseProvider extends GetConnect with Api { query: query, decoder: decoder, uploadProgress: uploadProgress); + // print('res.body======>${res.body}'); if (res.body == null) { if (EasyLoading.isShow) EasyLoading.dismiss(animation: true); var rs = { diff --git a/star_lock/pubspec.yaml b/star_lock/pubspec.yaml index e7c169ae..03ba9fa1 100644 --- a/star_lock/pubspec.yaml +++ b/star_lock/pubspec.yaml @@ -24,7 +24,8 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # 1.0.20+2024032102:修复Apple Store App Tracking Transparency权限问题 # 1.0.21+2024032801:同为斯凯环境也区分删减版和完整版,通过main_sky_lite.dart/main_sky_full.dart切换 # 1.0.21+2024032802:1、打包斯凯、预发布环境给欧阳测试 -version: 1.0.21+20240401 +# 1.0.22+20240403:1、打包预发布环境给欧阳测试 +version: 1.0.22+20240403 environment: sdk: '>=2.12.0 <3.0.0'