Browse Source

[fix]修复谈话详情登录问题

zk 1 year ago
parent
commit
19e4151a6b

+ 1 - 1
assets/string/base/string.xml

@@ -122,7 +122,7 @@
     <string name="store_pay_error">支付失败,请稍后重试</string>
     <string name="store_query_pay_state">正在查询订单状态..</string>
     <string name="store_pay_success">充电成功</string>
-    <string name="talk_summary_todo_title">所有待办</string>
+    <string name="talk_summary_todo_title">我的待办</string>
     <string name="exit_app_tip">再按一次退出应用</string>
     <string name="popup_nearly_a_week">近一周</string>
     <string name="popup_nearly_two_week">近两周</string>

+ 5 - 0
lib/module/home/controller.dart

@@ -23,6 +23,7 @@ import '../../data/repositories/account_repository.dart';
 import '../../resource/colors.gen.dart';
 import '../../utils/error_handler.dart';
 import '../../utils/toast_util.dart';
+import '../agenda/detail/view.dart';
 import '../audiopicker/view.dart';
 
 class HomePageController extends BaseController {
@@ -163,4 +164,8 @@ class HomePageController extends BaseController {
         barrierColor: ColorName.black55,
         backgroundColor: ColorName.transparent);
   }
+
+  void onAgendaItemClick(Agenda item) {
+    AgendaDetailPage.start(item);
+  }
 }

+ 1 - 4
lib/module/home/view.dart

@@ -16,12 +16,9 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:get/get.dart';
-
 import '../../data/bean/agenda.dart';
 import '../../router/app_pages.dart';
-import '../agenda/detail/view.dart';
 import '../agenda/task_item_view.dart';
-import '../talk/view.dart';
 import 'controller.dart';
 
 class HomePage extends BasePage<HomePageController> {
@@ -388,7 +385,7 @@ class HomePage extends BasePage<HomePageController> {
       Agenda item = controller.agendaList[index];
       return GestureDetector(
         onTap: () {
-          AgendaDetailPage.start(item);
+          controller.onAgendaItemClick(item);
         },
         child: taskItemView(
           item,

+ 5 - 1
lib/module/talk/controller.dart

@@ -552,11 +552,15 @@ class TalkController extends BaseController {
     }
   }
 
+  void backToSpecificPage(String targetRoute) {
+    Get.until((route) => Get.currentRoute == targetRoute);
+  }
+
   Future<bool> checkLogin() async {
     if (!accountRepository.isLogin.value) {
       bool isLogin = await LoginPage.start(fromType: LoginFromType.talkDetail);
       if (isLogin) {
-        Get.offNamed(RoutePath.mainTab);
+        backToSpecificPage(RoutePath.mainTab);
       }
       return false;
     }