更新登录布局
This commit is contained in:
@@ -110,6 +110,7 @@ class _SingleBlueteethDeviceCompoentWidgetState
|
||||
}
|
||||
},
|
||||
onCancel: () {
|
||||
|
||||
print('用户点击了取消');
|
||||
blueteethBindController.currentDeviceMac.value = "";
|
||||
blueteethBindController.updateAll();
|
||||
|
||||
@@ -154,11 +154,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:vbvs_app/pages/common/bezier_bottom_navigation_bar.dart';
|
||||
import 'package:vbvs_app/pages/mh_page/MattressControl.dart';
|
||||
import 'package:vbvs_app/pages/mh_page/find_password_page.dart';
|
||||
import 'package:vbvs_app/pages/mh_page/new_Home_page.dart';
|
||||
import 'package:vbvs_app/pages/mh_page/new_mine_page.dart';
|
||||
import 'package:vbvs_app/pages/mh_page/register_page.dart';
|
||||
import 'package:vbvs_app/pages/mh_page/score_page.dart';
|
||||
import 'package:vbvs_app/pages/mh_page/user/page/register_page.dart';
|
||||
|
||||
class MainPageBBottomChange extends StatefulWidget {
|
||||
@override
|
||||
|
||||
189
lib/pages/mh_page/user/controller/mht_login_controller.dart
Normal file
189
lib/pages/mh_page/user/controller/mht_login_controller.dart
Normal file
@@ -0,0 +1,189 @@
|
||||
import 'package:ef/ef.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutterflow_ui/flutterflow_ui.dart';
|
||||
import 'package:fluwx/fluwx.dart';
|
||||
import 'package:json_annotation/json_annotation.dart';
|
||||
import 'package:vbvs_app/common/util/MyUtils.dart';
|
||||
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
|
||||
import 'package:vbvs_app/pages/mh_page/user/controller/mht_register_controller.dart';
|
||||
|
||||
part 'mht_login_controller.g.dart';
|
||||
|
||||
@JsonSerializable()
|
||||
class LoginModel {
|
||||
//版本id
|
||||
int? loginStyle = 1; //1.密码登录 2.短信登录
|
||||
|
||||
String? account = '17649984946'; //账户
|
||||
// String? account = '13953240733'; //账户
|
||||
String? password = 'wyf123,.'; //密码
|
||||
// String? account = '15255134931'; //账户
|
||||
// String? password = 'mht123,.'; //密码
|
||||
|
||||
// String? account = '18607922869'; //账户
|
||||
// String? password = '373068'; //密码
|
||||
// String? account = ''; //账户
|
||||
// String? password = ''; //密码
|
||||
|
||||
String? phone; //手机号
|
||||
String? code; //验证码
|
||||
|
||||
String? register_code;
|
||||
|
||||
bool? showPd = true;
|
||||
|
||||
int? forceLogin = 0;
|
||||
|
||||
bool? isIos; //是否为ios设备
|
||||
|
||||
bool? isWeChatNotInstalled; //是否安装微信
|
||||
|
||||
LoginModel();
|
||||
|
||||
static LoginModel fromJson(Map<String, dynamic> json) =>
|
||||
_$LoginModelFromJson(json);
|
||||
Map<String, dynamic> toJson() => _$LoginModelToJson(this);
|
||||
}
|
||||
|
||||
class MHTLoginController extends GetControllerEx<LoginModel> {
|
||||
// 初始化实例
|
||||
final Fluwx fluwx = Fluwx();
|
||||
// 微信监听返回值
|
||||
FluwxCancelable? fluwxCancelable;
|
||||
|
||||
MHTLoginController() {
|
||||
attr = GetModel(LoginModel()).obs;
|
||||
}
|
||||
|
||||
MHTRegisterController registerController = Get.find();
|
||||
|
||||
//登录
|
||||
Future<String> login(BuildContext context) async {
|
||||
String message = '';
|
||||
String account = '';
|
||||
String password = '';
|
||||
if (model.loginStyle == null) {
|
||||
message = '请选择登录方式'.tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (model.loginStyle == 1) {
|
||||
//账号登录
|
||||
if (model.account == null || model.account!.isEmpty) {
|
||||
message = '账户不能为空'.tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (model.password == null || model.password!.isEmpty) {
|
||||
message = '密码不能为空'.tr;
|
||||
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
|
||||
return message;
|
||||
}
|
||||
account = model.account!;
|
||||
password = model.password!;
|
||||
}
|
||||
if (model.loginStyle == 2) {
|
||||
//账号登录
|
||||
if (model.phone == null || model.phone!.isEmpty) {
|
||||
message = '请输入手机号'.tr;
|
||||
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (!MyUtils.isValidPhoneNumber(model.phone!)) {
|
||||
message = '请输入正确的手机号'.tr;
|
||||
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (model.code == null || model.code!.isEmpty) {
|
||||
message = '验证码不能为空'.tr;
|
||||
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
account = model.phone!;
|
||||
password = model.code!;
|
||||
}
|
||||
|
||||
if (registerController.model.register_agree == null ||
|
||||
registerController.model.register_agree != true) {
|
||||
message = "需要同意协议".tr;
|
||||
showToast(message);
|
||||
return message;
|
||||
}
|
||||
model.forceLogin = 0;
|
||||
return message;
|
||||
}
|
||||
|
||||
Future<String> getCode(BuildContext context) async {
|
||||
String message = "";
|
||||
if (registerController.model.register_agree == null ||
|
||||
registerController.model.register_agree != true) {
|
||||
message = "需要同意协议".tr;
|
||||
showToast(message);
|
||||
return message;
|
||||
}
|
||||
if (model.phone == null || model.phone!.isEmpty) {
|
||||
message = "请输入手机号".tr;
|
||||
showToast(message);
|
||||
return message;
|
||||
}
|
||||
if (!MyUtils.isValidPhoneNumber(model.phone!)) {
|
||||
message = '请输入正确的手机号'.tr;
|
||||
showToast(message);
|
||||
return message;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
//微信登录
|
||||
Future<void> wxLoginSendAuth() async {
|
||||
/*
|
||||
1、目前移动应用上微信登录只提供原生的登录方式,需要用户安装微信客户端才能配合使用。
|
||||
2、对于Android应用,建议总是显示微信登录按钮,当用户手机没有安装微信客户端时,请引导用户下载安装微信客户端。
|
||||
3、对于iOS应用,考虑到iOS应用商店审核指南中的相关规定,建议开发者接入微信登录时,先检测用户手机是否已安装微信客户端
|
||||
(使用sdk中isWXAppInstalled函数 ),对未安装的用户隐藏微信登录按钮,只提供其他登录方式(比如手机号注册登录、游客登录等)
|
||||
*/
|
||||
if (isAndroid) {
|
||||
bool isWeChatInstalled = await fluwx.isWeChatInstalled;
|
||||
debugPrint('is wechat installed: $isWeChatInstalled');
|
||||
if (!isWeChatInstalled) {
|
||||
showToast("请先安装微信APP,再使用微信登录");
|
||||
return;
|
||||
}
|
||||
}
|
||||
fluwx
|
||||
.authBy(
|
||||
which: NormalAuth(
|
||||
scope: 'snsapi_userinfo',
|
||||
state: 'wechat_sdk_zhmht_wxlogin',
|
||||
))
|
||||
.then((data) {
|
||||
//返回true表示成功或者false表示失败,这边没有意义从login_controller页面构造函数监听中去处理
|
||||
debugPrint('msg:$data');
|
||||
});
|
||||
}
|
||||
|
||||
//退出登录
|
||||
Future<void> logout() async {
|
||||
// await repository.logout();
|
||||
}
|
||||
|
||||
loginByWechatCode(String code) async {
|
||||
// return await repository.loginByWechatCode(code);
|
||||
}
|
||||
|
||||
//注销账号
|
||||
deletedAccount() async {
|
||||
// return await repository.deletedAccount();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'mht_login_controller.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// JsonSerializableGenerator
|
||||
// **************************************************************************
|
||||
|
||||
LoginModel _$LoginModelFromJson(Map<String, dynamic> json) => LoginModel()
|
||||
..loginStyle = (json['loginStyle'] as num?)?.toInt()
|
||||
..account = json['account'] as String?
|
||||
..password = json['password'] as String?
|
||||
..phone = json['phone'] as String?
|
||||
..code = json['code'] as String?
|
||||
..register_code = json['register_code'] as String?
|
||||
..showPd = json['showPd'] as bool?
|
||||
..forceLogin = (json['forceLogin'] as num?)?.toInt()
|
||||
..isIos = json['isIos'] as bool?
|
||||
..isWeChatNotInstalled = json['isWeChatNotInstalled'] as bool?;
|
||||
|
||||
Map<String, dynamic> _$LoginModelToJson(LoginModel instance) =>
|
||||
<String, dynamic>{
|
||||
'loginStyle': instance.loginStyle,
|
||||
'account': instance.account,
|
||||
'password': instance.password,
|
||||
'phone': instance.phone,
|
||||
'code': instance.code,
|
||||
'register_code': instance.register_code,
|
||||
'showPd': instance.showPd,
|
||||
'forceLogin': instance.forceLogin,
|
||||
'isIos': instance.isIos,
|
||||
'isWeChatNotInstalled': instance.isWeChatNotInstalled,
|
||||
};
|
||||
131
lib/pages/mh_page/user/controller/mht_register_controller.dart
Normal file
131
lib/pages/mh_page/user/controller/mht_register_controller.dart
Normal file
@@ -0,0 +1,131 @@
|
||||
import 'package:ef/ef.dart';
|
||||
import 'package:flutter/src/widgets/framework.dart';
|
||||
import 'package:json_annotation/json_annotation.dart';
|
||||
import 'package:vbvs_app/common/util/MyUtils.dart';
|
||||
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
|
||||
|
||||
part 'mht_register_controller.g.dart';
|
||||
|
||||
@JsonSerializable()
|
||||
class RegisterModel {
|
||||
String? register_phone; //注册手机号
|
||||
String? register_pd; //注册密码
|
||||
String? register_confirm_pd; //注册确认密码
|
||||
String? register_code; //注册验证码
|
||||
|
||||
bool? register_agree = false; //注册协议
|
||||
bool? save_password = false; //记住密码
|
||||
|
||||
bool? pdshow = true; //是否显示密码
|
||||
bool? cpdshow = true; //是否显示密码
|
||||
|
||||
RegisterModel();
|
||||
static RegisterModel fromJson(Map<String, dynamic> json) =>
|
||||
_$RegisterModelFromJson(json);
|
||||
Map<String, dynamic> toJson() => _$RegisterModelToJson(this);
|
||||
}
|
||||
|
||||
class MHTRegisterController extends GetControllerEx<RegisterModel> {
|
||||
MHTRegisterController() {
|
||||
attr = GetModel(RegisterModel()).obs;
|
||||
}
|
||||
|
||||
Future<String> registerUser(BuildContext context) async {
|
||||
String message = "";
|
||||
if (model.register_phone == null || model.register_phone!.isEmpty) {
|
||||
message = "请输入手机号".tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (!MyUtils.isValidPhoneNumber(model.register_phone!)) {
|
||||
message = '请输入正确的手机号'.tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (model.register_pd == null || model.register_pd!.isEmpty) {
|
||||
message = "请输入密码".tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
String passwordMsg = "密码格式提示".tr;
|
||||
bool hasUppercase = model.register_pd!.contains(RegExp(r'[A-Z]'));
|
||||
bool hasDigit = model.register_pd!.contains(RegExp(r'[0-9]'));
|
||||
bool hasSpecialCharacters =
|
||||
model.register_pd!.contains(RegExp(r'[!@#$%^&*(),.?":{}|<>]'));
|
||||
bool hasLetter = model.register_pd!.contains(RegExp(r'[a-zA-Z]'));
|
||||
|
||||
if (model.register_pd!.length < 8) {
|
||||
message = passwordMsg;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
|
||||
if (!hasLetter || !hasDigit) {
|
||||
message = passwordMsg;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
|
||||
if (!(hasSpecialCharacters || hasUppercase)) {
|
||||
message = passwordMsg;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (model.register_confirm_pd == null ||
|
||||
model.register_confirm_pd!.isEmpty) {
|
||||
message = "请输入确认密码".tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (model.register_pd != model.register_confirm_pd) {
|
||||
message = "两次密码不一致".tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (model.register_code == null || model.register_code!.isEmpty) {
|
||||
message = "请输入验证码".tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (model.register_agree == null || model.register_agree != true) {
|
||||
message = "需要同意协议".tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
// message = await repository.createUser(
|
||||
// model.register_pd!, model.register_phone!, model.register_code!);
|
||||
// if (message.isNotEmpty) {
|
||||
// showToast(message);
|
||||
// return message;
|
||||
// }
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
Future<String> getCode(BuildContext context) async {
|
||||
String message = "";
|
||||
if (model.register_phone == null || model.register_phone!.isEmpty) {
|
||||
message = "请输入手机号".tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
if (!MyUtils.isValidPhoneNumber(model.register_phone!)) {
|
||||
message = '请输入正确的手机号'.tr;
|
||||
TopSlideNotification.show(context,
|
||||
text: message, textColor: stringToColor("#FF7159"));
|
||||
return message;
|
||||
}
|
||||
return '';
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'mht_register_controller.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// JsonSerializableGenerator
|
||||
// **************************************************************************
|
||||
|
||||
RegisterModel _$RegisterModelFromJson(Map<String, dynamic> json) =>
|
||||
RegisterModel()
|
||||
..register_phone = json['register_phone'] as String?
|
||||
..register_pd = json['register_pd'] as String?
|
||||
..register_confirm_pd = json['register_confirm_pd'] as String?
|
||||
..register_code = json['register_code'] as String?
|
||||
..register_agree = json['register_agree'] as bool?
|
||||
..pdshow = json['pdshow'] as bool?
|
||||
..cpdshow = json['cpdshow'] as bool?;
|
||||
|
||||
Map<String, dynamic> _$RegisterModelToJson(RegisterModel instance) =>
|
||||
<String, dynamic>{
|
||||
'register_phone': instance.register_phone,
|
||||
'register_pd': instance.register_pd,
|
||||
'register_confirm_pd': instance.register_confirm_pd,
|
||||
'register_code': instance.register_code,
|
||||
'register_agree': instance.register_agree,
|
||||
'pdshow': instance.pdshow,
|
||||
'cpdshow': instance.cpdshow,
|
||||
};
|
||||
@@ -58,7 +58,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
children: [
|
||||
// 中间居中的标题
|
||||
Text(
|
||||
'找回密码',
|
||||
'找回密码'.tr,
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
color: Colors.white,
|
||||
@@ -84,9 +84,6 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
children: [
|
||||
// TitleComponentWidget(
|
||||
// titleName: '找回密码',
|
||||
// ),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: EdgeInsetsDirectional.fromSTEB(
|
||||
@@ -134,17 +131,17 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
hintText: '请输入手机号',
|
||||
hintText: '请输入手机号'.tr,
|
||||
hintStyle: FlutterFlowTheme.of(
|
||||
context)
|
||||
.labelMedium
|
||||
.override(
|
||||
fontFamily: 'Readex Pro',
|
||||
color: Color(0xFF929699),
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
enabledBorder: InputBorder.none,
|
||||
@@ -155,7 +152,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
contentPadding:
|
||||
EdgeInsetsDirectional
|
||||
.fromSTEB(20.rpx, 0, 0,
|
||||
10.rpx),
|
||||
0.rpx),
|
||||
),
|
||||
style:
|
||||
FlutterFlowTheme.of(context)
|
||||
@@ -163,7 +160,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
),
|
||||
@@ -216,7 +213,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
letterSpacing:
|
||||
0,
|
||||
),
|
||||
hintText: '请输验证码',
|
||||
hintText: '请输验证码'.tr,
|
||||
hintStyle:
|
||||
FlutterFlowTheme.of(
|
||||
context)
|
||||
@@ -227,7 +224,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
color: Color(
|
||||
0xFF929699),
|
||||
fontSize:
|
||||
20.rpx,
|
||||
26.rpx,
|
||||
letterSpacing:
|
||||
0,
|
||||
),
|
||||
@@ -242,7 +239,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
contentPadding:
|
||||
EdgeInsetsDirectional
|
||||
.fromSTEB(20.rpx,
|
||||
0, 0, 10.rpx),
|
||||
0, 0, 0.rpx),
|
||||
),
|
||||
style: FlutterFlowTheme.of(
|
||||
context)
|
||||
@@ -250,7 +247,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
),
|
||||
@@ -259,18 +256,19 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
),
|
||||
Align(
|
||||
alignment: AlignmentDirectional(
|
||||
0.2, 0.3),
|
||||
0.4, 0.1),
|
||||
child: Container(
|
||||
width: 3,
|
||||
height: 30,
|
||||
width: 1.rpx,
|
||||
height: 38.rpx,
|
||||
decoration: BoxDecoration(
|
||||
color: Color(0xFFCCCCCC),
|
||||
color:
|
||||
stringToColor("#929699"),
|
||||
),
|
||||
),
|
||||
),
|
||||
Align(
|
||||
alignment:
|
||||
AlignmentDirectional(0.9, 0),
|
||||
AlignmentDirectional(1.2, 0),
|
||||
child: Container(
|
||||
width:
|
||||
bodysize!.maxWidth * 0.157,
|
||||
@@ -326,10 +324,9 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
.value ==
|
||||
0
|
||||
? '获取验证码'
|
||||
: '${countdownController.countdown.value}秒',
|
||||
: '${countdownController.countdown.value}' +
|
||||
'秒'.tr,
|
||||
style: TextStyle(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
color:
|
||||
Color(0xFF333333),
|
||||
fontSize: 20.rpx,
|
||||
@@ -381,10 +378,10 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
hintText: '请输入新密码',
|
||||
hintText: '请输入新密码'.tr,
|
||||
hintStyle: FlutterFlowTheme
|
||||
.of(context)
|
||||
.labelMedium
|
||||
@@ -393,7 +390,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
'Readex Pro',
|
||||
color:
|
||||
Color(0xFF929699),
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
enabledBorder:
|
||||
@@ -406,7 +403,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
contentPadding:
|
||||
EdgeInsetsDirectional
|
||||
.fromSTEB(
|
||||
10, 10, 0, 0),
|
||||
10, 26.rpx, 0, 0),
|
||||
suffixIcon: IconButton(
|
||||
icon: Icon(
|
||||
// 根据 pdshow 控制图标
|
||||
@@ -431,7 +428,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
);
|
||||
@@ -477,7 +474,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
hintText: '确认新密码',
|
||||
@@ -489,7 +486,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
'Readex Pro',
|
||||
color:
|
||||
Color(0xFF929699),
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
enabledBorder:
|
||||
@@ -502,7 +499,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
contentPadding:
|
||||
EdgeInsetsDirectional
|
||||
.fromSTEB(
|
||||
10, 10, 0, 0),
|
||||
10, 26.rpx, 0, 0),
|
||||
suffixIcon: IconButton(
|
||||
icon: Icon(
|
||||
// 根据 pdshow 控制图标
|
||||
@@ -527,7 +524,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
);
|
||||
@@ -608,7 +605,7 @@ class FindPasswordPage extends GetView<FindPasswordController> {
|
||||
fontFamily: 'Readex Pro',
|
||||
color: Color(0XFF003058),
|
||||
letterSpacing: 0,
|
||||
fontSize: 30.rpx,
|
||||
fontSize: 26.rpx,
|
||||
),
|
||||
),
|
||||
),
|
||||
2151
lib/pages/mh_page/user/page/mht_login_page.dart
Normal file
2151
lib/pages/mh_page/user/page/mht_login_page.dart
Normal file
File diff suppressed because it is too large
Load Diff
@@ -12,36 +12,11 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
BoxConstraints? bodysize;
|
||||
|
||||
final ScrollController _scrollController = ScrollController();
|
||||
// final FocusNode _focusNode1 = FocusNode();
|
||||
// final FocusNode _focusNode2 = FocusNode();
|
||||
// final FocusNode _focusNode3 = FocusNode();
|
||||
// final FocusNode _focusNode4 = FocusNode();
|
||||
|
||||
RegisterPage() {
|
||||
controller.model.pdshow = true;
|
||||
controller.model.cpdshow = true;
|
||||
Get.put(RegisterController());
|
||||
|
||||
// _focusNode1.addListener(() {
|
||||
// if (_focusNode1.hasFocus) {
|
||||
// MyUtils.scrollToFocusedInput(_focusNode1, _scrollController);
|
||||
// }
|
||||
// });
|
||||
// _focusNode2.addListener(() {
|
||||
// if (_focusNode2.hasFocus) {
|
||||
// MyUtils.scrollToFocusedInput(_focusNode2, _scrollController);
|
||||
// }
|
||||
// });
|
||||
// _focusNode3.addListener(() {
|
||||
// if (_focusNode3.hasFocus) {
|
||||
// MyUtils.scrollToFocusedInput(_focusNode3, _scrollController);
|
||||
// }
|
||||
// });
|
||||
// _focusNode4.addListener(() {
|
||||
// if (_focusNode4.hasFocus) {
|
||||
// MyUtils.scrollToFocusedInput(_focusNode4, _scrollController);
|
||||
// }
|
||||
// });
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -146,17 +121,17 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
.labelMedium
|
||||
.override(
|
||||
fontFamily: 'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
hintText: '请输入手机号',
|
||||
hintText: '请输入手机号'.tr,
|
||||
hintStyle:
|
||||
FlutterFlowTheme.of(context)
|
||||
.labelMedium
|
||||
.override(
|
||||
fontFamily: 'Readex Pro',
|
||||
color: Color(0xFF929699),
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
enabledBorder: InputBorder.none,
|
||||
@@ -172,7 +147,7 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
.bodyMedium
|
||||
.override(
|
||||
fontFamily: 'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
),
|
||||
@@ -214,17 +189,17 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
hintText: '请输入密码',
|
||||
hintText: '请输入密码'.tr,
|
||||
hintStyle: FlutterFlowTheme.of(
|
||||
context)
|
||||
.labelMedium
|
||||
.override(
|
||||
fontFamily: 'Readex Pro',
|
||||
color: Color(0xFF929699),
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
enabledBorder: InputBorder.none,
|
||||
@@ -234,8 +209,8 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
InputBorder.none,
|
||||
contentPadding:
|
||||
EdgeInsetsDirectional
|
||||
.fromSTEB(20.rpx,
|
||||
20.rpx, 0, 0),
|
||||
.fromSTEB(
|
||||
10, 26.rpx, 0, 0),
|
||||
suffixIcon: IconButton(
|
||||
icon: Icon(
|
||||
// 根据 pdshow 控制图标
|
||||
@@ -260,7 +235,7 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
);
|
||||
@@ -303,17 +278,17 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
hintText: '确认密码',
|
||||
hintText: '请输入确认密码'.tr,
|
||||
hintStyle: FlutterFlowTheme.of(
|
||||
context)
|
||||
.labelMedium
|
||||
.override(
|
||||
fontFamily: 'Readex Pro',
|
||||
color: Color(0xFF929699),
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
enabledBorder: InputBorder.none,
|
||||
@@ -323,8 +298,8 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
InputBorder.none,
|
||||
contentPadding:
|
||||
EdgeInsetsDirectional
|
||||
.fromSTEB(20.rpx,
|
||||
20.rpx, 0, 0),
|
||||
.fromSTEB(
|
||||
10, 26.rpx, 0, 0),
|
||||
suffixIcon: IconButton(
|
||||
icon: Icon(
|
||||
// 根据 pdshow 控制图标
|
||||
@@ -349,7 +324,7 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
);
|
||||
@@ -395,10 +370,10 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
hintText: '请输验证码',
|
||||
hintText: '请输入验证码',
|
||||
hintStyle: FlutterFlowTheme
|
||||
.of(context)
|
||||
.labelMedium
|
||||
@@ -407,7 +382,7 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
'Readex Pro',
|
||||
color:
|
||||
Color(0xFF929699),
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
enabledBorder:
|
||||
@@ -420,7 +395,7 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
contentPadding:
|
||||
EdgeInsetsDirectional
|
||||
.fromSTEB(20.rpx, 0,
|
||||
0, 10.rpx),
|
||||
0, 0.rpx),
|
||||
),
|
||||
style:
|
||||
FlutterFlowTheme.of(context)
|
||||
@@ -428,7 +403,7 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
fontSize: 20.rpx,
|
||||
fontSize: 26.rpx,
|
||||
letterSpacing: 0,
|
||||
),
|
||||
),
|
||||
@@ -437,18 +412,18 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
),
|
||||
Align(
|
||||
alignment:
|
||||
AlignmentDirectional(0.2, 0.1),
|
||||
AlignmentDirectional(0.4, 0.1),
|
||||
child: Container(
|
||||
width: 3,
|
||||
height: 30,
|
||||
width: 1.rpx,
|
||||
height: 38.rpx,
|
||||
decoration: BoxDecoration(
|
||||
color: Color(0xFFCCCCCC),
|
||||
color: stringToColor("#929699"),
|
||||
),
|
||||
),
|
||||
),
|
||||
Align(
|
||||
alignment:
|
||||
AlignmentDirectional(0.9, 0),
|
||||
AlignmentDirectional(1.2, 0),
|
||||
child: Container(
|
||||
width: bodysize!.maxWidth * 0.157,
|
||||
height: bodysize!.maxHeight * 0.014,
|
||||
@@ -500,8 +475,9 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
.countdown
|
||||
.value ==
|
||||
0
|
||||
? '获取验证码'
|
||||
: '${countdownController.countdown.value}秒',
|
||||
? '获取验证码'.tr
|
||||
: '${countdownController.countdown.value}' +
|
||||
'秒'.tr,
|
||||
style: TextStyle(
|
||||
fontFamily: 'Readex Pro',
|
||||
color: Color(0xFF333333),
|
||||
@@ -652,7 +628,7 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
AlignmentDirectional(
|
||||
0, 0),
|
||||
child: Text(
|
||||
'我已阅读并同意',
|
||||
'我已阅读并同意'.tr,
|
||||
style: FlutterFlowTheme
|
||||
.of(context)
|
||||
.bodyMedium
|
||||
@@ -679,15 +655,15 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
"/#/pages/agreement/agreement?type=2&hideHead=true");
|
||||
},
|
||||
child: Text(
|
||||
'《用户协议》',
|
||||
'《用户协议》'.tr,
|
||||
style: FlutterFlowTheme
|
||||
.of(context)
|
||||
.bodyMedium
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
color: Color(
|
||||
0xFF1890FF),
|
||||
color: stringToColor(
|
||||
"FF9F66"),
|
||||
fontSize: 12,
|
||||
letterSpacing:
|
||||
0,
|
||||
@@ -700,7 +676,7 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
AlignmentDirectional(
|
||||
0, 0),
|
||||
child: Text(
|
||||
'与',
|
||||
'与'.tr,
|
||||
style: FlutterFlowTheme
|
||||
.of(context)
|
||||
.bodyMedium
|
||||
@@ -727,15 +703,15 @@ class RegisterPage extends GetView<RegisterController> {
|
||||
"/#/pages/agreement/agreement?type=1&hideHead=true");
|
||||
},
|
||||
child: Text(
|
||||
'《隐私协议》',
|
||||
'《隐私协议》'.tr,
|
||||
style: FlutterFlowTheme
|
||||
.of(context)
|
||||
.bodyMedium
|
||||
.override(
|
||||
fontFamily:
|
||||
'Readex Pro',
|
||||
color: Color(
|
||||
0xFF1890FF),
|
||||
color: stringToColor(
|
||||
"FF9F66"),
|
||||
fontSize: 12,
|
||||
letterSpacing:
|
||||
0,
|
||||
Reference in New Issue
Block a user