diff --git a/lib/controller/mine/teenager_mode_open_controller.dart b/lib/controller/mine/teenager_mode_open_controller.dart index 9edebbb..54868ba 100644 --- a/lib/controller/mine/teenager_mode_open_controller.dart +++ b/lib/controller/mine/teenager_mode_open_controller.dart @@ -1,4 +1,6 @@ import 'package:dating_touchme_app/controller/global.dart'; +import 'package:dating_touchme_app/pages/main/main_page.dart'; +import 'package:dating_touchme_app/pages/setting/teenager_mode_page.dart'; import 'package:flutter/material.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:get/get.dart'; @@ -33,7 +35,7 @@ class TeenagerModeOpenController extends GetxController { GlobalData().teenagerMode = true; await storage.write('teenagerMode', true); await storage.write('teenagerPassword', confirmPassword.value); - Get.back(); + Get.offAll(() => TeenagerModePage()); } } @@ -49,7 +51,7 @@ class TeenagerModeOpenController extends GetxController { GlobalData().teenagerMode = false; await storage.write('teenagerMode', false); await storage.write('teenagerPassword', ""); - Get.back(); + Get.offAll(() => MainPage()); } } } \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 0026c02..41199c0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -7,6 +7,7 @@ import 'package:dating_touchme_app/im/im_manager.dart'; import 'package:dating_touchme_app/network/network_service.dart'; import 'package:dating_touchme_app/pages/main/main_page.dart'; import 'package:dating_touchme_app/pages/mine/login_page.dart'; +import 'package:dating_touchme_app/pages/setting/teenager_mode_page.dart'; import 'package:dating_touchme_app/rtc/rtc_manager.dart'; import 'package:dating_touchme_app/widget/live/draggable_overlay_widget.dart'; import 'package:flutter/material.dart'; @@ -222,11 +223,12 @@ class _MyAppState extends State { final storage = GetStorage(); final userId = storage.read('userId'); final teenagerMode = storage.read('teenagerMode') ?? false; - - // 如果token不为空,显示主页;如果token为空,显示登录页面 - if (userId != null && userId.isNotEmpty) { + GlobalData().teenagerMode = teenagerMode; + if(teenagerMode){ + return TeenagerModePage(); + } else if (userId != null && userId.isNotEmpty) { + // 如果token不为空,显示主页;如果token为空,显示登录页面 GlobalData().userId = userId; - GlobalData().teenagerMode = teenagerMode; return MainPage(); } else { return LoginPage(); diff --git a/lib/pages/mine/user_help_center_page.dart b/lib/pages/mine/user_help_center_page.dart index 85d411c..f2372a2 100644 --- a/lib/pages/mine/user_help_center_page.dart +++ b/lib/pages/mine/user_help_center_page.dart @@ -50,10 +50,8 @@ class _UserHelpCenterPageState extends State { Widget build(BuildContext context) { return Stack( children: [ - Positioned( + Positioned.fill( child: Container( - width: 375.w, - height: 821.h, color: Colors.white, ), ), diff --git a/lib/pages/mine/vip_page.dart b/lib/pages/mine/vip_page.dart index 668868d..5d92208 100644 --- a/lib/pages/mine/vip_page.dart +++ b/lib/pages/mine/vip_page.dart @@ -42,11 +42,10 @@ class _VipPageState extends State { @override Widget build(BuildContext context) { return Stack( + children: [ - Positioned( + Positioned.fill( child: Container( - width: 375.w, - height: 812.h, color: Colors.white, ), ), @@ -216,31 +215,6 @@ class _VipPageState extends State { }), ], ), - Row( - children: [ - - Checkbox( - value: checked, - onChanged: (value) { - checked = value ?? false; - setState(() { - - }); - }, - activeColor: const Color.fromRGBO(117, 98, 249, 1), - side: const BorderSide(color: Colors.grey), - shape: const CircleBorder(), - materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, - ), - Text( - "我已阅读并同意《会员购买协议》", - style: TextStyle( - fontSize: 11.w, - color: const Color.fromRGBO(189, 189, 189, 1) - ), - ) - ], - ), Row( children: [ Text( @@ -388,7 +362,7 @@ class _VipPageState extends State { }); }), Container( - width: 80.w, + width: 100.w, height: 30.w, padding: EdgeInsets.symmetric( horizontal: 12.w @@ -410,7 +384,7 @@ class _VipPageState extends State { width: 17.w, ), Text( - "支付宝", + "支付宝支付", style: TextStyle( fontSize: 11.w, fontWeight: FontWeight.w500 @@ -426,7 +400,31 @@ class _VipPageState extends State { }), ], ), - SizedBox(height: 10.w,), + Row( + children: [ + + Checkbox( + value: checked, + onChanged: (value) { + checked = value ?? false; + setState(() { + + }); + }, + activeColor: const Color.fromRGBO(117, 98, 249, 1), + side: const BorderSide(color: Colors.grey), + shape: const CircleBorder(), + materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, + ), + Text( + "我已阅读并同意《会员购买协议》", + style: TextStyle( + fontSize: 11.w, + color: const Color.fromRGBO(189, 189, 189, 1) + ), + ) + ], + ), Container( width: 350.w, height: 45.w,