sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复鑫泓佳判断

Browse Source
This commit is contained in:
anfe 2024-04-29 15:13:13 +08:00
parent 2178a622db
commit dd87cb6243
2 changed files with 156 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
star_lock/lib/login/login/starLock_login_xhj_page.dart
View File

@ -23,7 +23,9 @@ class StarLockLoginXHJPage extends StatefulWidget {
class _StarLockLoginPageState extends State<StarLockLoginXHJPage> { class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
final logic = Get.put(StarLockLoginLogic()); final logic = Get.put(StarLockLoginLogic());
final state = Get.find<StarLockLoginLogic>().state; final state = Get
.find<StarLockLoginLogic>()
.state;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -65,11 +67,14 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
SizedBox( SizedBox(
width: 40.w, width: 40.w,
), ),
Text( Obx(() {
'${state.countryName.value} +${state.countryCode.value}', return Text(
'${state.countryName.value} +${state.countryCode
.value}',
style: TextStyle( style: TextStyle(
fontSize: 22.sp, color: AppColors.mainColor), fontSize: 22.sp, color: AppColors.mainColor),
) );
})
], ],
), ),
), ),
@ -109,7 +114,8 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
), ),
), ),
label: label:
"${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}", "${TranslationLoader.lanKeys!.pleaseEnter!
.tr}${TranslationLoader.lanKeys!.password!.tr}",
inputFormatters: [ inputFormatters: [
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
@ -125,7 +131,8 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
Obx( Obx(
() => Container( () =>
Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
left: 5.w, left: 5.w,
right: 10.w, right: 10.w,
@ -144,20 +151,23 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
text: TextSpan( text: TextSpan(
text: TranslationLoader.lanKeys!.readAndAgree!.tr, text: TranslationLoader.lanKeys!.readAndAgree!.tr,
style: TextStyle( style: TextStyle(
color: const Color(0xff333333), fontSize: 20.sp), color: const Color(0xff333333),
fontSize: 20.sp),
children: [ children: [
WidgetSpan( WidgetSpan(
alignment: PlaceholderAlignment.middle, alignment: PlaceholderAlignment.middle,
child: GestureDetector( child: GestureDetector(
child: Text( child: Text(
'《${TranslationLoader.lanKeys!.userAgreement!.tr}》', '《${TranslationLoader.lanKeys!
.userAgreement!.tr}》',
style: TextStyle( style: TextStyle(
color: AppColors.mainColor, color: AppColors.mainColor,
fontSize: 20.sp)), fontSize: 20.sp)),
onTap: () { onTap: () {
Get.toNamed(Routers.webviewShowPage, Get.toNamed(Routers.webviewShowPage,
arguments: { arguments: {
"url": XSConstantMacro.userAgreementURL, "url": XSConstantMacro
.userAgreementURL,
"title": '用户协议'.tr "title": '用户协议'.tr
}); });
}, },
@ -166,14 +176,16 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
alignment: PlaceholderAlignment.middle, alignment: PlaceholderAlignment.middle,
child: GestureDetector( child: GestureDetector(
child: Text( child: Text(
'《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》', '《${TranslationLoader.lanKeys!
.privacyPolicy!.tr}》',
style: TextStyle( style: TextStyle(
color: AppColors.mainColor, color: AppColors.mainColor,
fontSize: 20.sp)), fontSize: 20.sp)),
onTap: () { onTap: () {
Get.toNamed(Routers.webviewShowPage, Get.toNamed(Routers.webviewShowPage,
arguments: { arguments: {
"url": XSConstantMacro.privacyPolicyURL, "url": XSConstantMacro
.privacyPolicyURL,
"title": '隐私政策'.tr "title": '隐私政策'.tr
}); });
}, },
@ -186,7 +198,8 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
), ),
), ),
SizedBox(height: 15.w), SizedBox(height: 15.w),
Obx(() => SubmitBtn( Obx(() =>
SubmitBtn(
btnName: TranslationLoader.lanKeys!.login!.tr, btnName: TranslationLoader.lanKeys!.login!.tr,
fontSize: 28.sp, fontSize: 28.sp,
borderRadius: 20.w, borderRadius: 20.w,
@ -269,8 +282,7 @@ class _StarLockLoginPageState extends State<StarLockLoginXHJPage> {
)); ));
} }
Widget loginInput( Widget loginInput({TextEditingController? controller,
{TextEditingController? controller,
List<TextInputFormatter>? inputFormatters, List<TextInputFormatter>? inputFormatters,
String? hintText, String? hintText,
bool? isHaveLeftWidget, bool? isHaveLeftWidget,

6
star_lock/lib/mine/minePersonInfo/minePersonInfoPage/minePersonInfo_page.dart
View File

@ -39,7 +39,9 @@ class _MinePersonInfoPageState extends State<MinePersonInfoPage> {
: null, : null,
body: Column( body: Column(
children: [ children: [
Container( F.sw(
defaultCall: () => SizedBox(),
xhjCall: () => Container(
width: 1.sw, width: 1.sw,
height: 0.2.sw, height: 0.2.sw,
margin: EdgeInsets.symmetric(horizontal: 15.w), margin: EdgeInsets.symmetric(horizontal: 15.w),
@ -81,7 +83,7 @@ class _MinePersonInfoPageState extends State<MinePersonInfoPage> {
), ),
], ],
), ),
), )),
SizedBox( SizedBox(
height: 20.h, height: 20.h,
), ),