enchantedwyf/tuiche
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新棉花糖

Browse Source
This commit is contained in:
wyf
2025-06-16 09:32:24 +08:00
parent d8b46c41ad
commit acde8340a8
27 changed files with 6762 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
lib/pages/mh_page/user/controller/mht_login_controller.dart
View File

@@ -19,7 +19,7 @@ part 'mht_login_controller.g.dart';
@JsonSerializable()
class LoginModel {
//版本id
int? loginStyle = 1; //1.密码登录 2.短信登录
int? loginStyle = 1; //1.密码登录 2.短信登录（登录类型: 1:手机号/邮箱+验证码 2:微信一键登录 3:手机号+密码）
String? account = '17649984946'; //账户
// String? account = '13953240733'; //账户
@@ -124,13 +124,20 @@ class MHTLoginController extends GetControllerEx<LoginModel> {
if (registerController.model.register_agree == null ||
registerController.model.register_agree != true) {
message = "需要同意协议".tr;
showToast(message);
TopSlideNotification.show(context,
text: message, textColor: themeController.currentColor.sc9);
return message;
}
int type = 1;
if (model.loginStyle == 1) {
type = 3;
} else if (model.loginStyle == 2) {
type = 1;
}
var data = {
"type": model.loginStyle == 1 ? 3 : 2,
"type": type,
"userName": model.account,
"password": model.password,
"password": password,
};
String serviceAddress = ServiceConstant.service_address;
String serviceName = ServiceConstant.server_service;
@@ -169,20 +176,42 @@ class MHTLoginController extends GetControllerEx<LoginModel> {
if (registerController.model.register_agree == null ||
registerController.model.register_agree != true) {
message = "需要同意协议".tr;
showToast(message);
TopSlideNotification.show(context,
text: message, textColor: themeController.currentColor.sc9);
return message;
}
if (model.phone == null || model.phone!.isEmpty) {
message = "请输入手机号".tr;
showToast(message);
TopSlideNotification.show(context,
text: message, textColor: themeController.currentColor.sc9);
return message;
}
if (!MyUtils.isValidPhoneNumber(model.phone!)) {
message = '请输入正确的手机号'.tr;
showToast(message);
TopSlideNotification.show(context,
text: message, textColor: themeController.currentColor.sc9);
return message;
}
return '';
String serviceAddress = ServiceConstant.service_address;
String serviceName = ServiceConstant.server_service;
String serviceApi = ServiceConstant.send_code;
String queryUrl = "${serviceAddress}${serviceName}${serviceApi}";
var data = {"userName": model.phone, "type": 1};
await requestWithLog(
data: data,
logTitle: "发送验证码",
method: MyHttpMethod.post,
queryUrl: queryUrl,
onSuccess: (res) {
TopSlideNotification.show(context, text: "发送验证码成功".tr);
},
onFailure: (res) {
message = res.msg!;
TopSlideNotification.show(context,
text: message, textColor: themeController.currentColor.sc9);
},
);
return message;
}
//微信登录

2
lib/pages/mh_page/user/controller/mht_register_controller.g.dart
View File

@@ -13,6 +13,7 @@ RegisterModel _$RegisterModelFromJson(Map<String, dynamic> json) =>
..register_confirm_pd = json['register_confirm_pd'] as String?
..register_code = json['register_code'] as String?
..register_agree = json['register_agree'] as bool?
..save_password = json['save_password'] as bool?
..pdshow = json['pdshow'] as bool?
..cpdshow = json['cpdshow'] as bool?;
@@ -23,6 +24,7 @@ Map<String, dynamic> _$RegisterModelToJson(RegisterModel instance) =>
'register_confirm_pd': instance.register_confirm_pd,
'register_code': instance.register_code,
'register_agree': instance.register_agree,
'save_password': instance.save_password,
'pdshow': instance.pdshow,
'cpdshow': instance.cpdshow,
};

45
lib/pages/mh_page/user/page/mht_login_page.dart
View File

@@ -13,6 +13,7 @@ import 'package:vbvs_app/common/util/CheckNetwork.dart';
import 'package:vbvs_app/common/util/CommonVariables.dart';
import 'package:vbvs_app/common/util/FitTool.dart';
import 'package:vbvs_app/common/util/MyUtils.dart';
import 'package:vbvs_app/component/tool/ClickableContainer.dart';
import 'package:vbvs_app/component/tool/CustomCard.dart';
import 'package:vbvs_app/component/tool/TopSlideNotification.dart';
import 'package:vbvs_app/controller/time/countdown_controller.dart';
@@ -947,7 +948,7 @@ class MHTLoginPage extends GetView<MHTLoginController> {
.countdown
.value ==
0
? '获取验证码'
? '获取验证码'.tr
: '${countdownController.countdown.value}' +
'秒'.tr,
style: TextStyle(
@@ -2049,14 +2050,40 @@ class MHTLoginPage extends GetView<MHTLoginController> {
SizedBox(
height: 30.rpx,
),
Container(
width: 90.rpx,
height: 90.rpx,
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage(
'assets/images/wechat.png'), // 本地图片
fit: BoxFit.fill, // 填满整个 Container
ClickableContainer(
backgroundColor: Colors.white, // 背景色
highlightColor: Colors.grey, // 点击水波纹颜色
borderRadius: 999.rpx,
padding: EdgeInsets.zero,
onTap: () async {
//loginController.model.isIos == true &&
// if (loginController
// .model.register_agree ==
// null ||
// loginController
// .model.register_agree !=
// true) {
// TopSlideNotification.show(
// context,
// text: "登录页.未同意协议".tr,
// textColor:
// themeController.currentColor.sc9,
// );
// return;
// }
// await loginController
// .wxLoginSendAuth(context);
TopSlideNotification.show(context,text: "测试阶段,暂不支持".tr);
},
child: Container(
width: 90.rpx,
height: 90.rpx,
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage(
'assets/images/wechat.png'), // 本地图片
fit: BoxFit.fill, // 填满整个 Container
),
),
),
),