diff --git a/lib/app/splash_page.dart b/lib/app/splash_page.dart index 8bc50c5..ef72ddd 100644 --- a/lib/app/splash_page.dart +++ b/lib/app/splash_page.dart @@ -57,11 +57,12 @@ class _TransitionViewState extends State { Log.d('Splash getUserInfo 耗时:${apartInMilliseconds}ms'); int duration = max(2000 - apartInMilliseconds, 0); Timer(Duration(milliseconds: duration), () { - if (userEntity != null) { + /*if (userEntity != null) { pushNamedAndRemoveUntil(AppRouteName.home, (route) => false); } else { pushNamedAndRemoveUntil(AppRouteName.login, (route) => false); - } + }*/ + pushNamedAndRemoveUntil(AppRouteName.home, (route) => false); }); } diff --git a/lib/common/dialogs/show_dialog.dart b/lib/common/dialogs/show_dialog.dart index fd4a8e1..8251d60 100644 --- a/lib/common/dialogs/show_dialog.dart +++ b/lib/common/dialogs/show_dialog.dart @@ -3,33 +3,22 @@ import 'package:wow_english/route/route.dart'; import 'customer_dialog.dart'; -void showOneActionDialog( - String title, - String ensureTitle, - String content, - GestureTapCallback ensureTap,{ - bool? barrierDismissible - }) { +void showOneActionDialog(String title, String ensureTitle, String content, GestureTapCallback ensureTap, + {bool? barrierDismissible}) { showDialog( context: AppRouter.context, - barrierDismissible: barrierDismissible??true, - builder: (BuildContext context){ + barrierDismissible: barrierDismissible ?? true, + builder: (BuildContext context) { return CustomerOneActionDialog(title, ensureTitle, content, ensureTap); }); } -void showTwoActionDialog( - String title, - String leftTitle, - String rightTitle, - String content, - GestureTapCallback leftTap, - GestureTapCallback rightTap,{ - bool? barrierDismissible - }) { +void showTwoActionDialog(String title, String leftTitle, String rightTitle, String content, GestureTapCallback leftTap, + GestureTapCallback rightTap, + {bool? barrierDismissible}) { showDialog( context: AppRouter.context, - builder: (BuildContext context){ - return CustomerTwoActionDialog(title,leftTitle,rightTitle,content,leftTap,rightTap); + builder: (BuildContext context) { + return CustomerTwoActionDialog(title, leftTitle, rightTitle, content, leftTap, rightTap); }); -} \ No newline at end of file +} diff --git a/lib/common/request/apis.dart b/lib/common/request/apis.dart index 35e7bd3..9fb2f43 100644 --- a/lib/common/request/apis.dart +++ b/lib/common/request/apis.dart @@ -13,7 +13,7 @@ class Apis { static const String logout = 'logout'; /// 注销账号 - static const String deleteAccount = 'logout'; + static const String deleteAccount = 'student/cancel/account'; /// 获取用户信息 /// get diff --git a/lib/common/request/dao/user_dao.dart b/lib/common/request/dao/user_dao.dart index 408734b..6894f65 100644 --- a/lib/common/request/dao/user_dao.dart +++ b/lib/common/request/dao/user_dao.dart @@ -29,7 +29,7 @@ class UserDao { /// 注销账号 static Future deleteAccount() async { - var result = await requestClient.post(Apis.deleteAccount); + var result = await requestClient.put(Apis.deleteAccount); UserUtil.logout(); return result; }