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

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

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