xt / Flutter-ReserveApp · Commits

Go to a project

Commit f0738df3fe79f84a3b5ef02b385480605acdc531

Authored by wdn127929
1 parent ab8a1cdd
build: skipped

存酒加的客情数据不对

Inline Side-by-side
Showing 4 changed files with 18 additions and 18 deletions
@@ -18,19 +18,19 @@ if (flutterRoot == null) { @@ -18,19 +18,19 @@ if (flutterRoot == null) {
18 18
19 19
20 20
21 -def flutterVersionCode = "529" 21 +def flutterVersionCode = "530"
22 if (flutterVersionCode == null) { 22 if (flutterVersionCode == null) {
23 - flutterVersionCode = '529' 23 + flutterVersionCode = '530'
24 24
25 25
26 26
27 } 27 }
28 28
29 29
30 -def flutterVersionName = "5.2.9" 30 +def flutterVersionName = "5.3.0"
31 31
32 if (flutterVersionName == null) { 32 if (flutterVersionName == null) {
33 - flutterVersionName = '5.2.9' 33 + flutterVersionName = '5.3.0'
34 34
35 35
36 } 36 }
@@ -548,7 +548,7 @@ @@ -548,7 +548,7 @@
548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; 548 CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
549 CODE_SIGN_IDENTITY = "Apple Development"; 549 CODE_SIGN_IDENTITY = "Apple Development";
550 CODE_SIGN_STYLE = Automatic; 550 CODE_SIGN_STYLE = Automatic;
551 - CURRENT_PROJECT_VERSION = 5293; 551 + CURRENT_PROJECT_VERSION = 530;
552 DEVELOPMENT_TEAM = 8J59HM8B82; 552 DEVELOPMENT_TEAM = 8J59HM8B82;
553 ENABLE_BITCODE = NO; 553 ENABLE_BITCODE = NO;
554 FLUTTER_BUILD_MODE = release; 554 FLUTTER_BUILD_MODE = release;
@@ -563,7 +563,7 @@ @@ -563,7 +563,7 @@
563 "$(inherited)", 563 "$(inherited)",
564 "$(PROJECT_DIR)/Flutter", 564 "$(PROJECT_DIR)/Flutter",
565 ); 565 );
566 - MARKETING_VERSION = 5.2.9; 566 + MARKETING_VERSION = 5.3.0;
567 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 567 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
568 PRODUCT_NAME = Runner; 568 PRODUCT_NAME = Runner;
569 PROVISIONING_PROFILE_SPECIFIER = ""; 569 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -696,7 +696,7 @@ @@ -696,7 +696,7 @@
696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 696 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
697 CODE_SIGN_IDENTITY = "Apple Development"; 697 CODE_SIGN_IDENTITY = "Apple Development";
698 CODE_SIGN_STYLE = Automatic; 698 CODE_SIGN_STYLE = Automatic;
699 - CURRENT_PROJECT_VERSION = 5293; 699 + CURRENT_PROJECT_VERSION = 530;
700 DEVELOPMENT_TEAM = 8J59HM8B82; 700 DEVELOPMENT_TEAM = 8J59HM8B82;
701 ENABLE_BITCODE = NO; 701 ENABLE_BITCODE = NO;
702 FLUTTER_BUILD_MODE = release; 702 FLUTTER_BUILD_MODE = release;
@@ -711,7 +711,7 @@ @@ -711,7 +711,7 @@
711 "$(inherited)", 711 "$(inherited)",
712 "$(PROJECT_DIR)/Flutter", 712 "$(PROJECT_DIR)/Flutter",
713 ); 713 );
714 - MARKETING_VERSION = 5.2.9; 714 + MARKETING_VERSION = 5.3.0;
715 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 715 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
716 PRODUCT_NAME = Runner; 716 PRODUCT_NAME = Runner;
717 PROVISIONING_PROFILE_SPECIFIER = ""; 717 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -732,7 +732,7 @@ @@ -732,7 +732,7 @@
732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 732 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
733 CODE_SIGN_IDENTITY = "Apple Development"; 733 CODE_SIGN_IDENTITY = "Apple Development";
734 CODE_SIGN_STYLE = Automatic; 734 CODE_SIGN_STYLE = Automatic;
735 - CURRENT_PROJECT_VERSION = 5293; 735 + CURRENT_PROJECT_VERSION = 530;
736 DEVELOPMENT_TEAM = 8J59HM8B82; 736 DEVELOPMENT_TEAM = 8J59HM8B82;
737 ENABLE_BITCODE = NO; 737 ENABLE_BITCODE = NO;
738 FLUTTER_BUILD_MODE = release; 738 FLUTTER_BUILD_MODE = release;
@@ -747,7 +747,7 @@ @@ -747,7 +747,7 @@
747 "$(inherited)", 747 "$(inherited)",
748 "$(PROJECT_DIR)/Flutter", 748 "$(PROJECT_DIR)/Flutter",
749 ); 749 );
750 - MARKETING_VERSION = 5.2.9; 750 + MARKETING_VERSION = 5.3.0;
751 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 751 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
752 PRODUCT_NAME = Runner; 752 PRODUCT_NAME = Runner;
753 PROVISIONING_PROFILE_SPECIFIER = ""; 753 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -579,15 +579,15 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -579,15 +579,15 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
579 crossAxisAlignment: WrapCrossAlignment.center, 579 crossAxisAlignment: WrapCrossAlignment.center,
580 children: [ 580 children: [
581 Text( 581 Text(
582 - Utils.formatFromMill(  
583 - customerProvider.guestInfoSunModel.last.ddate), 582 + customerProvider.guestInfoSunModel.last?.ddate == null ? '': Utils.formatFromMill(
  583 + customerProvider.guestInfoSunModel.last?.ddate),
584 overflow: TextOverflow.ellipsis, 584 overflow: TextOverflow.ellipsis,
585 style: TextStyle( 585 style: TextStyle(
586 fontSize: ScreenUtil().setSp(20), 586 fontSize: ScreenUtil().setSp(20),
587 color: MyColours.color_E34D59), 587 color: MyColours.color_E34D59),
588 ), 588 ),
589 Text( 589 Text(
590 - customerProvider.guestInfoSunModel.last.ddateSoltStr, 590 + customerProvider.guestInfoSunModel.last?.ddateSoltStr??"",
591 style: TextStyle( 591 style: TextStyle(
592 fontSize: ScreenUtil().setSp(20), 592 fontSize: ScreenUtil().setSp(20),
593 color: MyColours.color_438E93), 593 color: MyColours.color_438E93),
@@ -599,7 +599,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -599,7 +599,7 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
599 color: MyColours.color_515151), 599 color: MyColours.color_515151),
600 ), 600 ),
601 Text( 601 Text(
602 - customerProvider.guestInfoSunModel.last.tableinfoName, 602 + customerProvider.guestInfoSunModel.last?.tableinfoName??'',
603 style: TextStyle( 603 style: TextStyle(
604 fontSize: ScreenUtil().setSp(20), 604 fontSize: ScreenUtil().setSp(20),
605 color: MyColours.color_438E93), 605 color: MyColours.color_438E93),
@@ -488,15 +488,15 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> { @@ -488,15 +488,15 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
488 crossAxisAlignment: WrapCrossAlignment.center, 488 crossAxisAlignment: WrapCrossAlignment.center,
489 children: [ 489 children: [
490 Text( 490 Text(
491 - Utils.formatFromMill(  
492 - customerProvider.guestInfoSunModel.last.ddate), 491 + customerProvider.guestInfoSunModel.last?.ddate == null ? '': Utils.formatFromMill(
  492 + customerProvider.guestInfoSunModel.last?.ddate ??''),
493 overflow: TextOverflow.ellipsis, 493 overflow: TextOverflow.ellipsis,
494 style: TextStyle( 494 style: TextStyle(
495 fontSize: ScreenUtil().setSp(20), 495 fontSize: ScreenUtil().setSp(20),
496 color: MyColours.color_E34D59), 496 color: MyColours.color_E34D59),
497 ), 497 ),
498 Text( 498 Text(
499 - customerProvider.guestInfoSunModel.last.ddateSoltStr, 499 + customerProvider.guestInfoSunModel.last?.ddateSoltStr??'',
500 style: TextStyle( 500 style: TextStyle(
501 fontSize: ScreenUtil().setSp(20), 501 fontSize: ScreenUtil().setSp(20),
502 color: MyColours.color_438E93), 502 color: MyColours.color_438E93),
@@ -508,7 +508,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> { @@ -508,7 +508,7 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
508 color: MyColours.color_515151), 508 color: MyColours.color_515151),
509 ), 509 ),
510 Text( 510 Text(
511 - customerProvider.guestInfoSunModel.last.tableinfoName, 511 + customerProvider.guestInfoSunModel.last.tableinfoName??'',
512 style: TextStyle( 512 style: TextStyle(
513 fontSize: ScreenUtil().setSp(20), 513 fontSize: ScreenUtil().setSp(20),
514 color: MyColours.color_438E93), 514 color: MyColours.color_438E93),