xt / Flutter-ReserveApp · Commits

Go to a project

Commit 2409f1defa74dfb4e9da1cb88374cb86df93e099

Authored by wdn127929
1 parent 7cd067ad
build: skipped

去掉一个开关UI

Inline Side-by-side
Showing 5 changed files with 29 additions and 22 deletions
@@ -20,19 +20,19 @@ if (flutterRoot == null) { @@ -20,19 +20,19 @@ if (flutterRoot == null) {
20 20
21 21
22 22
23 -def flutterVersionCode = "552" 23 +def flutterVersionCode = "553"
24 if (flutterVersionCode == null) { 24 if (flutterVersionCode == null) {
25 - flutterVersionCode = '552' 25 + flutterVersionCode = '553'
26 26
27 27
28 28
29 } 29 }
30 30
31 31
32 -def flutterVersionName = "5.5.2" 32 +def flutterVersionName = "5.5.3"
33 33
34 if (flutterVersionName == null) { 34 if (flutterVersionName == null) {
35 - flutterVersionName = '5.5.2' 35 + flutterVersionName = '5.5.3'
36 36
37 } 37 }
38 38
@@ -449,7 +449,7 @@ @@ -449,7 +449,7 @@
449 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 449 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
450 CLANG_ENABLE_MODULES = YES; 450 CLANG_ENABLE_MODULES = YES;
451 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 451 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
452 - CURRENT_PROJECT_VERSION = 552; 452 + CURRENT_PROJECT_VERSION = 5530;
453 DEVELOPMENT_TEAM = 8J59HM8B82; 453 DEVELOPMENT_TEAM = 8J59HM8B82;
454 ENABLE_BITCODE = NO; 454 ENABLE_BITCODE = NO;
455 INFOPLIST_FILE = Runner/Info.plist; 455 INFOPLIST_FILE = Runner/Info.plist;
@@ -458,7 +458,7 @@ @@ -458,7 +458,7 @@
458 "$(inherited)", 458 "$(inherited)",
459 "@executable_path/Frameworks", 459 "@executable_path/Frameworks",
460 ); 460 );
461 - MARKETING_VERSION = 5.5.2; 461 + MARKETING_VERSION = 5.5.3;
462 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 462 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
463 PRODUCT_NAME = "$(TARGET_NAME)"; 463 PRODUCT_NAME = "$(TARGET_NAME)";
464 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 464 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -632,7 +632,7 @@ @@ -632,7 +632,7 @@
632 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 632 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
633 CLANG_ENABLE_MODULES = YES; 633 CLANG_ENABLE_MODULES = YES;
634 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 634 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
635 - CURRENT_PROJECT_VERSION = 552; 635 + CURRENT_PROJECT_VERSION = 5530;
636 DEVELOPMENT_TEAM = 8J59HM8B82; 636 DEVELOPMENT_TEAM = 8J59HM8B82;
637 ENABLE_BITCODE = NO; 637 ENABLE_BITCODE = NO;
638 INFOPLIST_FILE = Runner/Info.plist; 638 INFOPLIST_FILE = Runner/Info.plist;
@@ -641,7 +641,7 @@ @@ -641,7 +641,7 @@
641 "$(inherited)", 641 "$(inherited)",
642 "@executable_path/Frameworks", 642 "@executable_path/Frameworks",
643 ); 643 );
644 - MARKETING_VERSION = 5.5.2; 644 + MARKETING_VERSION = 5.5.3;
645 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 645 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
646 PRODUCT_NAME = "$(TARGET_NAME)"; 646 PRODUCT_NAME = "$(TARGET_NAME)";
647 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 647 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -658,7 +658,7 @@ @@ -658,7 +658,7 @@
658 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 658 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
659 CLANG_ENABLE_MODULES = YES; 659 CLANG_ENABLE_MODULES = YES;
660 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 660 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
661 - CURRENT_PROJECT_VERSION = 552; 661 + CURRENT_PROJECT_VERSION = 5530;
662 DEVELOPMENT_TEAM = 8J59HM8B82; 662 DEVELOPMENT_TEAM = 8J59HM8B82;
663 ENABLE_BITCODE = NO; 663 ENABLE_BITCODE = NO;
664 INFOPLIST_FILE = Runner/Info.plist; 664 INFOPLIST_FILE = Runner/Info.plist;
@@ -667,7 +667,7 @@ @@ -667,7 +667,7 @@
667 "$(inherited)", 667 "$(inherited)",
668 "@executable_path/Frameworks", 668 "@executable_path/Frameworks",
669 ); 669 );
670 - MARKETING_VERSION = 5.5.2; 670 + MARKETING_VERSION = 5.5.3;
671 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 671 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
672 PRODUCT_NAME = "$(TARGET_NAME)"; 672 PRODUCT_NAME = "$(TARGET_NAME)";
673 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; 673 SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
@@ -10,10 +10,10 @@ class Constant { @@ -10,10 +10,10 @@ class Constant {
10 * 10 *
11 * 测试账号变更，已经删除0001 账户 代替为 0019！！！！！！！注意！！！！！！！！！！！！！！ 11 * 测试账号变更，已经删除0001 账户 代替为 0019！！！！！！！注意！！！！！！！！！！！！！！
12 * */ 12 * */
13 - static const WXMiniProgramType wxMiniProgramType =  
14 - WXMiniProgramType.release; //正式版  
15 // static const WXMiniProgramType wxMiniProgramType = 13 // static const WXMiniProgramType wxMiniProgramType =
16 - // WXMiniProgramType.preview; //体验版 14 + // WXMiniProgramType.release; //正式版
  15 + static const WXMiniProgramType wxMiniProgramType =
  16 + WXMiniProgramType.preview; //体验版
17 // static const WXMiniProgramType wxMiniProgramType = 17 // static const WXMiniProgramType wxMiniProgramType =
18 // WXMiniProgramType.test; //开发版 18 // WXMiniProgramType.test; //开发版
19 19
@@ -673,10 +673,10 @@ class _CouponDetailPageState extends State<CouponDetailPage> { @@ -673,10 +673,10 @@ class _CouponDetailPageState extends State<CouponDetailPage> {
673 ), 673 ),
674 child: Column( 674 child: Column(
675 children: [ 675 children: [
676 - _canUse(  
677 - '领取当日可用',  
678 - couponProvider.couponSunModel!  
679 - .arule!.isSameDay), 676 + // _canUse(
  677 + // '领取当日可用',
  678 + // couponProvider.couponSunModel!
  679 + // .arule!.isSameDay),
680 _canUse( 680 _canUse(
681 '可以叠加使用其他优惠券', 681 '可以叠加使用其他优惠券',
682 couponProvider.couponSunModel!.arule! 682 couponProvider.couponSunModel!.arule!
@@ -262,6 +262,10 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -262,6 +262,10 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
262 widget.couponSunModel!.aexpiration!.validForever == '1' 262 widget.couponSunModel!.aexpiration!.validForever == '1'
263 ? true 263 ? true
264 : false; 264 : false;
  265 +
  266 + if (validForeverCus) {
  267 + fromToEndDateCus = false;
  268 + }
265 if (widget.couponSunModel!.aexpiration!.stime != null) { 269 if (widget.couponSunModel!.aexpiration!.stime != null) {
266 fromToEndDateCus = true; 270 fromToEndDateCus = true;
267 DateTime dateTimes = DateTime.fromMillisecondsSinceEpoch( 271 DateTime dateTimes = DateTime.fromMillisecondsSinceEpoch(
@@ -280,16 +284,19 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -280,16 +284,19 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
280 if (widget.couponSunModel!.aexpiration!.today != null && 284 if (widget.couponSunModel!.aexpiration!.today != null &&
281 widget.couponSunModel!.aexpiration!.today != '') { 285 widget.couponSunModel!.aexpiration!.today != '') {
282 todayCus = true; 286 todayCus = true;
  287 + fromToEndDateCus = false;
283 todayC.text = widget.couponSunModel!.aexpiration!.today ?? ''; 288 todayC.text = widget.couponSunModel!.aexpiration!.today ?? '';
284 } 289 }
285 if (widget.couponSunModel!.aexpiration!.tomorrow != null && 290 if (widget.couponSunModel!.aexpiration!.tomorrow != null &&
286 widget.couponSunModel!.aexpiration!.tomorrow != '') { 291 widget.couponSunModel!.aexpiration!.tomorrow != '') {
287 tomorrowCus = true; 292 tomorrowCus = true;
  293 + fromToEndDateCus = false;
288 tomorrowC.text = widget.couponSunModel!.aexpiration!.tomorrow ?? ''; 294 tomorrowC.text = widget.couponSunModel!.aexpiration!.tomorrow ?? '';
289 } 295 }
290 if (widget.couponSunModel!.aexpiration!.sday != null && 296 if (widget.couponSunModel!.aexpiration!.sday != null &&
291 widget.couponSunModel!.aexpiration!.sday != '') { 297 widget.couponSunModel!.aexpiration!.sday != '') {
292 fromToEndDayCus = true; 298 fromToEndDayCus = true;
  299 + fromToEndDateCus = false;
293 fromDayC.text = widget.couponSunModel!.aexpiration!.sday ?? ''; 300 fromDayC.text = widget.couponSunModel!.aexpiration!.sday ?? '';
294 endDayC.text = widget.couponSunModel!.aexpiration!.eday ?? ''; 301 endDayC.text = widget.couponSunModel!.aexpiration!.eday ?? '';
295 } 302 }
@@ -2395,11 +2402,11 @@ class _CouponEidtPageState extends State<CouponEidtPage> { @@ -2395,11 +2402,11 @@ class _CouponEidtPageState extends State<CouponEidtPage> {
2395 ), 2402 ),
2396 child: Column( 2403 child: Column(
2397 children: [ 2404 children: [
2398 - _canUse('领取当日可用', isSameDay, () {  
2399 - setState(() {  
2400 - isSameDay = !isSameDay;  
2401 - });  
2402 - }, isBig: false), 2405 + // _canUse('领取当日可用', isSameDay, () {
  2406 + // setState(() {
  2407 + // isSameDay = !isSameDay;
  2408 + // });
  2409 + // }, isBig: false),
2403 _canUse('可以叠加使用其他优惠券', isAccumulation, () { 2410 _canUse('可以叠加使用其他优惠券', isAccumulation, () {
2404 setState(() { 2411 setState(() {
2405 isAccumulation = !isAccumulation; 2412 isAccumulation = !isAccumulation;