Merge branch 'v5.2.0.4+' into v5.2.1+

@@ -20,7 +20,8 @@ class SetXuanTaiModel {
   List<Images> images;
 
   String dateTimeShowxt = '请选择'; //宴会日期显示   选台 2022-08-02（周二 七月十五）
-  DateTime dateTimext = DateTime.now(); //宴会日期
+  // DateTime dateTimext = DateTime.now(); //宴会日期
+  DateTime dateTimext ;//宴会日期
   String cdShow = '请选择';
   int cdSelIndex;
   String cdCode = '';

@@ -21,6 +21,7 @@ import '../../constant/state.dart';
 import '../../models/dsolt_xt.dart';
 import '../../models/feast_menu_model.dart';
 import '../../models/get_banquet_by_id_new_model.dart';
+
 import '../../models/get_board_model.dart';
 import '../../models/notebook.dart';
 import '../../models/set_xuan_tai_model.dart';
@@ -358,7 +359,18 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
 
   initSetXuanTaiModel({int index}) {
     SetXuanTaiModel setXuanTaiModel = SetXuanTaiModel();
-    setXuanTaiModel.dateTimeShowxt = '请选择';
+
+    if (index > 0) {
+      if (xuantaiData[index - 1].dateTimext != null) {
+        setXuanTaiModel.dateTimext = xuantaiData[index - 1].dateTimext;
+        setXuanTaiModel.dateTimeShowxt = xuantaiData[index - 1].dateTimeShowxt;
+      }
+    } else {
+      //   setXuanTaiModel.dateTimext = dateTime;
+      //   setXuanTaiModel.dateTimeShowxt = dateTimeShow;
+      // setXuanTaiModel.dateTimeShowxt = '请选择';
+    }
+    //
     setXuanTaiModel.cdShow = '请选择';
     setXuanTaiModel.qsDateShow = '暂未选择'; //起始时间
     setXuanTaiModel.images = [];
@@ -1037,6 +1049,12 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
               if (day != null) {
                 dateTime = day;
                 dateTimeShow = createDateText(context, day);
+                if (xuantaiData.length > 0 &&
+                    xuantaiData[0].dateTimext == null) {
+                  xuantaiData[0].dateTimext = dateTime;
+                  xuantaiData[0].dateTimeShowxt = dateTimeShow;
+                }
+
                 setState(() {});
               }
             });