xt / Flutter-ReserveApp · Commits

Go to a project

Commit 1136126b8e637e6346f1dc810e7747e945797484

Authored by weixin_45529955
1 parent 5a2b5603
build: skipped

宴会编辑页面 选台的日期默认 未默认上 空值导致代码非空值冲突

Inline Side-by-side
Showing 3 changed files with 14 additions and 8 deletions
@@ -83,8 +83,8 @@ android { @@ -83,8 +83,8 @@ android {
83 83
84 ndk { 84 ndk {
85 //选择要添加的对应 cpu 类型的 .so 库。 85 //选择要添加的对应 cpu 类型的 .so 库。
86 - // abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位  
87 - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64' 86 + abiFilters 'arm64-v8a', 'x86_64', 'mips64' //魅族64位，不支持32位
  87 + // abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
88 } 88 }
89 89
90 lintOptions { 90 lintOptions {
@@ -535,7 +535,7 @@ @@ -535,7 +535,7 @@
535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 535 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
536 CLANG_ENABLE_MODULES = YES; 536 CLANG_ENABLE_MODULES = YES;
537 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 537 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
538 - CURRENT_PROJECT_VERSION = 5642; 538 + CURRENT_PROJECT_VERSION = 564;
539 DEVELOPMENT_TEAM = 8J59HM8B82; 539 DEVELOPMENT_TEAM = 8J59HM8B82;
540 ENABLE_BITCODE = NO; 540 ENABLE_BITCODE = NO;
541 INFOPLIST_FILE = Runner/Info.plist; 541 INFOPLIST_FILE = Runner/Info.plist;
@@ -718,7 +718,7 @@ @@ -718,7 +718,7 @@
718 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 718 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
719 CLANG_ENABLE_MODULES = YES; 719 CLANG_ENABLE_MODULES = YES;
720 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 720 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
721 - CURRENT_PROJECT_VERSION = 5642; 721 + CURRENT_PROJECT_VERSION = 564;
722 DEVELOPMENT_TEAM = 8J59HM8B82; 722 DEVELOPMENT_TEAM = 8J59HM8B82;
723 ENABLE_BITCODE = NO; 723 ENABLE_BITCODE = NO;
724 INFOPLIST_FILE = Runner/Info.plist; 724 INFOPLIST_FILE = Runner/Info.plist;
@@ -744,7 +744,7 @@ @@ -744,7 +744,7 @@
744 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 744 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
745 CLANG_ENABLE_MODULES = YES; 745 CLANG_ENABLE_MODULES = YES;
746 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 746 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
747 - CURRENT_PROJECT_VERSION = 5642; 747 + CURRENT_PROJECT_VERSION = 564;
748 DEVELOPMENT_TEAM = 8J59HM8B82; 748 DEVELOPMENT_TEAM = 8J59HM8B82;
749 ENABLE_BITCODE = NO; 749 ENABLE_BITCODE = NO;
750 INFOPLIST_FILE = Runner/Info.plist; 750 INFOPLIST_FILE = Runner/Info.plist;
@@ -361,6 +361,11 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -361,6 +361,11 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
361 if (xuantaiData.length == 0) { 361 if (xuantaiData.length == 0) {
362 xuantaiData.add(initSetXuanTaiModel(index: 0)); 362 xuantaiData.add(initSetXuanTaiModel(index: 0));
363 feastModel!.rid = widget.rid; 363 feastModel!.rid = widget.rid;
  364 +
  365 + if (xuantaiData[0].dateTimext == null) {
  366 + xuantaiData[0].dateTimext = dateTime;
  367 + xuantaiData[0].dateTimeShowxt = dateTimeShow;
  368 + }
364 } 369 }
365 370
366 /** 371 /**
@@ -906,8 +911,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -906,8 +911,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
906 onTap: () { 911 onTap: () {
907 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘 912 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
908 List<String?> list = []; 913 List<String?> list = [];
909 - for (dynamic item  
910 - in sexList) { 914 + for (dynamic item in sexList) {
911 list.add(item['title']); 915 list.add(item['title']);
912 } 916 }
913 if (list.length == 0) { 917 if (list.length == 0) {
@@ -2178,7 +2182,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -2178,7 +2182,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
2178 } else { 2182 } else {
2179 xuantaiData.removeAt(xuantaiSelIndex); 2183 xuantaiData.removeAt(xuantaiSelIndex);
2180 2184
2181 - xuantaiSelIndex--; //删除后，选中前一个 2185 + if (xuantaiSelIndex != 0) {
  2186 + xuantaiSelIndex--; //删除后，选中前一个
  2187 + }
2182 2188
2183 setState(() {}); 2189 setState(() {});
2184 } 2190 }