优化选项菜单

lib/config/reresh_config.dart

@@ -22,6 +22,7 @@ class RefreshConfig {
           noMoreText: '已加载全部',
           failedText: '刷新失败',
           messageText: '最后更新于 %T',
+          processedDuration: Duration(milliseconds: 200),
         );
     EasyRefresh.defaultFooterBuilder = () =>
         footer ??
@@ -34,6 +35,7 @@ class RefreshConfig {
           noMoreText: '已加载全部',
           failedText: '加载失败',
           messageText: '最后更新于 %T',
+          processedDuration: Duration(milliseconds: 200),
         );
   }
 }

lib/network/api.dart

@@ -39,9 +39,13 @@ abstract class Api {
   @GET('/admin-api/zj/base-file/getAppDownLoadUrl')
   Future<ApiRsp<String?>> getAppDownloadUrl();
 
-  /// 扦样任务更新
+  /// 扦样任务单更新-收购
   @PUT('/admin-api/zj/code-sampling-task-details-sgjc/update')
-  Future<ApiRsp<bool?>> updateSampleTask(@Body() Map<String, dynamic> map);
+  Future<ApiRsp<bool?>> updateSampleTaskSgjc(@Body() Map<String, dynamic> map);
+
+  /// 扦样任务单详情-收购
+  @GET('/admin-api/zj/code-sampling-task-details-sgjc/getSamplingTaskDetails')
+  Future<ApiRsp<SampleTaskItem?>> sampleTaskDetailSgjc(@Query('id') num id);
 
   /// 省市县
   @GET('/admin-api/zj/base-administrative-division/list')

lib/network/my_api.dart

@@ -0,0 +1,15 @@
+import 'package:dio/dio.dart';
+
+import 'api.dart';
+
+class MyApi {
+  MyApi._();
+
+  static String productUrl = 'http://121.36.17.6:49099';
+  static String testUrl = 'http://121.36.17.6:19090';
+
+  static Api get({Dio? dio, String? baseUrl}) {
+    baseUrl ??= testUrl;
+    return Api(dio: dio, baseUrl: baseUrl);
+  }
+}

lib/page/home/home_page.dart

@@ -20,20 +20,16 @@ class _HomePageState extends BaseState<HomePage> with AutomaticKeepAliveClientMi
 
   late List<ServiceModel> serviceList;
 
-  void startReap() {
+  void startSampleList(StepType type) async{
     MyRouter.startSampleTaskList(const SampleTaskListTabPageArgs(type: StepType.reap));
   }
 
-  void startStore() {
-    MyRouter.startSampleTaskList(const SampleTaskListTabPageArgs(type: StepType.stock));
-  }
-
   @override
   void initState() {
     super.initState();
     serviceList = [
-      ServiceModel(name: '收获环节', icon: imgHomeListPzjc, onTap: startReap),
-      ServiceModel(name: '库存环节', icon: imgHomeListZcjy, onTap: startStore),
+      ServiceModel(name: '收获环节', icon: imgHomeListPzjc, onTap: () => startSampleList(StepType.reap)),
+      ServiceModel(name: '库存环节', icon: imgHomeListZcjy, onTap: () => startSampleList(StepType.stock)),
     ];
   }
 

lib/page/login/login_page.dart

@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/model/req/login_req.dart';
-import 'package:lszlgl/network/api.dart';
+import 'package:lszlgl/network/my_api.dart';
 import 'package:lszlgl/service/dict_service.dart';
 import 'package:lszlgl/service/upgrade_service.dart';
 import 'package:lszlgl/service/user_service.dart';
@@ -31,7 +31,7 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
     MyNavigator.showLoading();
     try {
       // 登录
-      var login = await Api().login(LoginReq(username: account, password: pwd));
+      var login = await MyApi.get().login(LoginReq(username: account, password: pwd));
       await UserService.get().saveLogin(login.data);
       getSystemData();
     } on DioException catch (_) {
@@ -44,10 +44,10 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
     MyNavigator.showLoading(clickDismiss: false);
     try {
       // 获取用户数据
-      var user = await Api().userProfile();
+      var user = await MyApi.get().userProfile();
       await UserService.get().saveUser(user.data);
       // 获取字典
-      var dictData = await Api().getAllDict();
+      var dictData = await MyApi.get().getAllDict();
       DictService.saveDictList(dictData.data);
       UpgradeService.checkUpgrade(false);
       // 进入主页

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -1,11 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:lszlgl/network/api.dart';
 import '../../../base/base_lifecycle_state.dart';
-import '../../../config/colors.dart';
-import '../../../model/rsp/district_rsp.dart';
 import '../../../model/rsp/sample_task_rsp.dart';
+import '../../../network/my_api.dart';
 import '../../../service/dict_service.dart';
-import '../../../widget/button.dart';
 import '../../../widget/card_item.dart';
 
 /// 收获扦样-基础信息
@@ -25,28 +22,120 @@ class ReapSampleBasicDetailPage extends StatefulWidget {
   State<ReapSampleBasicDetailPage> createState() => _ReapSampleBasicDetailPageState();
 }
 
-class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasicDetailPage>
-    with AutomaticKeepAliveClientMixin {
+class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasicDetailPage> with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
+  late bool isDetail;
 
-  late Widget arrowDown;
-  final sfList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
-  final sqList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
-  final qxList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
-  final xzList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
-  final czList = <DistrictRsp>[].notifier<List<DistrictRsp>>();
-  final sf = null.notifier<int?>();
-  final sq = null.notifier<int?>();
-  final qx = null.notifier<int?>();
-  final xz = null.notifier<int?>();
-  final cz = null.notifier<int?>();
+  final shengList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final shiList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final quList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final xianList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final cunList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final sheng = null.notifier<CardMenuData?>();
+  final shi = null.notifier<CardMenuData?>();
+  final qu = null.notifier<CardMenuData?>();
+  final xian = null.notifier<CardMenuData?>();
+  final cun = null.notifier<CardMenuData?>();
 
-  final dllx = null.notifier<int?>();
+  final dllx = null.notifier<CardMenuData?>();
+
+  Future<void> districtList(num level, {num? id}) async {
+    MyNavigator.showLoading();
+    try {
+      var rsp = await MyApi.get().districtList(level, id: id);
+      List<CardMenuData> list = (rsp.data ?? []).map((e) => CardMenuData(e.uname, e.id)).toList();
+      if (level == 1) {
+        shengList.value = list;
+      } else if (level == 2) {
+        shiList.value = list;
+      } else if (level == 3) {
+        quList.value = list;
+      } else if (level == 4) {
+        xianList.value = list;
+      } else if (level == 5) {
+        cunList.value = list;
+      }
+    } catch (e) {}
+    MyNavigator.dismissLoading();
+  }
+
+  void onSelect(ValueNotifier<CardMenuData?> selNotifier, CardMenuData selData) {
+    num level = 100;
+    if (selNotifier == sheng) {
+      level = 1;
+      data?.sheng = selData.name;
+      data?.shengXzqh = selData.value;
+      data?.shi = null;
+      data?.shiXzqh = null;
+      data?.qu = null;
+      data?.quXzqh = null;
+      data?.xian = null;
+      data?.xiangXzqh = null;
+      data?.cun = null;
+      data?.cunXzqh = null;
+      shi.value = null;
+      qu.value = null;
+      xian.value = null;
+      cun.value = null;
+      shiList.value = [];
+      quList.value = [];
+      xianList.value = [];
+      cunList.value = [];
+    } else if (selNotifier == shi) {
+      level = 2;
+      data?.shi = selData.name;
+      data?.shiXzqh = selData.value;
+      data?.qu = null;
+      data?.quXzqh = null;
+      data?.xian = null;
+      data?.xiangXzqh = null;
+      data?.cun = null;
+      data?.cunXzqh = null;
+      qu.value = null;
+      xian.value = null;
+      cun.value = null;
+      quList.value = [];
+      xianList.value = [];
+      cunList.value = [];
+    } else if (selNotifier == qu) {
+      level = 3;
+      data?.qu = selData.name;
+      data?.quXzqh = selData.value;
+      data?.xian = null;
+      data?.xiangXzqh = null;
+      data?.cun = null;
+      data?.cunXzqh = null;
+      xian.value = null;
+      cun.value = null;
+      xianList.value = [];
+      cunList.value = [];
+    } else if (selNotifier == xian) {
+      level = 4;
+      data?.xian = selData.name;
+      data?.xiangXzqh = selData.value;
+      data?.cun = null;
+      data?.cunXzqh = null;
+      cun.value = null;
+      cunList.value = [];
+    } else if (selNotifier == cun) {
+      level = 5;
+      data?.cun = selData.name;
+      data?.cunXzqh = selData.value;
+    }
+    if (level < 5) {
+      // 获取下一个等级的菜单数据
+      districtList(level + 1, id: selData.value ?? 0);
+    }
+  }
+
+  /// 获取编辑数据
+  void getEditData() {
+    if (data?.sheng != null) sheng.value = CardMenuData(data?.sheng, data?.shengXzqh);
+    if (data?.shi != null) shi.value = CardMenuData(data?.shi, data?.shiXzqh);
+    if (data?.qu != null) qu.value = CardMenuData(data?.qu, data?.quXzqh);
+    if (data?.xian != null) xian.value = CardMenuData(data?.xian, data?.xiangXzqh);
+    if (data?.cun != null) cun.value = CardMenuData(data?.cun, data?.cunXzqh);
 
-  @override
-  void onInit() {
-    data = widget.data;
-    arrowDown = Image.asset(imgItemArrowDown, width: 20);
     // 省
     districtList(1);
     // 市
@@ -67,96 +156,22 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     }
   }
 
-  Future<void> districtList(num level, {num? id}) async {
-    MyNavigator.showLoading();
-    try {
-      var rsp = await Api().districtList(level, id: id);
-      if (level == 1) {
-        sfList.value = rsp.data ?? [];
-      } else if (level == 2) {
-        sqList.value = rsp.data ?? [];
-      } else if (level == 3) {
-        qxList.value = rsp.data ?? [];
-      } else if (level == 4) {
-        xzList.value = rsp.data ?? [];
-      } else if (level == 5) {
-        czList.value = rsp.data ?? [];
-      }
-    } catch (e) {}
-    MyNavigator.dismissLoading();
-  }
+  @override
+  bool get wantKeepAlive => true;
 
-  void onSelect(ValueNotifier<int?> selNotifier, int index) {
-    late DistrictRsp item;
-    if (selNotifier == sf) {
-      item = sfList.value[index];
-      data?.sheng = item.uname;
-      data?.shengXzqh = item.id;
-      sq.value = null;
-      qx.value = null;
-      xz.value = null;
-      cz.value = null;
-      sqList.value = [];
-      qxList.value = [];
-      xzList.value = [];
-      czList.value = [];
-    } else if (selNotifier == sq) {
-      item = sqList.value[index];
-      data?.shi = item.uname;
-      data?.shiXzqh = item.id;
-      qx.value = null;
-      xz.value = null;
-      cz.value = null;
-      qxList.value = [];
-      xzList.value = [];
-      czList.value = [];
-    } else if (selNotifier == qx) {
-      item = qxList.value[index];
-      data?.qu = item.uname;
-      data?.quXzqh = item.id;
-      xz.value = null;
-      cz.value = null;
-      xzList.value = [];
-      czList.value = [];
-    } else if (selNotifier == xz) {
-      item = xzList.value[index];
-      data?.xian = item.uname;
-      data?.xiangXzqh = item.id;
-      cz.value = null;
-      czList.value = [];
-    } else if (selNotifier == cz) {
-      item = sfList.value[index];
-      widget.data?.cun = item.uname;
-      data?.cun = item.uname;
-      data?.cunXzqh = item.id;
-    }
-    if ((item.ulevel ?? 100) < 5) {
-      districtList((item.ulevel ?? 100) + 1, id: item.id ?? 0);
+  @override
+  void onInit() {
+    data = widget.data;
+    isDetail = widget.detail;
+    if (!isDetail) {
+      getEditData();
     }
   }
 
-  Future<void> updateTask() async {
-    // widget.nextCallback?.call();
-    MyNavigator.showLoading();
-    try {
-      var rsp = await Api().updateSampleTask(data?.toJson() ?? {});
-      MyNavigator.showToast((rsp.data ?? false) ? '提交成功' : '提交失败');
-    } catch (e) {}
-    MyNavigator.dismissLoading();
-  }
-
-  @override
-  bool get wantKeepAlive => true;
-
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
+    return SingleChildScrollView(child: buildList());
   }
 
   Widget buildList() {
@@ -182,36 +197,21 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
           rightText: DictService.getLabel(DictType.jclb, value: data?.jclb),
           bottomLine: true,
         ),
-        CardItemWidget(
-          '省份',
-          rightText: widget.detail ? data?.sheng : null,
-          rightChild: widget.detail ? null : buildMenu(sfList, sf, onSelect),
-          bottomLine: true,
-        ),
-        CardItemWidget(
-          '市区',
-          rightText: widget.detail ? data?.shi : null,
-          rightChild: widget.detail ? null : buildMenu(sqList, sq, onSelect),
-          bottomLine: true,
-        ),
-        CardItemWidget(
-          '区县',
-          rightText: widget.detail ? data?.qu : null,
-          rightChild: widget.detail ? null : buildMenu(qxList, qx, onSelect),
-          bottomLine: true,
-        ),
-        CardItemWidget(
-          '乡镇',
-          rightText: widget.detail ? data?.xian : null,
-          rightChild: widget.detail ? null : buildMenu(xzList, xz, onSelect),
-          bottomLine: true,
-        ),
-        CardItemWidget(
-          '村',
-          rightText: widget.detail ? data?.cun : null,
-          rightChild: widget.detail ? null : buildMenu(czList, cz, onSelect),
-          bottomLine: true,
-        ),
+        isDetail
+            ? CardItemWidget('省份', rightText: data?.sheng, bottomLine: true)
+            : CardItemMenuWidget('省份', shengList, sheng, onSelectTap: onSelect, bottomLine: true),
+        isDetail
+            ? CardItemWidget('市区', rightText: data?.shi, bottomLine: true)
+            : CardItemMenuWidget('市区', shiList, shi, onSelectTap: onSelect, bottomLine: true),
+        isDetail
+            ? CardItemWidget('区县', rightText: data?.qu, bottomLine: true)
+            : CardItemMenuWidget('区县', quList, qu, onSelectTap: onSelect, bottomLine: true),
+        isDetail
+            ? CardItemWidget('乡镇', rightText: data?.xian, bottomLine: true)
+            : CardItemMenuWidget('乡镇', xianList, xian, onSelectTap: onSelect, bottomLine: true),
+        isDetail
+            ? CardItemWidget('村', rightText: data?.cun, bottomLine: true)
+            : CardItemMenuWidget('村', cunList, cun, onSelectTap: onSelect, bottomLine: true),
         CardItemWidget(
           '扦样地点经纬度',
           rightText: data?.qyddjwd,
@@ -240,95 +240,4 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       ],
     );
   }
-
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: MyButton(
-        widget.detail ? '重新录入' : '下一步',
-        onTap: () => widget.detail ? MyRouter.startReapSampleTask() : updateTask(),
-      ),
-    );
-  }
-
-  Widget buildMenu(
-    ValueNotifier<List<DistrictRsp>> listNotifier,
-    ValueNotifier<int?> selNotifier,
-    Function(ValueNotifier<int?>, int) onItemTap,
-  ) {
-    return listNotifier.builder(
-      (list) => selNotifier.builder(
-        (sel) {
-          return MenuAnchor(
-            style: const MenuStyle(
-              padding: MaterialStatePropertyAll(EdgeInsets.zero),
-              alignment: Alignment.bottomRight,
-            ),
-            builder: (_, ctrl, __) => buildMenuText(ctrl, list, sel),
-            menuChildren: List.generate(list.length, (index) {
-              return buildMenuItem(
-                list[index],
-                index == sel,
-                () {
-                  if (selNotifier.value == index) return;
-                  selNotifier.value = index;
-                  onItemTap.call(selNotifier, index);
-                },
-              );
-            }).toList(),
-          );
-        },
-      ),
-    );
-  }
-
-  Widget buildMenuText(MenuController ctrl, List<DistrictRsp> list, int? index) {
-    return GestureDetector(
-      behavior: HitTestBehavior.opaque,
-      onTap: () {
-        if (list.isEmpty) {
-          MyNavigator.showToast('请先选择上级选项');
-          return;
-        }
-        if (ctrl.isOpen) {
-          ctrl.close();
-        } else {
-          ctrl.open();
-        }
-      },
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
-        children: [
-          Expanded(
-            child: Text(
-              index == null ? '' : list[index].uname ?? '',
-              textAlign: TextAlign.right,
-              style: const TextStyle(
-                color: Color(0xFF01B2C8),
-                fontSize: 14,
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-          const SizedBox(width: 8),
-          arrowDown,
-        ],
-      ),
-    );
-  }
-
-  Widget buildMenuItem(DistrictRsp value, bool isSelect, VoidCallback? onPressed) {
-    return MenuItemButton(
-      onPressed: onPressed,
-      child: Container(
-        constraints: const BoxConstraints(minWidth: 120),
-        alignment: Alignment.center,
-        child: Text(
-          value.uname ?? '',
-          style: TextStyle(color: isSelect ? const Color(0xFF01B2C8) : MyColor.c_666666),
-        ),
-      ),
-    );
-  }
 }

lib/page/sample_task/reap_sample_detail/reap_sample_disaster_detail_page.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
-import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/utils/string_utils.dart';
-import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 import '../../../model/rsp/sample_task_rsp.dart';
@@ -31,12 +29,7 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
+    return SingleChildScrollView(child: buildList());
   }
 
   Widget buildList() {
@@ -105,15 +98,4 @@ class _ReapSampleDisasterDetailPageState extends BaseLifecycleState<ReapSampleDi
       ],
     );
   }
-
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: MyButton(
-        '重新录入',
-        onTap: () => MyRouter.startReapSampleTask(),
-      ),
-    );
-  }
 }

lib/page/sample_task/reap_sample_detail/reap_sample_medicine_detail_page.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 import '../../../model/rsp/sample_task_rsp.dart';
@@ -30,12 +28,7 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
+    return SingleChildScrollView(child: buildList());
   }
 
   Widget buildList() {
@@ -103,15 +96,4 @@ class _ReapSampleMedicineDetailPageState extends BaseLifecycleState<ReapSampleMe
       ),
     );
   }
-
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: MyButton(
-        '重新录入',
-        onTap: () => MyRouter.startReapSampleTask(),
-      ),
-    );
-  }
 }

lib/page/sample_task/reap_sample_detail/reap_sample_org_detail_page.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 import '../../../model/rsp/sample_task_rsp.dart';
@@ -47,12 +45,7 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
+    return SingleChildScrollView(child: buildList());
   }
 
   Widget buildList() {
@@ -80,15 +73,4 @@ class _ReapSampleOrgDetailPageState extends BaseLifecycleState<ReapSampleOrgDeta
       ],
     );
   }
-
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: MyButton(
-        '重新录入',
-        onTap: () => MyRouter.startReapSampleTask(),
-      ),
-    );
-  }
 }

lib/page/sample_task/reap_sample_detail/reap_sample_variety_detail_page.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
-import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 import '../../../model/rsp/sample_task_rsp.dart';
@@ -16,8 +14,7 @@ class ReapSampleVarietyDetailPage extends StatefulWidget {
   State<ReapSampleVarietyDetailPage> createState() => _ReapSampleVarietyDetailPageState();
 }
 
-class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVarietyDetailPage>
-    with AutomaticKeepAliveClientMixin {
+class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVarietyDetailPage> with AutomaticKeepAliveClientMixin {
   SampleTaskItem? data;
 
   @override
@@ -31,12 +28,7 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
+    return SingleChildScrollView(child: buildList());
   }
 
   Widget buildList() {
@@ -57,15 +49,4 @@ class _ReapSampleVarietyDetailPageState extends BaseLifecycleState<ReapSampleVar
       ],
     );
   }
-
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: MyButton(
-        '重新录入',
-        onTap: () => MyRouter.startReapSampleTask(),
-      ),
-    );
-  }
 }

lib/page/sample_task/reap_sample_task/reap_sample_disaster_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 /// 收获扦样-灾害污染
@@ -60,12 +59,7 @@ class _ReapSampleDisasterPageState extends BaseState<ReapSampleDisasterPage> wit
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
+    return SingleChildScrollView(child: buildList());
   }
 
   Widget buildList() {
@@ -87,32 +81,6 @@ class _ReapSampleDisasterPageState extends BaseState<ReapSampleDisasterPage> wit
     );
   }
 
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: Row(
-        children: [
-          Expanded(
-            flex: 2,
-            child: MyButton(
-              '上一步',
-              onTap: widget.previousCallback,
-            ),
-          ),
-          const Spacer(flex: 1),
-          Expanded(
-            flex: 2,
-            child: MyButton(
-              '下一步',
-              onTap: widget.nextCallback,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   Widget buildField({String? hint, TextInputType? inputType}) {
     return TextField(
       keyboardType: inputType,

lib/page/sample_task/reap_sample_task/reap_sample_medicine_page.dart

@@ -41,12 +41,7 @@ class _ReapSampleMedicinePageState extends BaseState<ReapSampleMedicinePage> wit
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
+    return SingleChildScrollView(child: buildList());
   }
 
   Widget buildList() {
@@ -127,32 +122,6 @@ class _ReapSampleMedicinePageState extends BaseState<ReapSampleMedicinePage> wit
     );
   }
 
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: Row(
-        children: [
-          Expanded(
-            flex: 2,
-            child: MyButton(
-              '上一步',
-              onTap: widget.previousCallback,
-            ),
-          ),
-          const Spacer(flex: 1),
-          Expanded(
-            flex: 2,
-            child: MyButton(
-              '下一步',
-              onTap: widget.nextCallback,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   Widget buildField({String? hint, TextInputType? inputType}) {
     return TextField(
       keyboardType: inputType,

lib/page/sample_task/reap_sample_task/reap_sample_org_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_state.dart';
-import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 /// 收获扦样-检验机构
@@ -25,12 +24,7 @@ class _ReapSampleOrgPageState extends BaseState<ReapSampleOrgPage> with Automati
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
+    return SingleChildScrollView(child: buildList());
   }
 
   Widget buildList() {
@@ -43,30 +37,4 @@ class _ReapSampleOrgPageState extends BaseState<ReapSampleOrgPage> with Automati
       ],
     );
   }
-
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: Row(
-        children: [
-          Expanded(
-            flex: 2,
-            child: MyButton(
-              '上一步',
-              onTap: widget.previousCallback,
-            ),
-          ),
-          const Spacer(flex: 1),
-          Expanded(
-            flex: 2,
-            child: MyButton(
-              '提交',
-              onTap: widget.submitCallback,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
 }

lib/page/sample_task/reap_sample_task/reap_sample_task_page.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/config/colors.dart';
 import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
@@ -13,21 +14,23 @@ import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_medicine_pa
 import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_org_page.dart';
 import 'package:lszlgl/page/sample_task/reap_sample_task/reap_sample_variety_page.dart';
 
+import '../../../base/base_vm.dart';
+import '../../../network/my_api.dart';
+import '../../../widget/button.dart';
+import '../../../widget/page_widget.dart';
+
 class ReapSampleTaskPageArgs {
   final bool detail;
-  final SampleTaskItem? data;
+  final num? id;
 
   ReapSampleTaskPageArgs({
     this.detail = false,
-    this.data,
+    this.id,
   });
 
   @override
   String toString() {
-    return {
-      'detail': detail,
-      'data': data != null ? '...' : null,
-    }.toString();
+    return {'detail': detail, 'id': id}.toString();
   }
 }
 
@@ -44,8 +47,11 @@ class ReapSampleTaskPage extends StatefulWidget {
   State<ReapSampleTaskPage> createState() => _ReapSampleTaskPageState();
 }
 
-class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with TickerProviderStateMixin {
+class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> with TickerProviderStateMixin {
   late ReapSampleTaskPageArgs args;
+
+  final pageStatus = DataStatusModel<SampleTaskItem?>().notifier<DataStatusModel<SampleTaskItem?>>();
+
   late PageController pageCtrl;
 
   late List<String> tabTextList;
@@ -53,6 +59,13 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
 
   ValueNotifier<int> tabIndex = ValueNotifier(0);
 
+  void startEdit() async {
+    bool? success = await MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(id: args.id));
+    if (success ?? false) {
+      MyNavigator.pop(true);
+    }
+  }
+
   void next() {
     if (tabIndex.value < tabTextList.length - 1) {
       pageCtrl.jumpToPage(tabIndex.value + 1);
@@ -64,27 +77,49 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
     pageCtrl.jumpToPage(tabIndex.value - 1);
   }
 
-  void submit() {
-    MyNavigator.pop();
-    MyNavigator.showToast('提交成功');
+  void submit() async {
+    MyNavigator.showLoading();
+    try {
+      var rsp = await MyApi.get().updateSampleTaskSgjc((pageStatus.value.data ?? SampleTaskItem()).toJson());
+      if (!mounted) return;
+      if (rsp.data ?? false) {
+        MyNavigator.showToast('提交成功');
+        MyNavigator.pop(true);
+      } else {
+        MyNavigator.showToast('提交失败');
+      }
+    } catch (e) {}
+    MyNavigator.dismissLoading();
   }
 
-  @override
-  void initState() {
-    super.initState();
-    args = widget.args;
-    tabTextList = ['基础信息', '品种信息', '灾害污染', '用药情况', '检验机构'];
+  void getDetailData() async {
+    pageStatus.update(pageStatus.value.loading());
+    try {
+      var rsp = await MyApi.get().sampleTaskDetailSgjc(args.id ?? -1);
+      var data = rsp.data;
+      if (data == null) {
+        pageStatus.update(pageStatus.value.empty());
+      } else {
+        cratePageList(data);
+        pageStatus.update(pageStatus.value.success(data: data));
+      }
+    } catch (e) {
+      pageStatus.update(pageStatus.value.error());
+    }
+  }
+
+  void cratePageList(SampleTaskItem data) {
     if (args.detail) {
       pageList = [
-        ReapSampleBasicDetailPage(args.data),
-        ReapSampleVarietyDetailPage(args.data),
-        ReapSampleDisasterDetailPage(args.data),
-        ReapSampleMedicineDetailPage(args.data),
-        ReapSampleOrgDetailPage(args.data),
+        ReapSampleBasicDetailPage(data),
+        ReapSampleVarietyDetailPage(data),
+        ReapSampleDisasterDetailPage(data),
+        ReapSampleMedicineDetailPage(data),
+        ReapSampleOrgDetailPage(data),
       ];
     } else {
       pageList = [
-        ReapSampleBasicDetailPage(args.data, detail: false, nextCallback: next),
+        ReapSampleBasicDetailPage(data, detail: false, nextCallback: next),
         // ReapSampleBasicPage(nextCallback: next),
         ReapSampleVarietyPage(nextCallback: next, previousCallback: previous),
         ReapSampleDisasterPage(nextCallback: next, previousCallback: previous),
@@ -92,11 +127,28 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
         ReapSampleOrgPage(previousCallback: previous, submitCallback: submit),
       ];
     }
+  }
 
+  @override
+  void initState() {
+    super.initState();
+    args = widget.args;
+    tabTextList = ['基础信息', '品种信息', '灾害污染', '用药情况', '检验机构'];
     pageCtrl = PageController();
   }
 
   @override
+  void onFirstShow(Duration timeStamp) {
+    getDetailData();
+  }
+
+  @override
+  void onDestroy() {
+    pageStatus.dispose();
+    pageCtrl.dispose();
+  }
+
+  @override
   Widget build(BuildContext context) {
     return myScaffold(child: buildBody());
   }
@@ -107,21 +159,29 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
       child: Column(
         children: [
           myAppBar(title: args.detail ? '扦样完成详情' : '扦样任务单'),
-          Expanded(
-            child: Container(
-              clipBehavior: Clip.hardEdge,
-              decoration: const BoxDecoration(
-                color: Colors.white,
-                borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
-              ),
-              child: Column(
-                children: [
-                  buildTab(),
-                  Expanded(child: buildPage()),
-                ],
-              ),
-            ),
-          ),
+          pageStatus.builder((v) {
+            return switch (v.status) {
+              DataStatus.loading => const PageLoadingWidget.loading(),
+              DataStatus.error => PageLoadingWidget.error(onTap: getDetailData),
+              DataStatus.success => Expanded(
+                  child: Container(
+                    clipBehavior: Clip.hardEdge,
+                    decoration: const BoxDecoration(
+                      color: Colors.white,
+                      borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
+                    ),
+                    child: Column(
+                      children: [
+                        buildTab(),
+                        Expanded(child: buildPage()),
+                        buildButton(),
+                      ],
+                    ),
+                  ),
+                ),
+              _ => const PageLoadingWidget.empty(),
+            };
+          }),
         ],
       ),
     );
@@ -205,4 +265,38 @@ class _ReapSampleTaskPageState extends BaseState<ReapSampleTaskPage> with Ticker
       itemBuilder: (_, index) => pageList[index],
     );
   }
+
+  Widget buildButton() {
+    Widget child;
+    if (args.detail) {
+      child = MyButton('重新录入', onTap: startEdit);
+    } else {
+      child = tabIndex.builder((v) {
+        // 第一页
+        if (v == 0) return MyButton('下一步', onTap: next);
+        // 最后一页
+        if (v == tabTextList.length - 1) {
+          return Row(
+            children: [
+              Expanded(flex: 2, child: MyButton('上一步', onTap: previous)),
+              const Spacer(flex: 1),
+              Expanded(flex: 2, child: MyButton('提交', onTap: submit)),
+            ],
+          );
+        }
+        return Row(
+          children: [
+            Expanded(flex: 2, child: MyButton('上一步', onTap: previous)),
+            const Spacer(flex: 1),
+            Expanded(flex: 2, child: MyButton('下一步', onTap: next)),
+          ],
+        );
+      });
+    }
+    return Container(
+      color: const Color(0xFFF1F7F6),
+      padding: const EdgeInsets.all(12),
+      child: child,
+    );
+  }
 }

lib/page/sample_task/reap_sample_task/reap_sample_variety_page.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/utils/date_time_utils.dart';
-import 'package:lszlgl/widget/button.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
 /// 收获扦样-品种信息
@@ -51,12 +50,7 @@ class _ReapSampleVarietyPageState extends BaseState<ReapSampleVarietyPage> with
   @override
   Widget build(BuildContext context) {
     super.build(context);
-    return Column(
-      children: [
-        Expanded(child: SingleChildScrollView(child: buildList())),
-        buildButton(),
-      ],
-    );
+    return SingleChildScrollView(child: buildList());
   }
 
   Widget buildList() {
@@ -96,32 +90,6 @@ class _ReapSampleVarietyPageState extends BaseState<ReapSampleVarietyPage> with
     );
   }
 
-  Widget buildButton() {
-    return Container(
-      color: const Color(0xFFF1F7F6),
-      padding: const EdgeInsets.all(12),
-      child: Row(
-        children: [
-          Expanded(
-            flex: 2,
-            child: MyButton(
-              '上一步',
-              onTap: widget.previousCallback,
-            ),
-          ),
-          const Spacer(flex: 1),
-          Expanded(
-            flex: 2,
-            child: MyButton(
-              '下一步',
-              onTap: widget.nextCallback,
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   Widget buildField({String? hint, TextInputType? inputType}) {
     return TextField(
       keyboardType: inputType,

lib/page/sample_task/sample_list_vm.dart

@@ -5,7 +5,8 @@ import 'package:lszlgl/base/base_vm.dart';
 import 'package:lszlgl/main.dart';
 import 'package:lszlgl/model/req/sample_task_list_req.dart';
 import 'package:lszlgl/model/rsp/sample_task_rsp.dart';
-import 'package:lszlgl/network/api.dart';
+
+import '../../network/my_api.dart';
 
 class SampleListVM extends BaseVM {
   SampleListVM() {
@@ -62,7 +63,7 @@ class SampleListVM extends BaseVM {
       req.pageNo = 1;
     }
     try {
-      var value = await Api().sampleTaskList(req.toJson());
+      var value = await MyApi.get().sampleTaskList(req.toJson());
       List<SampleTaskItem> data = value.data?.list ?? [];
       var list = pageState.value.data ?? [];
       if (refresh) {

lib/page/sample_task/sample_task_list_page.dart

@@ -34,25 +34,20 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   late SampleListVM vm;
 
   /// 详情
-  void startDetail(SampleTaskItem data) {
-    if (!widget.complete) return;
+  void startTaskDetail(bool detail, SampleTaskItem data) {
     switch (widget.type) {
       case StepType.reap:
-        MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(detail: true, data: data));
+        startDetail(ReapSampleTaskPageArgs(detail: detail, id: data.id));
         break;
       case StepType.stock:
         break;
     }
   }
 
-  /// 扦样
-  void startSample(SampleTaskItem data) {
-    switch (widget.type) {
-      case StepType.reap:
-        MyRouter.startReapSampleTask(args: ReapSampleTaskPageArgs(detail: false, data: data));
-        break;
-      case StepType.stock:
-        break;
+  void startDetail(ReapSampleTaskPageArgs args) async {
+    bool? success = await MyRouter.startReapSampleTask(args: args);
+    if (success ?? false) {
+      vm.refreshAll();
     }
   }
 
@@ -114,7 +109,10 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
   Widget buildItem(int index, SampleTaskItem item) {
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
-      onTap: () => startDetail(item),
+      onTap: () {
+        if (!widget.complete) return;
+        startTaskDetail(true, item);
+      },
       child: Container(
         margin: const EdgeInsets.only(left: 12, right: 12, top: 12),
         decoration: const BoxDecoration(
@@ -244,7 +242,7 @@ class _SampleTaskListPageState extends BaseLifecycleState<SampleTaskListPage> wi
             const SizedBox(width: 4),
             MyButton(
               '开始扦样',
-              onTap: () => startSample(item),
+              onTap: () => startTaskDetail(false, item),
               fountSize: 13,
               alignment: null,
               padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 12),

lib/page/user_center/user_center_page.dart

@@ -4,10 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/base/base_state.dart';
 import 'package:lszlgl/model/rsp/user_rsp.dart';
-import 'package:lszlgl/network/api.dart';
 import 'package:lszlgl/service/user_service.dart';
 import 'package:lszlgl/widget/card_item.dart';
 
+import '../../network/my_api.dart';
+
 /// 用户中心
 class UserCenterPage extends StatefulWidget {
   const UserCenterPage({Key? key}) : super(key: key);
@@ -29,7 +30,7 @@ class _UserCenterPageState extends BaseLifecycleState<UserCenterPage> with Autom
 
   Future<void> onRefresh() async {
     try {
-      var value = await Api().userProfile();
+      var value = await MyApi.get().userProfile();
       if (value.data != null) userNotify.value = value.data;
     } catch (err) {}
   }

lib/router/my_router.dart

@@ -70,12 +70,12 @@ class MyRouter {
   }
 
   /// 收获环节列表
-  static void startSampleTaskList(SampleTaskListTabPageArgs args) {
-    MyNavigator.push(rSampleTaskListTabPage, args: args);
+  static Future<dynamic> startSampleTaskList(SampleTaskListTabPageArgs args) {
+    return MyNavigator.push(rSampleTaskListTabPage, args: args);
   }
 
   /// 收获扦样任务
-  static void startReapSampleTask({ReapSampleTaskPageArgs? args}) {
-    MyNavigator.push(rReapSampleTaskPage, args: args ?? ReapSampleTaskPageArgs());
+  static Future<dynamic> startReapSampleTask({ReapSampleTaskPageArgs? args}) {
+    return MyNavigator.push(rReapSampleTaskPage, args: args ?? ReapSampleTaskPageArgs());
   }
 }

lib/service/upgrade_service.dart

@@ -7,7 +7,7 @@ import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 import '../main.dart';
-import '../network/api.dart';
+import '../network/my_api.dart';
 import '../router/my_navigator.dart';
 import '../widget/upgrade_dialog.dart';
 
@@ -64,7 +64,7 @@ class UpgradeService {
     if (showLoading) MyNavigator.showLoading();
     try {
       // 获取apk下载地址
-      var path = (await Api().getAppDownloadUrl()).data;
+      var path = (await MyApi.get().getAppDownloadUrl()).data;
       if (showLoading) MyNavigator.dismissLoading();
       if (path != null) {
         // 获取线上版本 lszlgl_release_0.0.2_2.apk

lib/widget/card_item.dart

@@ -1,5 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:lszlgl/config/colors.dart';
+import 'package:lszlgl/ext/value_notifier_ext.dart';
+
+import '../config/pics.dart';
+import '../router/my_navigator.dart';
 
 class CardItemWidget extends StatelessWidget {
   /// 标题文本
@@ -124,3 +128,132 @@ class CardItemWidget extends StatelessWidget {
     );
   }
 }
+
+class CardItemMenuWidget extends StatelessWidget {
+  /// 标题文本
+  final String title;
+
+  /// 左侧icon
+  final Widget? leading;
+
+  final String? hint;
+
+  /// 右侧组件对齐方式
+  final AlignmentGeometry rightAlign;
+  final bool showTopLine;
+  final bool bottomLine;
+
+  final Color? backgroundColor;
+
+  final ValueNotifier<List<CardMenuData>> listNotifier;
+  final ValueNotifier<CardMenuData?> selNotifier;
+
+  final void Function(ValueNotifier<CardMenuData?>, CardMenuData)? onSelectTap;
+
+  const CardItemMenuWidget(
+    this.title,
+    this.listNotifier,
+    this.selNotifier, {
+    Key? key,
+    this.leading,
+    this.hint,
+    this.rightAlign = Alignment.centerRight,
+    this.showTopLine = false,
+    this.bottomLine = false,
+    this.backgroundColor = Colors.white,
+    this.onSelectTap,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return CardItemWidget(
+      title,
+      leading: leading,
+      rightAlign: rightAlign,
+      showTopLine: showTopLine,
+      bottomLine: bottomLine,
+      backgroundColor: backgroundColor,
+      rightChild: buildMenu(),
+    );
+  }
+
+  Widget buildMenu() {
+    return listNotifier.builder(
+      (list) => selNotifier.builder(
+        (selData) {
+          return MenuAnchor(
+            style: const MenuStyle(
+              padding: MaterialStatePropertyAll(EdgeInsets.zero),
+              alignment: Alignment.bottomRight,
+            ),
+            builder: (_, ctrl, __) => buildMenuLabel(ctrl, selData),
+            menuChildren: List.generate(list.length, (index) {
+              return buildMenuItem(list[index], selData);
+            }).toList(),
+          );
+        },
+      ),
+    );
+  }
+
+  /// 菜单栏
+  Widget buildMenuLabel(MenuController ctrl, CardMenuData? selData) {
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap: () {
+        if (listNotifier.value.isEmpty) {
+          MyNavigator.showToast('没有选项数据');
+          return;
+        }
+        if (ctrl.isOpen) {
+          ctrl.close();
+        } else {
+          ctrl.open();
+        }
+      },
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          Expanded(
+            child: Text(
+              selData?.name ?? '',
+              textAlign: TextAlign.right,
+              style: const TextStyle(
+                color: Color(0xFF01B2C8),
+                fontSize: 14,
+                fontWeight: FontWeight.w500,
+              ),
+            ),
+          ),
+          const SizedBox(width: 8),
+          Image.asset(imgItemArrowDown, width: 20),
+        ],
+      ),
+    );
+  }
+
+  Widget buildMenuItem(CardMenuData item, CardMenuData? selData) {
+    return MenuItemButton(
+      onPressed: () {
+        if (item.value == selData?.value) return;
+        selNotifier.value = item;
+        onSelectTap?.call(selNotifier, item);
+      },
+      child: Container(
+        constraints: const BoxConstraints(minWidth: 120),
+        alignment: Alignment.center,
+        child: Text(
+          item.name ?? '',
+          style: TextStyle(color: item.value == selData?.value ? const Color(0xFF01B2C8) : MyColor.c_666666),
+        ),
+      ),
+    );
+  }
+}
+
+class CardMenuData {
+  String? name;
+  dynamic value;
+
+  CardMenuData(this.name, this.value);
+}