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

更新ui

Browse Source
This commit is contained in:
wyf
2025-08-18 18:19:56 +08:00
parent 111bd78a24
commit e5e405f205
23 changed files with 337 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,8 @@ 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';
import 'package:vbvs_app/controller/user_info_controller.dart';
import 'package:vbvs_app/pages/common/selectDialog.dart';
import 'package:vbvs_app/pages/mh_page/user/controller/mht_login_controller.dart';
import 'package:vbvs_app/pages/mh_page/user/controller/mht_register_controller.dart';
@@ -119,17 +121,6 @@ class MHTLoginPage extends GetView<MHTLoginController> {
@override
Widget build(BuildContext context) {
MHTRegisterController registerController = Get.find();
bool isProgrammaticPop = false; // 标记变量
Future.delayed(const Duration(milliseconds: 300), () {
String? isShowYingShiDialog = getStorage.read("isShowYingShiDialog");
if (isShowYingShiDialog == null || isShowYingShiDialog != "true") {
String btnName = "同意".tr;
String cancelName = "取消".tr;
if (Platform.isAndroid) {
cancelName = "退出".tr;
}
}
});
return LayoutBuilder(builder: (context, cc) {
bodysize = cc;
@@ -176,21 +167,21 @@ class MHTLoginPage extends GetView<MHTLoginController> {
),
body: PopScope(
canPop: false,
onPopInvokedWithResult: (disposition, result) async {
if (isProgrammaticPop) {
// 如果是程序触发，重置标记并忽略
isProgrammaticPop = false;
return; // 阻止处理
}
// onPopInvokedWithResult: (disposition, result) async {
// if (isProgrammaticPop) {
// // 如果是程序触发，重置标记并忽略
// isProgrammaticPop = false;
// return; // 阻止处理
// }
if (Platform.isAndroid) {
// var flag = await _handleBackPressed(context); // 自定义返回逻辑
// if (flag) {
// SystemNavigator.pop();
// }
Get.back();
}
},
// if (Platform.isAndroid) {
// // var flag = await _handleBackPressed(context); // 自定义返回逻辑
// // if (flag) {
// // SystemNavigator.pop();
// // }
// Get.back();
// }
// },
child: Align(
alignment: AlignmentDirectional(0, 0),
child: Container(
@@ -1258,8 +1249,10 @@ class MHTLoginPage extends GetView<MHTLoginController> {
controller.fluwxCancelable
?.cancel();
Checknetwork.subscription?.cancel();
isProgrammaticPop = true;
UserInfoController
userInfoController = Get.find();
userInfoController
.model.isProgrammaticPop = true;
MHTLoginController loginController =
Get.find();
loginController.model.account =
@@ -1445,14 +1438,6 @@ class MHTLoginPage extends GetView<MHTLoginController> {
0, 0),
child: InkWell(
onTap: () {
// showCustomConfirmOfWebViewDialog(
// context,
// "用户协议",
// "/#/pages/agreement/agreement?type=2&hideHead=true",
// btnName:
// "同意并继续");
// Get.toNamed(
// "/userAgreementPage");
Get.toNamed(
"/userPolicyPageNew",
arguments:
@@ -1497,14 +1482,6 @@ class MHTLoginPage extends GetView<MHTLoginController> {
0, 0),
child: InkWell(
onTap: () {
// showCustomConfirmOfWebViewDialog(
// context,
// "隐私协议",
// "/#/pages/agreement/agreement?type=1&hideHead=true",
// btnName:
// "同意并继续");
// Get.toNamed(
// "/privacyPolicyPage");
Get.toNamed(
"/privacyPolicyPageNew",
arguments:

16
lib/pages/mh_page/user/page/register_page.dart
View File

@@ -948,13 +948,7 @@ class RegisterPage extends GetView<MHTRegisterController> {
AlignmentDirectional(
0, 0),
child: InkWell(
onTap: () {
// showCustomConfirmOfWebViewDialog(
// context,
// "用户协议",
// "/#/pages/agreement/agreement?type=2&hideHead=true");
// Get.toNamed(
// "/userAgreementPage");
onTap: () {
Get.toNamed(
"/userPolicyPageNew",
arguments:
@@ -995,13 +989,7 @@ class RegisterPage extends GetView<MHTRegisterController> {
AlignmentDirectional(
0, 0),
child: InkWell(
onTap: () {
// showCustomConfirmOfWebViewDialog(
// context,
// "隐私协议",
// "/#/pages/agreement/agreement?type=1&hideHead=true");
// Get.toNamed(
// "/privacyPolicyPage");
onTap: () {
Get.toNamed(
"/privacyPolicyPageNew",
arguments: