diff --git a/lib/main.dart b/lib/main.dart index 8cddfed..0b49948 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -71,7 +71,11 @@ class MyApp extends StatelessWidget { final storage = GetStorage(); final token = storage.read('token'); - // 如果token为空,显示登录页面,否则显示主页 - return LoginPage(); + // 如果token不为空,显示主页;如果token为空,显示登录页面 + if (token != null && token.isNotEmpty) { + return MainPage(); + } else { + return LoginPage(); + } } } diff --git a/lib/pages/main_page.dart b/lib/pages/main_page.dart index da31f52..dc8e21c 100644 --- a/lib/pages/main_page.dart +++ b/lib/pages/main_page.dart @@ -1,4 +1,9 @@ import 'package:flutter/material.dart'; +import 'package:get/get.dart'; +import 'package:get_storage/get_storage.dart'; +import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; +import 'package:dating_touchme_app/network/user_api.dart'; +import 'package:dating_touchme_app/pages/mine/login_page.dart'; class MainPage extends StatefulWidget { const MainPage({super.key}); @@ -8,6 +13,31 @@ class MainPage extends StatefulWidget { } class _MainPageState extends State { + late UserApi _userApi; + final storage = GetStorage(); + + @override + void initState() { + super.initState(); + // 获取UserApi实例 + _userApi = Get.find(); + + // 检查token并调用获取婚姻信息详情的方法 + checkTokenAndFetchMarriageInfo(); + } + + // 检查token并获取婚姻信息详情 + Future checkTokenAndFetchMarriageInfo() async { + final response = await _userApi.getMarriageInformationDetail(); + if (response.data.isSuccess) { + if (response.data.data == null) { + // 跳转到完善信息页面 + SmartDialog.showToast('跳转到完善信息'); + // 这里可以添加跳转到完善信息页面的逻辑 + } + } + } + @override Widget build(BuildContext context) { return const Placeholder(); diff --git a/lib/pages/mine/login_controller.dart b/lib/pages/mine/login_controller.dart index 4e84a69..4666edb 100644 --- a/lib/pages/mine/login_controller.dart +++ b/lib/pages/mine/login_controller.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'package:dating_touchme_app/pages/main_page.dart'; import 'package:get/get.dart'; import 'package:get_storage/get_storage.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; @@ -112,9 +113,9 @@ class LoginController extends GetxController { if (response.data.data != null) { final loginData = response.data.data!; await storage.write('token', loginData.token); - // await storage.write('userId', loginData.userId); - // // 保存用户信息 - // await storage.write('userInfo', loginData.toJson()); + await storage.write('userId', loginData.userId); + // 保存用户信息 + await storage.write('userInfo', loginData.toJson()); // 登录成功后获取用户基础信息 await _getBaseUserInfo(loginData.userId); @@ -150,17 +151,13 @@ class LoginController extends GetxController { Future _getMarriageInformationDetail() async { try { final response = await _userApi.getMarriageInformationDetail(); - - // 打印响应数据以便调试 - print('响应数据: ${response.data.data}'); - print('数据类型: ${response.data.data.runtimeType}'); - print('数据是否为null: ${response.data.data == null}'); - if (response.data.isSuccess) { // 检查data是否为null或者是空对象 if(response.data.data == null){ //跳转到完善信息 SmartDialog.showToast('跳转到完善信息'); + }else{ + Get.offAll(MainPage()); } } else { // 获取婚姻信息失败不影响登录流程