Merge branch 'master' of http://git.qniao.cn/dating-agency/dating_touchme_app

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());
     }
   }
 }

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<MyApp> {
     final storage = GetStorage();
     final userId = storage.read<String>('userId');
     final teenagerMode = storage.read<bool>('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();

lib/pages/mine/user_help_center_page.dart

@@ -50,10 +50,8 @@ class _UserHelpCenterPageState extends State<UserHelpCenterPage> {
   Widget build(BuildContext context) {
     return Stack(
       children: [
-        Positioned(
+        Positioned.fill(
           child: Container(
-            width: 375.w,
-            height: 821.h,
             color: Colors.white,
           ),
         ),

lib/pages/mine/vip_page.dart

@@ -42,11 +42,10 @@ class _VipPageState extends State<VipPage> {
   @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<VipPage> {
                           }),
                         ],
                       ),
-                      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<VipPage> {
                       });
                     }),
                     Container(
-                      width: 80.w,
+                      width: 100.w,
                       height: 30.w,
                       padding: EdgeInsets.symmetric(
                           horizontal: 12.w
@@ -410,7 +384,7 @@ class _VipPageState extends State<VipPage> {
                             width: 17.w,
                           ),
                           Text(
-                            "支付宝",
+                            "支付宝支付",
                             style: TextStyle(
                                 fontSize: 11.w,
                                 fontWeight: FontWeight.w500
@@ -426,7 +400,31 @@ class _VipPageState extends State<VipPage> {
                     }),
                   ],
                 ),
-                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,