From 389477c0e5cda2c4bfd22530b1ceed3089bc2032 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Sat, 18 May 2024 09:19:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=A4=B1=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=AE=A1=E7=90=86=E5=91=98=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/images/lan/lan_en.json | 1 + star_lock/images/lan/lan_keys.json | 1 + star_lock/images/lan/lan_zh.json | 1 + .../authorizedAdministratorList_page.dart | 37 +++++++++++++++---- .../valueAddedServicesList_page.dart | 1 + .../lib/tools/showCupertinoAlertView.dart | 6 +-- 6 files changed, 37 insertions(+), 10 deletions(-) diff --git a/star_lock/images/lan/lan_en.json b/star_lock/images/lan/lan_en.json index 27e1c76e..76e14461 100644 --- a/star_lock/images/lan/lan_en.json +++ b/star_lock/images/lan/lan_en.json @@ -817,6 +817,7 @@ "身份证号":"ID number", "请输入真实姓名":"Please enter your real name", "请输入身份证号":"Please enter your ID number", + "请输入身份证号和真实姓名":"Please enter your ID number and real name", "点击返回设备配对":"Tap Back to device pairing", "无法连接？尝试升级":"Can't connect?Upgrade attempted", "固件升级提示":"Firmware upgrade prompt", diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json index 3d671b57..ed1eaa51 100644 --- a/star_lock/images/lan/lan_keys.json +++ b/star_lock/images/lan/lan_keys.json @@ -844,6 +844,7 @@ "身份证号":"身份证号", "请输入真实姓名":"请输入真实姓名", "请输入身份证号":"请输入身份证号", + "请输入身份证号和真实姓名":"请输入身份证号和真实姓名", "点击返回设备配对":"点击返回设备配对", "无法连接？尝试升级":"无法连接？尝试升级", diff --git a/star_lock/images/lan/lan_zh.json b/star_lock/images/lan/lan_zh.json index 1bd2b742..7a31ca86 100644 --- a/star_lock/images/lan/lan_zh.json +++ b/star_lock/images/lan/lan_zh.json @@ -815,6 +815,7 @@ "身份证号": "身份证号", "请输入真实姓名": "请输入真实姓名", "请输入身份证号": "请输入身份证号", + "请输入身份证号和真实姓名":"请输入身份证号和真实姓名", "点击返回设备配对": "点击返回设备配对", "无法连接？尝试升级": "无法连接？尝试升级", "固件升级提示": "固件升级提示", diff --git a/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_page.dart b/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_page.dart index 6b94317e..c2922066 100644 --- a/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_page.dart +++ b/star_lock/lib/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdministratorList_page.dart @@ -5,6 +5,7 @@ import 'package:get/get.dart'; import 'package:star_lock/mine/mineSet/authorizedAdministrator/authorizedAdministrator/authorizedAdminListEntity.dart'; import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/showCupertinoAlertView.dart'; +import 'package:star_lock/tools/submitBtn.dart'; import '../../../../../appRouters.dart'; import '../../../../../app_settings/app_colors.dart'; @@ -92,13 +93,35 @@ class _AuthorizedAdministratorListPageState } Widget _buildMainUI() { - return Obx(() => state.itemDataList.value.isEmpty - ? NoData( - noDataHeight: 1.sh - - ScreenUtil().statusBarHeight - - ScreenUtil().bottomBarHeight - - 190.h - - 64.h) + return Obx(() => state.itemDataList.isEmpty + ? Stack( + children: [ + NoData( + noDataHeight: 1.sh - + ScreenUtil().statusBarHeight - + ScreenUtil().bottomBarHeight - + 190.h - + 64.h), + Align( + alignment: const Alignment(0.0, 0.2), + child: SizedBox( + width: 360.w, + child: SubmitBtn( + btnName: '添加授权管理员', + onClick: () { + Navigator.pushNamed( + context, Routers.addAuthorizedAdministratorPage) + .then((value) { + setState(() { + logic.pageNo = 1; + getHttpData(); + }); + }); + }), + ), + ), + ], + ) : SlidableAutoCloseBehavior( child: ListView.separated( itemCount: state.itemDataList.value.length, diff --git a/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart b/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart index 25d7493f..33744dcf 100644 --- a/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart +++ b/star_lock/lib/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_page.dart @@ -3,6 +3,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/mine/valueAddedServices/valueAddedServicesList/valueAddedServicesList_logic.dart'; +import 'package:star_lock/tools/commonDataManage.dart'; import 'package:star_lock/tools/storage.dart'; import '../../../appRouters.dart'; diff --git a/star_lock/lib/tools/showCupertinoAlertView.dart b/star_lock/lib/tools/showCupertinoAlertView.dart index 09ee39a7..aef9105b 100644 --- a/star_lock/lib/tools/showCupertinoAlertView.dart +++ b/star_lock/lib/tools/showCupertinoAlertView.dart @@ -221,14 +221,14 @@ class ShowCupertinoAlertView { String name = ''; return CupertinoAlertDialog( - title: const Text('请输入身份证号和真实姓名'), + title: Text('请输入身份证号和真实姓名'.tr), content: Column( children: [ SizedBox( height: 10.h, ), CupertinoTextField( - placeholder: '请输入身份证号', + placeholder: '请输入身份证号'.tr, onChanged: (value) { idCard = value; }, @@ -237,7 +237,7 @@ class ShowCupertinoAlertView { height: 10.h, ), CupertinoTextField( - placeholder: '请输入真实姓名', + placeholder: '请输入真实姓名'.tr, onChanged: (value) { name = value; },