xt / Flutter-ReserveApp · Commits

Go to a project

Commit 7d56cdf217d0c328576229cab1f0f761cebc0725

Authored by wdn127929
1 parent 7c161ef9
build: skipped

免费付费

Inline Side-by-side
Showing 2 changed files with 12 additions and 9 deletions
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 archiveVersion = 1; 3 archiveVersion = 1;
4 classes = { 4 classes = {
5 }; 5 };
6 - objectVersion = 46; 6 + objectVersion = 50;
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
@@ -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 = 5451; 551 + CURRENT_PROJECT_VERSION = 5500;
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;
@@ -564,7 +564,7 @@ @@ -564,7 +564,7 @@
564 "$(inherited)", 564 "$(inherited)",
565 "$(PROJECT_DIR)/Flutter", 565 "$(PROJECT_DIR)/Flutter",
566 ); 566 );
567 - MARKETING_VERSION = 5.4.5; 567 + MARKETING_VERSION = 5.5.0;
568 PODS_ROOT = "$(inherited)"; 568 PODS_ROOT = "$(inherited)";
569 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 569 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
570 PRODUCT_NAME = Runner; 570 PRODUCT_NAME = Runner;
@@ -699,10 +699,10 @@ @@ -699,10 +699,10 @@
699 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements"; 699 CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
700 CODE_SIGN_IDENTITY = "Apple Development"; 700 CODE_SIGN_IDENTITY = "Apple Development";
701 CODE_SIGN_STYLE = Automatic; 701 CODE_SIGN_STYLE = Automatic;
702 - CURRENT_PROJECT_VERSION = 5451; 702 + CURRENT_PROJECT_VERSION = 5500;
703 DEVELOPMENT_TEAM = 8J59HM8B82; 703 DEVELOPMENT_TEAM = 8J59HM8B82;
704 ENABLE_BITCODE = NO; 704 ENABLE_BITCODE = NO;
705 - FLUTTER_BUILD_MODE = release; 705 + FLUTTER_BUILD_MODE = debug;
706 FLUTTER_ROOT = /Users/naji2021/Documents/flutter; 706 FLUTTER_ROOT = /Users/naji2021/Documents/flutter;
707 FLUTTER_TARGET = "/Users/naji2021/Desktop/Flutter-ReserveApp/lib/main.dart"; 707 FLUTTER_TARGET = "/Users/naji2021/Desktop/Flutter-ReserveApp/lib/main.dart";
708 FRAMEWORK_SEARCH_PATHS = ( 708 FRAMEWORK_SEARCH_PATHS = (
@@ -716,7 +716,7 @@ @@ -716,7 +716,7 @@
716 "$(inherited)", 716 "$(inherited)",
717 "$(PROJECT_DIR)/Flutter", 717 "$(PROJECT_DIR)/Flutter",
718 ); 718 );
719 - MARKETING_VERSION = 5.4.5; 719 + MARKETING_VERSION = 5.5.0;
720 PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json"; 720 PACKAGE_CONFIG = "/Users/naji2021/Desktop/Flutter-ReserveApp/.dart_tool/package_config.json";
721 PODS_ROOT = "$(inherited)"; 721 PODS_ROOT = "$(inherited)";
722 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 722 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
@@ -741,7 +741,7 @@ @@ -741,7 +741,7 @@
741 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 741 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
742 CODE_SIGN_IDENTITY = "Apple Development"; 742 CODE_SIGN_IDENTITY = "Apple Development";
743 CODE_SIGN_STYLE = Automatic; 743 CODE_SIGN_STYLE = Automatic;
744 - CURRENT_PROJECT_VERSION = 5451; 744 + CURRENT_PROJECT_VERSION = 5500;
745 DEVELOPMENT_TEAM = 8J59HM8B82; 745 DEVELOPMENT_TEAM = 8J59HM8B82;
746 ENABLE_BITCODE = NO; 746 ENABLE_BITCODE = NO;
747 FLUTTER_BUILD_MODE = release; 747 FLUTTER_BUILD_MODE = release;
@@ -757,7 +757,7 @@ @@ -757,7 +757,7 @@
757 "$(inherited)", 757 "$(inherited)",
758 "$(PROJECT_DIR)/Flutter", 758 "$(PROJECT_DIR)/Flutter",
759 ); 759 );
760 - MARKETING_VERSION = 5.4.5; 760 + MARKETING_VERSION = 5.5.0;
761 PODS_ROOT = "$(inherited)"; 761 PODS_ROOT = "$(inherited)";
762 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 762 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
763 PRODUCT_NAME = Runner; 763 PRODUCT_NAME = Runner;
@@ -230,6 +230,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> { @@ -230,6 +230,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> {
230 230
231 ///优惠券 231 ///优惠券
232 Widget _markingCupon({ 232 Widget _markingCupon({
  233 + String title,
233 List<CouponSunModel> coupon, 234 List<CouponSunModel> coupon,
234 VoidCallback onPressed, 235 VoidCallback onPressed,
235 bool select = false, 236 bool select = false,
@@ -249,7 +250,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> { @@ -249,7 +250,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> {
249 ), 250 ),
250 HEmptyView(20), 251 HEmptyView(20),
251 Text( 252 Text(
252 - '预订安排中推荐付费优惠券活动', 253 + title,
253 style: TextStyle( 254 style: TextStyle(
254 fontSize: font(14), color: MyColours.color_515151), 255 fontSize: font(14), color: MyColours.color_515151),
255 ), 256 ),
@@ -480,6 +481,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> { @@ -480,6 +481,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> {
480 VEmptyView(24), 481 VEmptyView(24),
481 couponDataListPay != null && couponDataListPay.length > 0 482 couponDataListPay != null && couponDataListPay.length > 0
482 ? _markingCupon( 483 ? _markingCupon(
  484 + title: '预订安排中推荐付费优惠券活动',
483 coupon: couponSelectPay, 485 coupon: couponSelectPay,
484 select: isCouponPay, 486 select: isCouponPay,
485 onPressedSelect: () { 487 onPressedSelect: () {
@@ -511,6 +513,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> { @@ -511,6 +513,7 @@ class _CouponSettingPageState extends State<CouponSettingPage> {
511 VEmptyView(24), 513 VEmptyView(24),
512 couponDataListFree != null && couponDataListFree.length > 0 514 couponDataListFree != null && couponDataListFree.length > 0
513 ? _markingCupon( 515 ? _markingCupon(
  516 + title: '预订安排中免费赠送代金券',
514 coupon: couponSelectFree, 517 coupon: couponSelectFree,
515 select: isCouponFree, 518 select: isCouponFree,
516 onPressedSelect: () { 519 onPressedSelect: () {