新疆兵团定位特殊处理；扦样陪同人员选择。

lib/main.dart

@@ -116,50 +116,6 @@ class MyApp extends StatelessWidget {
   }
 }
 
-class MyHomePage extends StatefulWidget {
-  const MyHomePage({super.key, required this.title});
 
-  final String title;
 
-  @override
-  State<MyHomePage> createState() => _MyHomePageState();
-}
-
-class _MyHomePageState extends State<MyHomePage> {
-  int _counter = 0;
-
-  void _incrementCounter() {
-    setState(() {
-      _counter++;
-    });
-  }
 
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-        title: Text(widget.title),
-      ),
-      body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: <Widget>[
-            const Text(
-              'You have pushed the button this many times:',
-            ),
-            Text(
-              '$_counter',
-              style: Theme.of(context).textTheme.headlineMedium,
-            ),
-          ],
-        ),
-      ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: _incrementCounter,
-        tooltip: 'Increment',
-        child: const Icon(Icons.add),
-      ),
-    );
-  }
-}

lib/model/rsp/sample_task_rsp.dart

@@ -253,6 +253,9 @@ class SampleTaskItem {
     map['xiangXzqhName'] = xiangXzqhName;
     map['cunXzqhName'] = cunXzqhName;
 
+    // 新疆兵团
+    map['shiXzqh'] = shiXzqh;
+
     map['qyddjwd'] = qyddjwd;
     map['zzmj'] = zzmj;
     map['trdllx'] = trdllx;

lib/page/login/login_page.dart

@@ -1,8 +1,11 @@
 import 'dart:convert';
 
 import 'package:dio/dio.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/painting.dart';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart';
 import 'package:lszlgl/base/base_lifecycle_state.dart';
 import 'package:lszlgl/config/app_config.dart';
@@ -243,37 +246,38 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
         child: Column(
           children: [
             const SizedBox(height: 56),
-            buildEdit(
-                ctrl: accountCtrl,
-                hint: '请输入登录账号',
-                icon: imgLoginAccount,
-                action: TextInputAction.next,
-                rightIcon: ValueListenableBuilder(
+            MenuAnchor(
+              builder: (_,MenuController ctrl, Widget? child){
+                return buildEdit(
+                    ctrl: accountCtrl,
+                    hint: '请输入登录账号',
+                    icon: imgLoginAccount,
+                    action: TextInputAction.next,
+                    onTap: ctrl.open,
+                    textChanged: (String v){
+                      ctrl.close();
+                    }
+                );
+              },
+              menuChildren: [
+                ValueListenableBuilder(
                     valueListenable: _account,
-                    builder: (ctx, Map<String,dynamic> ac, child){
+                    builder:(ctx,Map<String,dynamic> ac,child){
                       if(ac.isNotEmpty){
-                        return PopupMenuButton(
-                            icon: const Icon(
-                              Icons.arrow_drop_down_circle_outlined,
-                              size: 18,
-                              color: Color(0xFFBBBBBB),
-                            ),
-                            itemBuilder: (context) => [
-                              PopupMenuItem<String>(
-                                child: Text("账号：${ac['phone']}"),
-                                onTap: (){
-                                  accountCtrl.text = ac['phone'];
-                                  pwdCtrl.text =ac['pwd'];
-                                },
-                              ),
-                            ]
+                        return  MenuItemButton(
+                          child: Text("账号：${ac['phone']}"),
+                          onPressed: (){
+                            accountCtrl.text = ac['phone'];
+                            pwdCtrl.text =ac['pwd'];
+                            FocusManager.instance.primaryFocus?.unfocus();
+                          },
                         );
                       }else{
                         return const SizedBox.shrink();
                       }
-                    }
-                )
-                ),
+                    } ),
+              ],
+            ),
             const SizedBox(height: 32),
             ValueListenableBuilder(
                 valueListenable: _showPwd,
@@ -321,6 +325,8 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
     bool obscure = false,
     ValueChanged? onSubmit,
     Widget? rightIcon,
+    VoidCallback? onTap,
+    ValueChanged<String>? textChanged
   }) {
     return TextField(
       controller: ctrl,
@@ -347,6 +353,8 @@ class _LoginPageState extends BaseLifecycleState<LoginPage> {
       textInputAction: action,
       obscureText: obscure,
       onSubmitted: onSubmit,
+      onTap: onTap,
+      onChanged: textChanged,
     );
   }
 

lib/page/sample_task/reap_sample_detail/reap_sample_basic_detail_page.dart

@@ -12,6 +12,7 @@ import 'package:lszlgl/service/print_service.dart';
 import 'package:lszlgl/utils/input_formatter.dart';
 import 'package:lszlgl/utils/location_utils.dart';
 import 'package:lszlgl/widget/button.dart';
+import 'package:lszlgl/widget/qypop_widget.dart';
 import '../../../base/base_lifecycle_state.dart';
 import '../../../config/colors.dart';
 import '../../../model/rsp/dict_rsp.dart';
@@ -39,7 +40,8 @@ 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;
 
@@ -57,10 +59,14 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   final trxx = null.notifier<CardMenuData?>();
 
   final qyddjwd = null.notifier<String?>();
+  final otherpeople = null.notifier<String?>();
+  final xjCityList = <CardMenuData>[].notifier<List<CardMenuData>>();
+  final xjcitysel = null.notifier<CardMenuData?>();
+ // final name = null.notifier<String?>();
 
-  final name = null.notifier<String?>();
-
-  List<CardMenuData> personList = [];
+  List<OtherPeopleModel> personList = [];
+  String otherStr = '';
+  bool isXJ = false; // 是否是新疆兵团
 
   /// 获取行政区划列表
   Future<List<CardMenuData>?> getDistrictList(num level, {num? id}) async {
@@ -99,6 +105,18 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     MyNavigator.dismissLoading();
   }
 
+  // 获取新疆兵团 市级列表
+  void getXJCityList() async{
+    var cityList = await getDistrictList(2, id: 662746);
+    if (cityList == null) return;
+    xjCityList.value = cityList;
+    for (CardMenuData item in cityList) {
+      if(item.name == data?.shi){
+        xjcitysel.value = item;
+      }
+    }
+  }
+
   // /// 选中行政区划
   // void onSelectXzqh(ValueNotifier<CardMenuData?> selNotifier, CardMenuData selData) {
   //   num level = 100;
@@ -138,14 +156,15 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       var rsp = await MyApi.get().getPersonMenu(data?.jhcyjg ?? data?.zjBaseEnterpriseId ?? 0);
       personList
         ..clear()
-        ..addAll((rsp.data ?? []).map((e) => CardMenuData(e.name, e.id)).toList());
+        ..addAll((rsp.data ?? []).map((e) => OtherPeopleModel(name: e.name)).toList());
+      personList.removeWhere((item) => item.name == data?.name); // 移除可能存在的默认人员
       // 选中扦样人员
       var nameList = data?.dgryName?.split(',');
       if (nameList != null) {
         for (var person in personList) {
           for (var name in nameList) {
             if (person.name == name) {
-              person.select = true;
+              person.isChose = true;
               break;
             }
           }
@@ -156,6 +175,34 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     }
   }
 
+  // 选择陪同人员
+  void showPopView() {
+    showModalBottomSheet(
+        isDismissible: false,
+        enableDrag: false,
+        isScrollControlled: true,
+        shape: const RoundedRectangleBorder(
+            borderRadius:
+                BorderRadius.only(topLeft: Radius.circular(14), topRight: Radius.circular(14))),
+        context: context,
+        builder: (context) {
+          return QyPopWidget(
+            pTitleList: personList,
+            otherStr: otherStr,
+            pTitleCallBack: (val, other) {
+              otherStr = other;
+              if (val.isEmpty) {
+                data?.dgryName = null;
+                otherpeople.value = null;
+              } else {
+                data?.dgryName = val;
+                otherpeople.value = val;
+              }
+            },
+          );
+        });
+  }
+
   void getLocation() async {
     bool granted = await LocationUtils.checkLocationAvailable();
     if (!granted) {
@@ -165,17 +212,25 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     LocationUtils.startLocation();
   }
 
+
   void initLocation() {
     locationListener = LocationUtils.onLocationChanged().listen((value) async {
       logger.d('LocationChanged:${jsonEncode(value)}');
       var lon = (value['longitude'] as double).toStringAsFixed(6);
       var lat = (value['latitude'] as double).toStringAsFixed(6);
+      String adCode = value['adCode'] as String;
+      if(isXJ){ // 新疆兵团特殊处理
+        String jwd = '$lon，$lat';
+        qyddjwd.value = jwd;
+        data?.qyddjwd = jwd;
+        data?.xzqhCode = adCode;
+        return ;
+      }
       String province = value['province'] as String;
       String city = value['city'] as String;
       String district = value['district'] as String;
       String street = value['street'] as String;
       String streetNumber = value['streetNumber'] as String;
-      String adCode = value['adCode'] as String;
       if (province == city) {
         city = district;
         district = '';
@@ -189,10 +244,10 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
       sheng.value = null;
       shi.value = null;
       qu.value = null;
-      data?.xiangXzqhName = null;
-      xian.text = '';
-      data?.cunXzqhName = null;
-      cun.text = '';
+      // data?.xiangXzqhName = null;
+      // xian.text = '';
+      // data?.cunXzqhName = null;
+      // cun.text = '';
 
       MyNavigator.showLoading();
       bool stepSuccess = false;
@@ -239,10 +294,10 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
 
             if (stepSuccess) {
               // 乡、村
-              data?.xiangXzqhName = street;
-              data?.cunXzqhName = streetNumber;
-              xian.text = street;
-              cun.text = streetNumber;
+              // data?.xiangXzqhName = street;
+              // data?.cunXzqhName = streetNumber;
+              // xian.text = street;
+              // cun.text = streetNumber;
             }
           }
         }
@@ -258,26 +313,26 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     }
   }
 
-  void personSelCallback(List<CardMenuData> selectList) async {
-    if (selectList.isEmpty) {
-      data?.dgryName = null;
-      name.value = null;
-      return;
-    }
-    var names = StringBuffer();
-    var ids = StringBuffer();
-    for (int i = 0; i < selectList.length; i++) {
-      var item = selectList[i];
-      names.write(item.name);
-      ids.write(item.value);
-      if (i < selectList.length - 1) {
-        names.write(',');
-        ids.write(',');
-      }
-    }
-    data?.dgryName = names.toString();
-    name.value = names.toString();
-  }
+  // void personSelCallback(List<CardMenuData> selectList) async {
+  //   if (selectList.isEmpty) {
+  //     data?.dgryName = null;
+  //     name.value = null;
+  //     return;
+  //   }
+  //   var names = StringBuffer();
+  //   var ids = StringBuffer();
+  //   for (int i = 0; i < selectList.length; i++) {
+  //     var item = selectList[i];
+  //     names.write(item.name);
+  //     ids.write(item.value);
+  //     if (i < selectList.length - 1) {
+  //       names.write(',');
+  //       ids.write(',');
+  //     }
+  //   }
+  //   data?.dgryName = names.toString();
+  //   name.value = names.toString();
+  // }
 
   void showSignature() {
     if (data?.filePictureList?.isEmpty ?? true) {
@@ -372,7 +427,6 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   }
 
   Future<void> printPic(String? name) async {
-
     Uint8List? bytes = await FileUtils.getBitmapFromContext(ewmKey.currentContext);
     List<String> textList = PrintService.getPrintTextListWithSampleTaskItem(data);
     var args = PrintPageArgs(bytes: bytes!, textList: textList);
@@ -398,11 +452,6 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
 
   /// 校验数据
   bool verifyData() {
-    // 扦样/陪同人员
-    if ((data?.dgryName ?? '').isEmpty) {
-      MyNavigator.showToast('扦样/陪同人员不能为空');
-      return false;
-    }
     // 乡镇
     if ((data?.xiangXzqhName ?? '').isEmpty) {
       MyNavigator.showToast('乡镇不能为空');
@@ -435,7 +484,7 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
   bool get wantKeepAlive => true;
 
   @override
-  void onInit() {
+  void onInit(){
     data = widget.data;
     isDetail = widget.detail;
     widget.ctrl.verifyData = verifyData;
@@ -443,16 +492,30 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     // 土壤信息
     getTrxxList();
 
+    if (data?.sheng == '新疆兵团'){
+      isXJ = true;
+      getXJCityList();
+    }
     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?.xiangXzqhName != null) xian.text = data!.xiangXzqhName!;
     if (data?.cunXzqhName != null) cun.text = data!.cunXzqhName!;
     qyddjwd.value = data?.qyddjwd;
-    if ((data?.dgryName ?? '0') == '0') {
-      data?.dgryName = UserService.get().getUser()?.nickname;
+
+    if ((data?.name ?? '0') == '0') {
+      data?.name = UserService.get().getUser()?.nickname;
+    }
+    var nameList = data?.dgryName?.split(',');
+    if (nameList != null) {
+      nameList.removeWhere((item) => item == data?.name);
+      if (nameList.isNotEmpty) {
+        data?.dgryName = nameList.join(',');
+      } else {
+        data?.dgryName = null;
+      }
     }
-    name.value = data?.dgryName;
+    otherpeople.value = data?.dgryName;
     // 编辑数据
     if (!isDetail) {
       initLocation();
@@ -482,19 +545,40 @@ class _ReapSampleBasicDetailPageState extends BaseLifecycleState<ReapSampleBasic
     return Column(
       children: [
         CardItemWidget('样品单号', rightText: data?.qyrwdh, bottomLine: true),
-        name.builder(
-          (v) => CardWidgets.buildMenuDialog(
-            isDetail,
-            '扦样/陪同人员',
-            v,
-            personList,
-            personSelCallback,
-            multiple: true,
-            selectCountMax: 3,
-          ),
-        ),
+        CardItemWidget('扦样人员', rightText: data?.name, bottomLine: true),
+
+        otherpeople.builder((v) => CardItemWidget(
+              '陪同人员',
+              rightText: v,
+              bottomLine: true,
+              onTap: isDetail ? null : showPopView,
+              trailing: isDetail ? null : const Icon(Icons.arrow_drop_down, size: 24, color: Color(0xFF01B2C8),),
+            )),
+        //
+        // name.builder(
+        //   (v) => CardWidgets.buildMenuDialog(
+        //     isDetail,
+        //     '扦样/陪同人员',
+        //     v,
+        //     personList,
+        //     personSelCallback,
+        //     multiple: true,
+        //     selectCountMax: 3,
+        //   ),
+        // ),
         sheng.builder((v) => CardItemWidget('省份', rightText: v?.name, bottomLine: true)),
+        if(!isXJ)
         shi.builder((v) => CardItemWidget('市/州', rightText: v?.name, bottomLine: true)),
+
+        if(isXJ)
+          CardWidgets.buildMenu(
+            isDetail,
+            '市/州',
+            xjCityList,
+            xjcitysel,
+                (_, sel) => data?.shiXzqh = sel.value,
+          ),
+
         qu.builder((v) => CardItemWidget('区县', rightText: v?.name, bottomLine: true)),
         // xian.builder((v) => CardItemWidget('乡镇', rightText: v?.name, bottomLine: true)),
         // cun.builder((v) => CardItemWidget('村', rightText: v?.name, bottomLine: true)),

lib/page/sample_task/reap_sample_detail/reap_sample_task_page.dart

@@ -99,7 +99,13 @@ class _ReapSampleTaskPageState extends BaseLifecycleState<ReapSampleTaskPage> wi
     }
     SampleTaskItem req = pageStatus.value.data!;
     // 去签名
-    var args = SignaturePageArgs(count: req.dgryName?.split(',').length ?? 0);
+    int? sCount = req.dgryName?.split(',').length;
+    if(sCount == null){
+      sCount = 1;
+    }else{
+      sCount = sCount + 1 ;
+    }
+    var args = SignaturePageArgs(count: sCount );
     List<Uint8List?>? list = await MyRouter.startSignature(args: args);
     if (list == null || list.isEmpty) return;
     MyNavigator.showLoading(msg: '提交中...');

lib/page/user_center/user_center_page.dart

@@ -92,32 +92,31 @@ class _UserCenterPageState extends BaseLifecycleState<UserCenterPage> with Autom
             boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.1), offset: const Offset(0, 5), blurRadius: 4)],
             image: const DecorationImage(image: AssetImage(imgHomeListBg), fit: BoxFit.fill),
           ),
-          child: Row(
-            crossAxisAlignment: CrossAxisAlignment.start,
+          child: Stack(
             children: [
-              Expanded(
-                child: Row(
-                  children: [
-                    buildUserAvatar(user?.avatar ?? ''),
-                    Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Text(
-                          user?.nickname ?? '',
-                          style: const TextStyle(fontSize: 14, color: Color(0xFF333333), fontWeight: FontWeight.w500),
-                        ),
-                        const SizedBox(height: 14),
-                        Text(
-                          user?.username ?? '',
-                          style: const TextStyle(fontSize: 14, color: Color(0xFF333333), fontWeight: FontWeight.w500),
-                        ),
-                      ],
-                    ),
-                  ],
-                ),
+              Row(
+                children: [
+                  buildUserAvatar(user?.avatar ?? ''),
+                  Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        user?.nickname ?? '',
+                        style: const TextStyle(fontSize: 14, color: Color(0xFF333333), fontWeight: FontWeight.w500),
+                      ),
+                      const SizedBox(height: 14),
+                      Text(
+                        user?.username ?? '',
+                        style: const TextStyle(fontSize: 14, color: Color(0xFF333333), fontWeight: FontWeight.w500),
+                      ),
+                    ],
+                  ),
+                ],
               ),
-              buildDeptText(user?.dept?.name ?? ''),
+              Positioned(
+                  right: 0,
+                  child: buildDeptText(user?.dept?.name ?? '')),
             ],
           ),
         ),

lib/widget/qypop_widget.dart

@@ -0,0 +1,143 @@
+import 'package:flutter/material.dart';
+import 'package:lszlgl/base/base_lifecycle_state.dart';
+
+class QyPopWidget extends StatefulWidget {
+  final List pTitleList;
+  final String otherStr;
+  final Function(String nameStr, String otherStr) pTitleCallBack;
+  const QyPopWidget(
+      {super.key, required this.pTitleList, required this.otherStr, required this.pTitleCallBack});
+
+  @override
+  State<QyPopWidget> createState() => _QyPopWidgetState();
+}
+
+class _QyPopWidgetState extends State<QyPopWidget> {
+  late TextEditingController ctrl;
+  final ScrollController sctrl = ScrollController();
+
+  @override
+  void initState() {
+    super.initState();
+    ctrl = TextEditingController(text: widget.otherStr); // 赋值
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return PopScope(
+      canPop: false, // 关闭系统返回，防止选中数据出错
+      child: GestureDetector(
+        behavior: HitTestBehavior.translucent,
+        onTap: () {
+          FocusManager.instance.primaryFocus?.unfocus();
+        },
+        child: SafeArea(
+          child: SingleChildScrollView(
+              controller: sctrl,
+              padding: EdgeInsets.fromLTRB(12, 22, 12, MediaQuery.of(context).viewInsets.bottom),
+              child: Column(
+                mainAxisSize: MainAxisSize.min, //
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  const Text(
+                    '请选择或填写扦样陪同人员（最多2人）',
+                    style: TextStyle(fontSize: 15),
+                    textAlign: TextAlign.center,
+                  ),
+                  const SizedBox(height: 16),
+                  Wrap(
+                    spacing: 10,
+                    children: List.generate(
+                        widget.pTitleList.length,
+                        (i) => ActionChip(
+                            backgroundColor: Colors.grey[200],
+                            padding: const EdgeInsets.all(6),
+                            side: BorderSide.none,
+                            shape: const RoundedRectangleBorder(
+                                borderRadius: BorderRadius.all(Radius.circular(18))),
+                            label: Text(
+                              widget.pTitleList[i].name,
+                              style: widget.pTitleList[i].isChose
+                                  ? const TextStyle(fontSize: 14, color: Color(0xFF25A6EE))
+                                  : const TextStyle(fontSize: 14, color: Colors.grey),
+                            ),
+                            onPressed: () {
+                              setState(() {
+                                widget.pTitleList[i].isChose = !widget.pTitleList[i].isChose;
+                              });
+                            })),
+                  ),
+                  const SizedBox(height: 12),
+                  TextField(
+                    controller: ctrl,
+                    style: const TextStyle(fontSize: 14),
+                    decoration: const InputDecoration(
+                        border: InputBorder.none,
+                        icon: Text('其他陪同人员:'),
+                        hintText: '多人请用逗号隔开',
+                        isDense: true),
+                    onTap: () {
+                      Future.delayed(const Duration(milliseconds: 600), () {
+                        sctrl.animateTo(
+                          sctrl.position.maxScrollExtent,
+                          duration: const Duration(milliseconds: 400),
+                          curve: Curves.easeOut,
+                        );
+                      });
+                    },
+                  ),
+                  const Divider(color: Color(0xFFE7E7E7), height: 8, thickness: 1),
+                  const SizedBox(height: 12),
+                  TextButton(
+                      style: ButtonStyle(
+                        backgroundColor: WidgetStateProperty.all(const Color(0xFF25A6EE)),
+                        foregroundColor: WidgetStateProperty.all(Colors.white),
+                      ),
+                      onPressed: () {
+                        String finalVal = '';
+                        for (OtherPeopleModel model in widget.pTitleList) {
+                          if (model.isChose) {
+                            finalVal = '$finalVal${model.name},';
+                          }
+                        }
+                        String inputVal = ctrl.text;
+                        if (inputVal.isNotEmpty) {
+                          List<String> result = inputVal.split(RegExp(r'[,，.。;；\s]'));
+                          result.removeWhere((val) => val == '');
+                          inputVal = result.join(',');
+                          if (inputVal.isNotEmpty) {
+                            // 判断只输入符号出现问题
+                            finalVal = '$finalVal$inputVal,';
+                          }
+                        }
+
+                        FocusManager.instance.primaryFocus?.unfocus();
+                        if (finalVal.isNotEmpty) {
+                          String vals = finalVal.substring(0, finalVal.length - 1);
+                          List<String> li = vals.split(',');
+                          if (li.length > 2) {
+                            MyNavigator.showToast('最多两个陪同人员');
+                            return;
+                          }
+                          widget.pTitleCallBack.call(vals, inputVal);
+                        } else {
+                          // 输入为空 选择为空
+                          widget.pTitleCallBack.call('', inputVal);
+                        }
+                        Navigator.pop(context);
+                      },
+                      child: const Text('确 定')),
+                ],
+              )),
+        ),
+      ),
+    );
+  }
+}
+
+class OtherPeopleModel {
+  String? name;
+  bool isChose;
+
+  OtherPeopleModel({this.name, this.isChose = false});
+}

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.0.22+22
+version: 0.0.23+23
 
 environment:
   sdk: '>=3.1.5 <4.0.0'