Commit 5824cbabd41c021b840f95d8f7ad75ef70b58668

Authored by wdn127929
1 parent c506228f

宴会日期默认

@@ -18,19 +18,19 @@ if (flutterRoot == null) { @@ -18,19 +18,19 @@ if (flutterRoot == null) {
18 18
19 19
20 20
21 -def flutterVersionCode = "520" 21 +def flutterVersionCode = "521"
22 if (flutterVersionCode == null) { 22 if (flutterVersionCode == null) {
23 - flutterVersionCode = '520' 23 + flutterVersionCode = '521'
24 24
25 25
26 26
27 } 27 }
28 28
29 29
30 -def flutterVersionName = "5.2.0" 30 +def flutterVersionName = "5.2.1"
31 31
32 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
33 - flutterVersionName = '5.2.0' 33 + flutterVersionName = '5.2.1'
34 34
35 35
36 } 36 }
@@ -20,7 +20,8 @@ class SetXuanTaiModel { @@ -20,7 +20,8 @@ class SetXuanTaiModel {
20 List<Images> images; 20 List<Images> images;
21 21
22 String dateTimeShowxt = '请选择'; //宴会日期显示 选台 2022-08-02(周二 七月十五) 22 String dateTimeShowxt = '请选择'; //宴会日期显示 选台 2022-08-02(周二 七月十五)
23 - DateTime dateTimext = DateTime.now(); //宴会日期 23 + // DateTime dateTimext = DateTime.now(); //宴会日期
  24 + DateTime dateTimext ;//宴会日期
24 String cdShow = '请选择'; 25 String cdShow = '请选择';
25 int cdSelIndex; 26 int cdSelIndex;
26 String cdCode = ''; 27 String cdCode = '';
@@ -21,6 +21,7 @@ import '../../constant/state.dart'; @@ -21,6 +21,7 @@ import '../../constant/state.dart';
21 import '../../models/dsolt_xt.dart'; 21 import '../../models/dsolt_xt.dart';
22 import '../../models/feast_menu_model.dart'; 22 import '../../models/feast_menu_model.dart';
23 import '../../models/get_banquet_by_id_new_model.dart'; 23 import '../../models/get_banquet_by_id_new_model.dart';
  24 +
24 import '../../models/get_board_model.dart'; 25 import '../../models/get_board_model.dart';
25 import '../../models/notebook.dart'; 26 import '../../models/notebook.dart';
26 import '../../models/set_xuan_tai_model.dart'; 27 import '../../models/set_xuan_tai_model.dart';
@@ -358,7 +359,18 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -358,7 +359,18 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
358 359
359 initSetXuanTaiModel({int index}) { 360 initSetXuanTaiModel({int index}) {
360 SetXuanTaiModel setXuanTaiModel = SetXuanTaiModel(); 361 SetXuanTaiModel setXuanTaiModel = SetXuanTaiModel();
361 - setXuanTaiModel.dateTimeShowxt = '请选择'; 362 +
  363 + if (index > 0) {
  364 + if (xuantaiData[index - 1].dateTimext != null) {
  365 + setXuanTaiModel.dateTimext = xuantaiData[index - 1].dateTimext;
  366 + setXuanTaiModel.dateTimeShowxt = xuantaiData[index - 1].dateTimeShowxt;
  367 + }
  368 + } else {
  369 + // setXuanTaiModel.dateTimext = dateTime;
  370 + // setXuanTaiModel.dateTimeShowxt = dateTimeShow;
  371 + // setXuanTaiModel.dateTimeShowxt = '请选择';
  372 + }
  373 + //
362 setXuanTaiModel.cdShow = '请选择'; 374 setXuanTaiModel.cdShow = '请选择';
363 setXuanTaiModel.qsDateShow = '暂未选择'; //起始时间 375 setXuanTaiModel.qsDateShow = '暂未选择'; //起始时间
364 setXuanTaiModel.images = []; 376 setXuanTaiModel.images = [];
@@ -1037,6 +1049,12 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -1037,6 +1049,12 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
1037 if (day != null) { 1049 if (day != null) {
1038 dateTime = day; 1050 dateTime = day;
1039 dateTimeShow = createDateText(context, day); 1051 dateTimeShow = createDateText(context, day);
  1052 + if (xuantaiData.length > 0 &&
  1053 + xuantaiData[0].dateTimext == null) {
  1054 + xuantaiData[0].dateTimext = dateTime;
  1055 + xuantaiData[0].dateTimeShowxt = dateTimeShow;
  1056 + }
  1057 +
1040 setState(() {}); 1058 setState(() {});
1041 } 1059 }
1042 }); 1060 });