领取任务单增加弹窗确认;

lib/main.dart

@@ -56,6 +56,7 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    var theme = Theme.of(context);
     return MaterialApp(
       title: '粮食质量管理${kReleaseMode ? '' : '-测试'}',
       theme: ThemeData(
@@ -70,11 +71,24 @@ class MyApp extends StatelessWidget {
           backgroundColor: Colors.transparent,
           systemOverlayStyle: SystemUiOverlayStyle.light,
         ),
-        bottomSheetTheme: const BottomSheetThemeData(
+        bottomSheetTheme: theme.bottomSheetTheme.copyWith(
           backgroundColor: Colors.white,
           modalBackgroundColor: Colors.white,
           surfaceTintColor: Colors.white,
         ),
+        dialogTheme: theme.dialogTheme.copyWith(
+          backgroundColor: Colors.white,
+          surfaceTintColor: Colors.white,
+          titleTextStyle: const TextStyle(
+            fontSize: 16,
+            color: MyColor.c_333333,
+            fontWeight: FontWeight.w500,
+          ),
+          contentTextStyle: const TextStyle(
+            fontSize: 14,
+            color: MyColor.c_666666,
+          ),
+        ),
         useMaterial3: true,
       ),
       builder: FlutterSmartDialog.init(),

lib/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -54,26 +54,26 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
   }
 
   void onRemove(UseMedicineItem item) async {
-    var delete = await showDialog(
-      context: context,
+    var delete = await MyNavigator.showDialog(
+      tag: 'delete',
       builder: (_) => AlertDialog(
-        title: const Text('是否删除用药记录?'),
+        title: const Text('系统提示'),
+        content: const Text('是否删除用药记录?'),
         actions: [
           MyButton(
             '删除',
             alignment: null,
             backgroundColor: const Color(0xFFCE615A),
-            onTap: () => MyNavigator.pop(true),
+            onTap: () => MyNavigator.dismiss(tag: 'delete', result: true),
           ),
-          MyButton('取消', alignment: null, onTap: () => MyNavigator.pop()),
+          MyButton('取消', alignment: null, onTap: () => MyNavigator.dismiss(tag: 'delete')),
         ],
       ),
     );
-    if (delete ?? false) {
-      setState(() {
-        data?.codeUseMedicineList?.remove(item);
-      });
-    }
+    if (!(delete ?? false)) return;
+    setState(() {
+      data?.codeUseMedicineList?.remove(item);
+    });
   }
 
   /// 校验数据

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -114,26 +114,27 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
   }
 
   void onRemove(int index, NonghuItem item) async {
-    var delete = await showDialog(
-      context: context,
+    var delete = await MyNavigator.showDialog(
+      tag: 'delete',
       builder: (_) => AlertDialog(
-        title: const Text('是否删除扦样农户信息?'),
+        title: const Text('系统提示'),
+        content: const Text('是否删除扦样农户信息?'),
         actions: [
           MyButton(
             '删除',
             alignment: null,
             backgroundColor: const Color(0xFFCE615A),
-            onTap: () => MyNavigator.pop(true),
+            onTap: () => MyNavigator.dismiss(tag: 'delete', result: true),
           ),
-          MyButton('取消', alignment: null, onTap: () => MyNavigator.pop()),
+          MyButton('取消', alignment: null, onTap: () => MyNavigator.dismiss(tag: 'delete')),
         ],
       ),
     );
-    if (delete ?? false) {
-      setState(() {
-        data?.codeSamplingNonghuList?.remove(item);
-      });
-    }
+    if (!(delete ?? false)) return;
+
+    setState(() {
+      data?.codeSamplingNonghuList?.remove(item);
+    });
   }
 
   /// 校验数据

lib/page/sample_task/sample_task_list_page.dart

@@ -1,5 +1,6 @@
 import 'package:easy_refresh/easy_refresh.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/base/base_vm.dart';
 import 'package:lszlgl/config/colors.dart';
@@ -52,6 +53,23 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
 
   /// 领取扦样任务
   void receiveTask(SampleTaskItem data) async {
+    var delete = await MyNavigator.showDialog(
+      builder: (_) => AlertDialog(
+        title: const Text('系统提示'),
+        content: const Text('任务认领后不可撤销，请确认是否认领任务！'),
+        actions: [
+          MyButton(
+            '领取',
+            alignment: null,
+            backgroundColor: const Color(0xFFCE615A),
+            onTap: () => MyNavigator.dismiss(status: SmartStatus.dialog, result: true),
+          ),
+          MyButton('取消', alignment: null, onTap: () => MyNavigator.dismiss()),
+        ],
+      ),
+    );
+    if (!(delete ?? false)) return;
+
     MyNavigator.showLoading();
     try {
       var rsp = await MyApi.get().receiveSampleTaskSgjc(data.id ?? 0);