xt / Flutter-ReserveApp · Commits

Go to a project

Commit 6f980388a71e7499bec88db8256cd48033393561

Authored by wdn127929
1 parent bc96f8cb
build: skipped

fff

Inline Side-by-side
Showing 3 changed files with 60 additions and 23 deletions
@@ -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 = 5544; 452 + CURRENT_PROJECT_VERSION = 5545;
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;
@@ -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 = 5544; 635 + CURRENT_PROJECT_VERSION = 5545;
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;
@@ -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 = 5544; 661 + CURRENT_PROJECT_VERSION = 5545;
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;
@@ -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
@@ -337,8 +337,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -337,8 +337,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
337 textAlign: TextAlign.center, 337 textAlign: TextAlign.center,
338 maxLines: 1, 338 maxLines: 1,
339 overflow: TextOverflow.ellipsis, 339 overflow: TextOverflow.ellipsis,
  340 + strutStyle: StrutStyle(
  341 + forceStrutHeight:
  342 + true, // 关键属性 强制改为文字高度
  343 + ),
340 style: TextStyle( 344 style: TextStyle(
341 - height: 1,  
342 fontWeight: FontWeight.bold, 345 fontWeight: FontWeight.bold,
343 color: MyColours.color_FFEFC5, 346 color: MyColours.color_FFEFC5,
344 fontSize: font(16)), 347 fontSize: font(16)),
@@ -356,8 +359,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -356,8 +359,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
356 textAlign: TextAlign.center, 359 textAlign: TextAlign.center,
357 maxLines: 2, 360 maxLines: 2,
358 overflow: TextOverflow.ellipsis, 361 overflow: TextOverflow.ellipsis,
  362 + strutStyle: StrutStyle(
  363 + forceStrutHeight:
  364 + true, // 关键属性 强制改为文字高度
  365 + ),
359 style: TextStyle( 366 style: TextStyle(
360 - height: 1,  
361 color: MyColours.color_FFEFC5, 367 color: MyColours.color_FFEFC5,
362 fontWeight: FontWeight.bold, 368 fontWeight: FontWeight.bold,
363 fontSize: font(16)), 369 fontSize: font(16)),
@@ -398,32 +404,38 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -398,32 +404,38 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
398 textAlign: TextAlign.center, 404 textAlign: TextAlign.center,
399 maxLines: 2, 405 maxLines: 2,
400 overflow: TextOverflow.ellipsis, 406 overflow: TextOverflow.ellipsis,
  407 + strutStyle: StrutStyle(
  408 + forceStrutHeight: true, // 关键属性 强制改为文字高度
  409 + ),
401 style: TextStyle( 410 style: TextStyle(
402 - height: 1,  
403 fontWeight: FontWeight.bold, 411 fontWeight: FontWeight.bold,
404 color: MyColours.color_FFEFC5, 412 color: MyColours.color_FFEFC5,
405 fontSize: font(16)), 413 fontSize: font(16)),
406 ), 414 ),
407 - VEmptyView(60), 415 + VEmptyView(90),
408 Text( 416 Text(
409 '${Utils.addZeroNumber(DateTime.now().month)}/${Utils.addZeroNumber(DateTime.now().day)}', 417 '${Utils.addZeroNumber(DateTime.now().month)}/${Utils.addZeroNumber(DateTime.now().day)}',
410 textAlign: TextAlign.center, 418 textAlign: TextAlign.center,
411 maxLines: 1, 419 maxLines: 1,
412 overflow: TextOverflow.ellipsis, 420 overflow: TextOverflow.ellipsis,
  421 + strutStyle: StrutStyle(
  422 + forceStrutHeight: true, // 关键属性 强制改为文字高度
  423 + ),
413 style: TextStyle( 424 style: TextStyle(
414 - height: 1,  
415 color: MyColours.color_FFEFC5, 425 color: MyColours.color_FFEFC5,
416 fontWeight: FontWeight.bold, 426 fontWeight: FontWeight.bold,
417 fontSize: font(36)), 427 fontSize: font(36)),
418 ), 428 ),
419 - // VEmptyView(8), 429 + VEmptyView(12),
420 Text( 430 Text(
421 time, 431 time,
422 textAlign: TextAlign.center, 432 textAlign: TextAlign.center,
423 maxLines: 2, 433 maxLines: 2,
424 overflow: TextOverflow.ellipsis, 434 overflow: TextOverflow.ellipsis,
  435 + strutStyle: StrutStyle(
  436 + forceStrutHeight: true, // 关键属性 强制改为文字高度
  437 + ),
425 style: TextStyle( 438 style: TextStyle(
426 - height: 1,  
427 color: MyColours.color_FFEFC5, 439 color: MyColours.color_FFEFC5,
428 fontWeight: FontWeight.bold, 440 fontWeight: FontWeight.bold,
429 fontSize: font(16)), 441 fontSize: font(16)),
@@ -480,8 +492,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -480,8 +492,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
480 textAlign: TextAlign.center, 492 textAlign: TextAlign.center,
481 maxLines: 2, 493 maxLines: 2,
482 overflow: TextOverflow.ellipsis, 494 overflow: TextOverflow.ellipsis,
  495 + strutStyle: StrutStyle(
  496 + forceStrutHeight:
  497 + true, // 关键属性 强制改为文字高度
  498 + ),
483 style: TextStyle( 499 style: TextStyle(
484 - height: 1,  
485 fontWeight: FontWeight.bold, 500 fontWeight: FontWeight.bold,
486 color: MyColours.color_FFEFC5, 501 color: MyColours.color_FFEFC5,
487 fontSize: font(16)), 502 fontSize: font(16)),
@@ -505,8 +520,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -505,8 +520,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
505 maxLines: 1, 520 maxLines: 1,
506 overflow: 521 overflow:
507 TextOverflow.ellipsis, 522 TextOverflow.ellipsis,
  523 + strutStyle: StrutStyle(
  524 + forceStrutHeight:
  525 + true, // 关键属性 强制改为文字高度
  526 + ),
508 style: TextStyle( 527 style: TextStyle(
509 - height: 1,  
510 color: MyColours 528 color: MyColours
511 .color_FFEFC5, 529 .color_FFEFC5,
512 fontWeight: 530 fontWeight:
@@ -525,8 +543,12 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -525,8 +543,12 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
525 maxLines: 3, 543 maxLines: 3,
526 overflow: 544 overflow:
527 TextOverflow.ellipsis, 545 TextOverflow.ellipsis,
  546 + strutStyle: StrutStyle(
  547 + forceStrutHeight:
  548 + true, // 关键属性 强制改为文字高度
  549 + ),
528 style: TextStyle( 550 style: TextStyle(
529 - height: 1, 551 +
530 // writingMode: TextWritingMode.verticalLr, 552 // writingMode: TextWritingMode.verticalLr,
531 color: MyColours 553 color: MyColours
532 .color_FFEFC5, 554 .color_FFEFC5,
@@ -536,7 +558,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -536,7 +558,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
536 )), 558 )),
537 ], 559 ],
538 )), 560 )),
539 - // VEmptyView(14), 561 + VEmptyView(14),
540 Container( 562 Container(
541 563
542 // constraints: BoxConstraints( 564 // constraints: BoxConstraints(
@@ -554,8 +576,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -554,8 +576,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
554 time, 576 time,
555 maxLines: 1, 577 maxLines: 1,
556 overflow: TextOverflow.ellipsis, 578 overflow: TextOverflow.ellipsis,
  579 + strutStyle: StrutStyle(
  580 + forceStrutHeight:
  581 + true, // 关键属性 强制改为文字高度
  582 + ),
557 style: TextStyle( 583 style: TextStyle(
558 - height: 1,  
559 color: MyColours.color_FFEFC5, 584 color: MyColours.color_FFEFC5,
560 fontWeight: FontWeight.bold, 585 fontWeight: FontWeight.bold,
561 fontSize: font(16)), 586 fontSize: font(16)),
@@ -613,7 +638,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -613,7 +638,7 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
613 textAlign: TextAlign.left, 638 textAlign: TextAlign.left,
614 overflow: TextOverflow.ellipsis, 639 overflow: TextOverflow.ellipsis,
615 style: TextStyle( 640 style: TextStyle(
616 - height: 1, 641 + height: 1,
617 fontWeight: FontWeight.bold, 642 fontWeight: FontWeight.bold,
618 color: MyColours.color_FFEFC5, 643 color: MyColours.color_FFEFC5,
619 fontSize: font(16)), 644 fontSize: font(16)),
@@ -629,8 +654,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -629,8 +654,11 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
629 maxLines: 1, 654 maxLines: 1,
630 overflow: 655 overflow:
631 TextOverflow.ellipsis, 656 TextOverflow.ellipsis,
  657 + strutStyle: StrutStyle(
  658 + forceStrutHeight:
  659 + true, // 关键属性 强制改为文字高度
  660 + ),
632 style: TextStyle( 661 style: TextStyle(
633 - height: 1,  
634 color: MyColours 662 color: MyColours
635 .color_FFEFC5, 663 .color_FFEFC5,
636 fontWeight: 664 fontWeight:
@@ -643,8 +671,12 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -643,8 +671,12 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
643 // maxLines: 3, 671 // maxLines: 3,
644 overflow: 672 overflow:
645 TextOverflow.ellipsis, 673 TextOverflow.ellipsis,
  674 + strutStyle: StrutStyle(
  675 + forceStrutHeight:
  676 + true, // 关键属性 强制改为文字高度
  677 + ),
646 style: TextStyle( 678 style: TextStyle(
647 - height: 1, 679 +
648 // writingMode: TextWritingMode.verticalLr, 680 // writingMode: TextWritingMode.verticalLr,
649 color: MyColours 681 color: MyColours
650 .color_FFEFC5, 682 .color_FFEFC5,
@@ -672,11 +704,16 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> { @@ -672,11 +704,16 @@ class _MiniprogramSettingPageState extends State<MiniprogramSettingPage> {
672 // height: h(26), 704 // height: h(26),
673 child: Text( 705 child: Text(
674 time, 706 time,
675 - maxLines: 1, 707 + // maxLines: 1,
676 overflow: 708 overflow:
677 TextOverflow.ellipsis, 709 TextOverflow.ellipsis,
  710 + strutStyle: StrutStyle(
  711 + forceStrutHeight:
  712 + true, // 关键属性 强制改为文字高度
  713 + ),
678 style: TextStyle( 714 style: TextStyle(
679 - height: 1, 715 +
  716 + // height: 1,
680 color: MyColours 717 color: MyColours
681 .color_FFEFC5, 718 .color_FFEFC5,
682 fontWeight: 719 fontWeight: