xt / Flutter-ReserveApp · Commits

Go to a project

Commit a52a03d17ac33640f0d8d07345d29ab78a999594

Authored by weixin_45529955
1 parent d8c9111a
build: skipped

交易记录增加会员充值和预订订金数据

Inline Side-by-side
Showing 4 changed files with 24 additions and 24 deletions
@@ -457,7 +457,7 @@ @@ -457,7 +457,7 @@
457 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 457 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
458 CLANG_ENABLE_MODULES = YES; 458 CLANG_ENABLE_MODULES = YES;
459 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 459 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
460 - CURRENT_PROJECT_VERSION = 556; 460 + CURRENT_PROJECT_VERSION = 5600;
461 DEVELOPMENT_TEAM = 8J59HM8B82; 461 DEVELOPMENT_TEAM = 8J59HM8B82;
462 ENABLE_BITCODE = NO; 462 ENABLE_BITCODE = NO;
463 INFOPLIST_FILE = Runner/Info.plist; 463 INFOPLIST_FILE = Runner/Info.plist;
@@ -466,7 +466,7 @@ @@ -466,7 +466,7 @@
466 "$(inherited)", 466 "$(inherited)",
467 "@executable_path/Frameworks", 467 "@executable_path/Frameworks",
468 ); 468 );
469 - MARKETING_VERSION = 5.5.6; 469 + MARKETING_VERSION = 5.6.0;
470 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 470 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
471 PRODUCT_NAME = "$(TARGET_NAME)"; 471 PRODUCT_NAME = "$(TARGET_NAME)";
472 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 472 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -640,7 +640,7 @@ @@ -640,7 +640,7 @@
640 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 640 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
641 CLANG_ENABLE_MODULES = YES; 641 CLANG_ENABLE_MODULES = YES;
642 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 642 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
643 - CURRENT_PROJECT_VERSION = 556; 643 + CURRENT_PROJECT_VERSION = 5600;
644 DEVELOPMENT_TEAM = 8J59HM8B82; 644 DEVELOPMENT_TEAM = 8J59HM8B82;
645 ENABLE_BITCODE = NO; 645 ENABLE_BITCODE = NO;
646 INFOPLIST_FILE = Runner/Info.plist; 646 INFOPLIST_FILE = Runner/Info.plist;
@@ -649,7 +649,7 @@ @@ -649,7 +649,7 @@
649 "$(inherited)", 649 "$(inherited)",
650 "@executable_path/Frameworks", 650 "@executable_path/Frameworks",
651 ); 651 );
652 - MARKETING_VERSION = 5.5.6; 652 + MARKETING_VERSION = 5.6.0;
653 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 653 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
654 PRODUCT_NAME = "$(TARGET_NAME)"; 654 PRODUCT_NAME = "$(TARGET_NAME)";
655 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 655 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -666,7 +666,7 @@ @@ -666,7 +666,7 @@
666 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 666 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
667 CLANG_ENABLE_MODULES = YES; 667 CLANG_ENABLE_MODULES = YES;
668 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 668 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
669 - CURRENT_PROJECT_VERSION = 556; 669 + CURRENT_PROJECT_VERSION = 5600;
670 DEVELOPMENT_TEAM = 8J59HM8B82; 670 DEVELOPMENT_TEAM = 8J59HM8B82;
671 ENABLE_BITCODE = NO; 671 ENABLE_BITCODE = NO;
672 INFOPLIST_FILE = Runner/Info.plist; 672 INFOPLIST_FILE = Runner/Info.plist;
@@ -675,7 +675,7 @@ @@ -675,7 +675,7 @@
675 "$(inherited)", 675 "$(inherited)",
676 "@executable_path/Frameworks", 676 "@executable_path/Frameworks",
677 ); 677 );
678 - MARKETING_VERSION = 5.5.6; 678 + MARKETING_VERSION = 5.6.0;
679 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 679 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
680 PRODUCT_NAME = "$(TARGET_NAME)"; 680 PRODUCT_NAME = "$(TARGET_NAME)";
681 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 681 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -35,8 +35,8 @@ class DepositRecordModel { @@ -35,8 +35,8 @@ class DepositRecordModel {
35 35
36 class DepositRecordSunModel { 36 class DepositRecordSunModel {
37 String? date; 37 String? date;
38 - double? total;  
39 - int? refundTotal; 38 + dynamic total;
  39 + dynamic refundTotal;
40 List< DepositModel>? list; 40 List< DepositModel>? list;
41 41
42 DepositRecordSunModel({this.date, this.total, this.refundTotal, this.list}); 42 DepositRecordSunModel({this.date, this.total, this.refundTotal, this.list});
@@ -45,12 +45,12 @@ class DepositRecordSunModel { @@ -45,12 +45,12 @@ class DepositRecordSunModel {
45 if(json["date"] is String) { 45 if(json["date"] is String) {
46 date = json["date"]; 46 date = json["date"];
47 } 47 }
48 - if(json["total"] is double) {  
49 - total = json["total"];  
50 - }  
51 - if(json["refund_total"] is int) {  
52 - refundTotal = json["refund_total"];  
53 - } 48 +
  49 + total = json["total"]??0;
  50 +
  51 +
  52 + refundTotal = json["refund_total"]??0;
  53 +
54 if(json["list"] is List) { 54 if(json["list"] is List) {
55 list = json["list"] == null ? null : (json["list"] as List).map((e) => DepositModel.fromJson(e)).toList(); 55 list = json["list"] == null ? null : (json["list"] as List).map((e) => DepositModel.fromJson(e)).toList();
56 } 56 }
@@ -140,8 +140,8 @@ class DiscountOrderListModelData { @@ -140,8 +140,8 @@ class DiscountOrderListModelData {
140 */ 140 */
141 141
142 String? date; 142 String? date;
143 - double? total;  
144 - double? refundTotal; 143 + dynamic total;
  144 + dynamic refundTotal;
145 List<DiscountOrderListModelDataList?>? list; 145 List<DiscountOrderListModelDataList?>? list;
146 146
147 DiscountOrderListModelData({ 147 DiscountOrderListModelData({
@@ -38,8 +38,8 @@ class VipRecordModel { @@ -38,8 +38,8 @@ class VipRecordModel {
38 38
39 class VipRecordSunModel { 39 class VipRecordSunModel {
40 String? date; 40 String? date;
41 - double? total;  
42 - int? refundTotal; 41 + dynamic total;
  42 + dynamic refundTotal;
43 List<VipModel>? list; 43 List<VipModel>? list;
44 44
45 VipRecordSunModel({this.date, this.total, this.refundTotal, this.list}); 45 VipRecordSunModel({this.date, this.total, this.refundTotal, this.list});
@@ -48,12 +48,12 @@ class VipRecordSunModel { @@ -48,12 +48,12 @@ class VipRecordSunModel {
48 if (json["date"] is String) { 48 if (json["date"] is String) {
49 date = json["date"]; 49 date = json["date"];
50 } 50 }
51 - if (json["total"] is double) {  
52 - total = json["total"];  
53 - }  
54 - if (json["refund_total"] is int) {  
55 - refundTotal = json["refund_total"];  
56 - } 51 +
  52 + total = json["total"]??0;
  53 +
  54 +
  55 + refundTotal = json["refund_total"]??0;
  56 +
57 if (json["list"] is List) { 57 if (json["list"] is List) {
58 list = json["list"] == null 58 list = json["list"] == null
59 ? null 59 ? null