xt / Flutter-ReserveApp · Commits

Go to a project

Commit fbe7fa8dcefd7afc9befcc1c4c756d3fcd5e88f5

Authored by wdn127929
1 parent ecb5506c
build: skipped

第几次进店UI调整

Inline Side-by-side
Showing 8 changed files with 230 additions and 219 deletions
@@ -34,7 +34,6 @@ def flutterVersionName = "5.5.0" @@ -34,7 +34,6 @@ def flutterVersionName = "5.5.0"
34 if (flutterVersionName == null) { 34 if (flutterVersionName == null) {
35 flutterVersionName = '5.5.0' 35 flutterVersionName = '5.5.0'
36 36
37 -  
38 } 37 }
39 38
40 39
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 11
12 import 'dart:async'; 12 import 'dart:async';
13 13
  14 +import 'package:flutter/foundation.dart';
14 import 'package:intl/intl.dart'; 15 import 'package:intl/intl.dart';
15 import 'package:intl/message_lookup_by_library.dart'; 16 import 'package:intl/message_lookup_by_library.dart';
16 import 'package:intl/src/intl_helpers.dart'; 17 import 'package:intl/src/intl_helpers.dart';
@@ -19,11 +20,9 @@ import 'messages_en.dart' as messages_en; @@ -19,11 +20,9 @@ import 'messages_en.dart' as messages_en;
19 20
20 typedef Future<dynamic> LibraryLoader(); 21 typedef Future<dynamic> LibraryLoader();
21 Map<String, LibraryLoader> _deferredLibraries = { 22 Map<String, LibraryLoader> _deferredLibraries = {
22 - 'en': () => new Future.value(null), 23 + 'en': () => new SynchronousFuture(null),
23 }; 24 };
24 25
25 -  
26 -  
27 MessageLookupByLibrary? _findExact(String localeName) { 26 MessageLookupByLibrary? _findExact(String localeName) {
28 switch (localeName) { 27 switch (localeName) {
29 case 'en': 28 case 'en':
@@ -34,19 +33,20 @@ MessageLookupByLibrary? _findExact(String localeName) { @@ -34,19 +33,20 @@ MessageLookupByLibrary? _findExact(String localeName) {
34 } 33 }
35 34
36 /// User programs should call this before using [localeName] for messages. 35 /// User programs should call this before using [localeName] for messages.
37 -Future<bool> initializeMessages(String localeName) async { 36 +Future<bool> initializeMessages(String localeName) {
38 var availableLocale = Intl.verifiedLocale( 37 var availableLocale = Intl.verifiedLocale(
39 localeName, 38 localeName,
40 (locale) => _deferredLibraries[locale] != null, 39 (locale) => _deferredLibraries[locale] != null,
41 - onFailure: (_) => null); 40 + onFailure: (_) => null,
  41 + );
42 if (availableLocale == null) { 42 if (availableLocale == null) {
43 - return new Future.value(false); 43 + return new SynchronousFuture(false);
44 } 44 }
45 var lib = _deferredLibraries[availableLocale]; 45 var lib = _deferredLibraries[availableLocale];
46 - await (lib == null ? new Future.value(false) : lib()); 46 + lib == null ? new SynchronousFuture(false) : lib();
47 initializeInternalMessageLookup(() => new CompositeMessageLookup()); 47 initializeInternalMessageLookup(() => new CompositeMessageLookup());
48 messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor); 48 messageLookup.addLocale(availableLocale, _findGeneratedMessagesFor);
49 - return new Future.value(true); 49 + return new SynchronousFuture(true);
50 } 50 }
51 51
52 bool _messagesExistFor(String locale) { 52 bool _messagesExistFor(String locale) {
@@ -58,8 +58,11 @@ bool _messagesExistFor(String locale) { @@ -58,8 +58,11 @@ bool _messagesExistFor(String locale) {
58 } 58 }
59 59
60 MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) { 60 MessageLookupByLibrary? _findGeneratedMessagesFor(String locale) {
61 - var actualLocale = Intl.verifiedLocale(locale, _messagesExistFor,  
62 - onFailure: (_) => null); 61 + var actualLocale = Intl.verifiedLocale(
  62 + locale,
  63 + _messagesExistFor,
  64 + onFailure: (_) => null,
  65 + );
63 if (actualLocale == null) return null; 66 if (actualLocale == null) return null;
64 return _findExact(actualLocale); 67 return _findExact(actualLocale);
65 } 68 }
@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 // ignore_for_file:unnecessary_brace_in_string_interps, unnecessary_new 7 // ignore_for_file:unnecessary_brace_in_string_interps, unnecessary_new
8 // ignore_for_file:prefer_single_quotes,comment_references, directives_ordering 8 // ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
9 // ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases 9 // ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
10 -// ignore_for_file:unused_import, file_names 10 +// ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
  11 +// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
11 12
12 import 'package:intl/intl.dart'; 13 import 'package:intl/intl.dart';
13 import 'package:intl/message_lookup_by_library.dart'; 14 import 'package:intl/message_lookup_by_library.dart';
@@ -19,8 +20,6 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args); @@ -19,8 +20,6 @@ typedef String MessageIfAbsent(String messageStr, List<dynamic> args);
19 class MessageLookup extends MessageLookupByLibrary { 20 class MessageLookup extends MessageLookupByLibrary {
20 String get localeName => 'en'; 21 String get localeName => 'en';
21 22
22 - final Map<String, dynamic> messages = _notInlinedMessages(_notInlinedMessages);  
23 - static _notInlinedMessages(_) => <String, Function> {  
24 -  
25 - }; 23 + final messages = _notInlinedMessages(_notInlinedMessages);
  24 + static Map<String, Function> _notInlinedMessages(_) => <String, Function>{};
26 } 25 }
1 // GENERATED CODE - DO NOT MODIFY BY HAND 1 // GENERATED CODE - DO NOT MODIFY BY HAND
2 -  
3 -import 'dart:async';  
4 -  
5 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
6 import 'package:intl/intl.dart'; 3 import 'package:intl/intl.dart';
7 import 'intl/messages_all.dart'; 4 import 'intl/messages_all.dart';
@@ -13,41 +10,57 @@ import 'intl/messages_all.dart'; @@ -13,41 +10,57 @@ import 'intl/messages_all.dart';
13 10
14 // ignore_for_file: non_constant_identifier_names, lines_longer_than_80_chars 11 // ignore_for_file: non_constant_identifier_names, lines_longer_than_80_chars
15 // ignore_for_file: join_return_with_assignment, prefer_final_in_for_each 12 // ignore_for_file: join_return_with_assignment, prefer_final_in_for_each
16 -// ignore_for_file: avoid_redundant_argument_values 13 +// ignore_for_file: avoid_redundant_argument_values, avoid_escaping_inner_quotes
17 14
18 class S { 15 class S {
19 S(); 16 S();
20 -  
21 - static late S current;  
22 -  
23 - static const AppLocalizationDelegate delegate =  
24 - AppLocalizationDelegate(); 17 +
  18 + static S? _current;
  19 +
  20 + static S get current {
  21 + assert(
  22 + _current != null,
  23 + 'No instance of S was loaded. Try to initialize the S delegate before accessing S.current.',
  24 + );
  25 + return _current!;
  26 + }
  27 +
  28 + static const AppLocalizationDelegate delegate = AppLocalizationDelegate();
25 29
26 static Future<S> load(Locale locale) { 30 static Future<S> load(Locale locale) {
27 - final name = (locale.countryCode?.isEmpty ?? false) ? locale.languageCode : locale.toString();  
28 - final localeName = Intl.canonicalizedLocale(name); 31 + final name =
  32 + (locale.countryCode?.isEmpty ?? false)
  33 + ? locale.languageCode
  34 + : locale.toString();
  35 + final localeName = Intl.canonicalizedLocale(name);
29 return initializeMessages(localeName).then((_) { 36 return initializeMessages(localeName).then((_) {
30 Intl.defaultLocale = localeName; 37 Intl.defaultLocale = localeName;
31 - S.current = S();  
32 -  
33 - return S.current;  
34 - });  
35 - } 38 + final instance = S();
  39 + S._current = instance;
36 40
37 - static S? of(BuildContext context) {  
38 - return Localizations.of<S>(context, S); 41 + return instance;
  42 + });
39 } 43 }
40 44
  45 + static S of(BuildContext context) {
  46 + final instance = S.maybeOf(context);
  47 + assert(
  48 + instance != null,
  49 + 'No instance of S present in the widget tree. Did you add S.delegate in localizationsDelegates?',
  50 + );
  51 + return instance!;
  52 + }
41 53
  54 + static S? maybeOf(BuildContext context) {
  55 + return Localizations.of<S>(context, S);
  56 + }
42 } 57 }
43 58
44 class AppLocalizationDelegate extends LocalizationsDelegate<S> { 59 class AppLocalizationDelegate extends LocalizationsDelegate<S> {
45 const AppLocalizationDelegate(); 60 const AppLocalizationDelegate();
46 61
47 List<Locale> get supportedLocales { 62 List<Locale> get supportedLocales {
48 - return const <Locale>[  
49 - Locale.fromSubtags(languageCode: 'en'),  
50 - ]; 63 + return const <Locale>[Locale.fromSubtags(languageCode: 'en')];
51 } 64 }
52 65
53 @override 66 @override
@@ -58,13 +71,11 @@ class AppLocalizationDelegate extends LocalizationsDelegate<S> { @@ -58,13 +71,11 @@ class AppLocalizationDelegate extends LocalizationsDelegate<S> {
58 bool shouldReload(AppLocalizationDelegate old) => false; 71 bool shouldReload(AppLocalizationDelegate old) => false;
59 72
60 bool _isSupported(Locale locale) { 73 bool _isSupported(Locale locale) {
61 - if (locale != null) {  
62 - for (var supportedLocale in supportedLocales) {  
63 - if (supportedLocale.languageCode == locale.languageCode) {  
64 - return true;  
65 - } 74 + for (var supportedLocale in supportedLocales) {
  75 + if (supportedLocale.languageCode == locale.languageCode) {
  76 + return true;
66 } 77 }
67 } 78 }
68 return false; 79 return false;
69 } 80 }
70 -}  
  81 +}
@@ -48,18 +48,18 @@ class Table { @@ -48,18 +48,18 @@ class Table {
48 48
49 //预订总次数显示 49 //预订总次数显示
50 String get reserveCountShow { 50 String get reserveCountShow {
51 - if (reserveCount == '1' || phone == null || phone == '' 51 + if (reserveCount == '1'
52 // || 52 // ||
53 // reserver == null || 53 // reserver == null ||
54 // reserver.isEmpty || 54 // reserver.isEmpty ||
55 // reserver == '' 55 // reserver == ''
56 ) { 56 ) {
57 // 预订次数== 1 或者 姓名或者客户电话号码为空的时候 ,显示首次预订 57 // 预订次数== 1 或者 姓名或者客户电话号码为空的时候 ,显示首次预订
58 - return "首次预订"; 58 + return "新客";
59 } else if (reserveCount != null && 59 } else if (reserveCount != null &&
60 reserveCount != '0' && 60 reserveCount != '0' &&
61 reserveCount != '') { 61 reserveCount != '') {
62 - return '${reserveCount}次预订'; 62 + return '第${reserveCount}次进店';
63 } else { 63 } else {
64 return ''; 64 return '';
65 } 65 }
@@ -383,18 +383,19 @@ class ReserveListModel { @@ -383,18 +383,19 @@ class ReserveListModel {
383 383
384 //预订总次数显示 384 //预订总次数显示
385 String get reserveCountShow { 385 String get reserveCountShow {
386 - if (reserveCount == '1' || phone == null || phone == '' 386 +
  387 + if (reserveCount == '1'
387 // || 388 // ||
388 // reserver == null || 389 // reserver == null ||
389 // reserver.isEmpty || 390 // reserver.isEmpty ||
390 // reserver == '' 391 // reserver == ''
391 ) { 392 ) {
392 // 预订次数== 1 或者 姓名或者客户电话号码为空的时候 ,显示首次预订 393 // 预订次数== 1 或者 姓名或者客户电话号码为空的时候 ,显示首次预订
393 - return "首次预订"; 394 + return "新客";
394 } else if (reserveCount != null && 395 } else if (reserveCount != null &&
395 reserveCount != '0' && 396 reserveCount != '0' &&
396 reserveCount != '') { 397 reserveCount != '') {
397 - return '${reserveCount}次预订'; 398 + return '第${reserveCount}次进店';
398 } else { 399 } else {
399 return ''; 400 return '';
400 } 401 }
@@ -350,9 +350,10 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { @@ -350,9 +350,10 @@ class TableItemOrReserveState extends State<TableItemOrReserve> {
350 crossAxisAlignment: CrossAxisAlignment.center, 350 crossAxisAlignment: CrossAxisAlignment.center,
351 mainAxisAlignment: MainAxisAlignment.center, 351 mainAxisAlignment: MainAxisAlignment.center,
352 children: <Widget>[ 352 children: <Widget>[
353 - widget.need && table.signStr == '已预订' && !isSelf  
354 - ? SizedBox()  
355 - : VEmptyView(10), 353 + if (!(widget.need &&
  354 + table.signStr == '已预订' &&
  355 + !isSelf))
  356 + VEmptyView(10),
356 Container( 357 Container(
357 // color: Colors.red, 358 // color: Colors.red,
358 alignment: Alignment.center, 359 alignment: Alignment.center,
@@ -387,89 +388,85 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { @@ -387,89 +388,85 @@ class TableItemOrReserveState extends State<TableItemOrReserve> {
387 // overflow: TextOverflow.ellipsis, 388 // overflow: TextOverflow.ellipsis,
388 // ), 389 // ),
389 ), 390 ),
390 - ((table.reserver != null && table.reserver != '') || 391 + if (((table.reserver != null &&
  392 + table.reserver != '') ||
  393 + (table.pnum != '' &&
  394 + table.pnum != null &&
  395 + table.pnum != '0')))
  396 + VEmptyView(8),
  397 +
  398 + if (!(table.signStr == '已预订' && !isSelf))
  399 + Text(
  400 + table.tableNum,
  401 + style: TextStyle(
  402 + color: table.signStr == '已预订' && !isSelf
  403 + ? MyColours.color_353535
  404 + : (widget.canSelected && table.selected)
  405 + ? MyColours.color_ffffff
  406 + : MyColours.color_353535,
  407 + fontSize: ScreenUtil().setSp(22),
  408 + decoration: TextDecoration.none,
  409 + fontWeight: FontWeight.normal),
  410 + overflow: TextOverflow.ellipsis,
  411 + ),
  412 + if (table.signStr == '已预订' &&
  413 + !isSelf &&
  414 + ((table.reserver != null &&
  415 + !table.reserver!.isEmpty &&
  416 + table.reserver != '') ||
391 (table.pnum != '' && 417 (table.pnum != '' &&
392 table.pnum != null && 418 table.pnum != null &&
393 - table.pnum != '0'))  
394 - ? VEmptyView(8)  
395 - : SizedBox(),  
396 - table.signStr == '已预订' && !isSelf  
397 - ? SizedBox()  
398 - : Text(  
399 - table.tableNum,  
400 - style: TextStyle(  
401 - color: table.signStr == '已预订' && !isSelf  
402 - ? MyColours.color_353535  
403 - : (widget.canSelected &&  
404 - table.selected)  
405 - ? MyColours.color_ffffff  
406 - : MyColours.color_353535,  
407 - fontSize: ScreenUtil().setSp(22),  
408 - decoration: TextDecoration.none,  
409 - fontWeight: FontWeight.normal),  
410 - overflow: TextOverflow.ellipsis,  
411 - ),  
412 - table.signStr == '已预订' &&  
413 - !isSelf &&  
414 - ((table.reserver != null &&  
415 - !table.reserver!.isEmpty &&  
416 - table.reserver != '') ||  
417 - (table.pnum != '' && 419 + table.pnum != '0')))
  420 + Text(
  421 + (table.reserver == null ||
  422 + table.reserver!.isEmpty ||
  423 + table.reserver == '')
  424 + ? (table.pnum != '' &&
418 table.pnum != null && 425 table.pnum != null &&
419 - table.pnum != '0'))  
420 - ? Text(  
421 - (table.reserver == null ||  
422 - table.reserver!.isEmpty ||  
423 - table.reserver == '')  
424 - ? (table.pnum != '' && 426 + table.pnum != '0')
  427 + ? '(${table.pnum}人)'
  428 + : ''
  429 + : '${table.reserver}' +
  430 + (table.pnum != '' &&
425 table.pnum != null && 431 table.pnum != null &&
426 - table.pnum != '0') 432 + table.pnum != '0'
427 ? '(${table.pnum}人)' 433 ? '(${table.pnum}人)'
428 - : ''  
429 - : '${table.reserver}' +  
430 - (table.pnum != '' &&  
431 - table.pnum != null &&  
432 - table.pnum != '0'  
433 - ? '(${table.pnum}人)'  
434 - : ''),  
435 - style: TextStyle(  
436 - color: table.signStr == '已预订' && !isSelf  
437 - ? MyColours.color_353535  
438 - : (widget.canSelected &&  
439 - table.selected)  
440 - ? MyColours.color_ffffff  
441 - : MyColours.color_353535,  
442 - fontSize: ScreenUtil().setSp(22),  
443 - decoration: TextDecoration.none,  
444 - fontWeight: FontWeight.normal),  
445 - overflow: TextOverflow.ellipsis,  
446 - )  
447 - : SizedBox(), 434 + : ''),
  435 + style: TextStyle(
  436 + color: table.signStr == '已预订' && !isSelf
  437 + ? MyColours.color_353535
  438 + : (widget.canSelected && table.selected)
  439 + ? MyColours.color_ffffff
  440 + : MyColours.color_353535,
  441 + fontSize: ScreenUtil().setSp(22),
  442 + decoration: TextDecoration.none,
  443 + fontWeight: FontWeight.normal),
  444 + overflow: TextOverflow.ellipsis,
  445 + ),
448 446
449 - widget.need &&  
450 - table.signStr == '已预订' &&  
451 - !isSelf &&  
452 - table.place_order_name != null &&  
453 - table.place_order_name != ''  
454 - ? Padding(  
455 - padding: EdgeInsets.only(  
456 - top: ScreenUtil().setWidth(6),  
457 - bottom: ScreenUtil().setWidth(8),  
458 - ),  
459 - child: Text(  
460 - table.place_order_name != null &&  
461 - table.place_order_name != ''  
462 - ? '${table.place_order_name}订'  
463 - : '',  
464 - style: TextStyle(  
465 - color: MyColours.color_353535,  
466 - fontSize: ScreenUtil().setSp(22),  
467 - decoration: TextDecoration.none,  
468 - fontWeight: FontWeight.normal),  
469 - overflow: TextOverflow.ellipsis,  
470 - ),  
471 - )  
472 - : SizedBox(), 447 + if (widget.need &&
  448 + table.signStr == '已预订' &&
  449 + !isSelf &&
  450 + table.place_order_name != null &&
  451 + table.place_order_name != '')
  452 + Padding(
  453 + padding: EdgeInsets.only(
  454 + top: ScreenUtil().setWidth(6),
  455 + bottom: ScreenUtil().setWidth(8),
  456 + ),
  457 + child: Text(
  458 + table.place_order_name != null &&
  459 + table.place_order_name != ''
  460 + ? '${table.place_order_name}订'
  461 + : '',
  462 + style: TextStyle(
  463 + color: MyColours.color_353535,
  464 + fontSize: ScreenUtil().setSp(22),
  465 + decoration: TextDecoration.none,
  466 + fontWeight: FontWeight.normal),
  467 + overflow: TextOverflow.ellipsis,
  468 + ),
  469 + ),
473 // VEmptyView(6), 470 // VEmptyView(6),
474 // Text( 471 // Text(
475 // table.lowStr, 472 // table.lowStr,
@@ -480,54 +477,54 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { @@ -480,54 +477,54 @@ class TableItemOrReserveState extends State<TableItemOrReserve> {
480 // fontWeight: FontWeight.normal), 477 // fontWeight: FontWeight.normal),
481 // overflow: TextOverflow.ellipsis, 478 // overflow: TextOverflow.ellipsis,
482 // ) 479 // )
483 - table.signStr == '已预订' && !isSelf  
484 - ? Container(  
485 - // width: ScreenUtil().setWidth(160),  
486 - height: ScreenUtil().setWidth(34),  
487 - )  
488 - : SizedBox() 480 + if (table.label != '' &&
  481 + table.label != null &&
  482 + table.signStr == '已预订' &&
  483 + !isSelf)
  484 + Container(
  485 + // width: ScreenUtil().setWidth(160),
  486 + height: ScreenUtil().setWidth(34),
  487 + )
489 ], 488 ],
490 ), 489 ),
491 ), 490 ),
492 491
493 - table.signStr == '已预订' && !isSelf  
494 - ? SizedBox()  
495 - : Positioned(  
496 - left: 0,  
497 - top: 0,  
498 - child: table.tidStr == null  
499 - ? Container()  
500 - : Container(  
501 - // width: ScreenUtil().setWidth(60),  
502 - // height: ScreenUtil().setWidth(42),  
503 - padding: EdgeInsets.all(  
504 - ScreenUtil().setWidth(4)),  
505 - alignment: Alignment.center,  
506 - decoration: BoxDecoration( 492 + if (!(table.signStr == '已预订' && !isSelf))
  493 + Positioned(
  494 + left: 0,
  495 + top: 0,
  496 + child: table.tidStr == null
  497 + ? Container()
  498 + : Container(
  499 + // width: ScreenUtil().setWidth(60),
  500 + // height: ScreenUtil().setWidth(42),
  501 + padding:
  502 + EdgeInsets.all(ScreenUtil().setWidth(4)),
  503 + alignment: Alignment.center,
  504 + decoration: BoxDecoration(
  505 + color: widget.canSelected &&
  506 + table.selected
  507 + ? MyColours.color_199095
  508 + : Color.fromRGBO(239, 239, 239, 1),
  509 + borderRadius: BorderRadius.only(
  510 + topLeft: Radius.circular(
  511 + ScreenUtil().setWidth(20)),
  512 + // topRight:
  513 + // Radius.circular(ScreenUtil().setWidth(8)),
  514 + // bottomRight: Radius.circular(
  515 + // ScreenUtil().setWidth(8))
  516 + )),
  517 + child: Text(table.tidStr,
  518 + style: TextStyle(
507 color: widget.canSelected && 519 color: widget.canSelected &&
508 table.selected 520 table.selected
509 - ? MyColours.color_199095  
510 - : Color.fromRGBO(  
511 - 239, 239, 239, 1),  
512 - borderRadius: BorderRadius.only(  
513 - topLeft: Radius.circular(  
514 - ScreenUtil().setWidth(20)),  
515 - // topRight:  
516 - // Radius.circular(ScreenUtil().setWidth(8)),  
517 - // bottomRight: Radius.circular(  
518 - // ScreenUtil().setWidth(8))  
519 - )),  
520 - child: Text(table.tidStr,  
521 - style: TextStyle(  
522 - color: widget.canSelected &&  
523 - table.selected  
524 - ? MyColours.color_ffffff  
525 - : MyColours.color_333333,  
526 - fontSize: ScreenUtil().setSp(20),  
527 - decoration: TextDecoration.none,  
528 - fontWeight: FontWeight.normal)),  
529 - ),  
530 - ), 521 + ? MyColours.color_ffffff
  522 + : MyColours.color_333333,
  523 + fontSize: ScreenUtil().setSp(20),
  524 + decoration: TextDecoration.none,
  525 + fontWeight: FontWeight.normal)),
  526 + ),
  527 + ),
531 // widget.need && table.signStr == '已预订' 528 // widget.need && table.signStr == '已预订'
532 // ? Positioned( 529 // ? Positioned(
533 // bottom: 0, 530 // bottom: 0,
@@ -574,52 +571,53 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { @@ -574,52 +571,53 @@ class TableItemOrReserveState extends State<TableItemOrReserve> {
574 // height: ScreenUtil().setWidth(40), 571 // height: ScreenUtil().setWidth(40),
575 // ) 572 // )
576 // : Container()), 573 // : Container()),
577 - widget.need && table.signStr == '已预订' && !isSelf  
578 - ? SizedBox()  
579 - : Positioned(  
580 - left: ScreenUtil().setWidth(18),  
581 - bottom: ScreenUtil().setWidth(12),  
582 - child: table.isPhoto != 1  
583 - ? Image.asset(  
584 - widget.canSelected && table.selected  
585 - ? 'assets/f_camera_white.png'  
586 - : "assets/f_camera.png",  
587 - width: ScreenUtil().setWidth(22),  
588 - height: ScreenUtil().setWidth(22),  
589 - )  
590 - : Container()),  
591 - Positioned(  
592 - bottom: 0,  
593 - right: 0,  
594 - left: 0,  
595 - child: table.signStr == '已预订' && !isSelf  
596 - ? Container(  
597 - // width: ScreenUtil().setWidth(160),  
598 - height: ScreenUtil().setWidth(34),  
599 - alignment: Alignment.center,  
600 - padding: EdgeInsets.symmetric(  
601 - horizontal: ScreenUtil().setWidth(10)),  
602 - decoration: BoxDecoration(  
603 - color: table.sign == '10'  
604 - ? MyColours.color_F7C797  
605 - : MyColours.color_d9d9d9,  
606 - borderRadius: BorderRadius.only(  
607 - bottomLeft: Radius.circular(  
608 - ScreenUtil().setWidth(20)),  
609 - bottomRight: Radius.circular(  
610 - ScreenUtil().setWidth(20)))),  
611 - child: Text(  
612 - table.label!,  
613 - textAlign: TextAlign.center,  
614 - overflow: TextOverflow.ellipsis,  
615 - style: TextStyle(  
616 - color: MyColours.color_28323B,  
617 - fontSize: ScreenUtil().setSp(22),  
618 - decoration: TextDecoration.none,  
619 - fontWeight: FontWeight.normal),  
620 - ),  
621 - )  
622 - : SizedBox()) 574 + if (!(widget.need && table.signStr == '已预订' && !isSelf))
  575 + Positioned(
  576 + left: ScreenUtil().setWidth(18),
  577 + bottom: ScreenUtil().setWidth(12),
  578 + child: table.isPhoto != 1
  579 + ? Image.asset(
  580 + widget.canSelected && table.selected
  581 + ? 'assets/f_camera_white.png'
  582 + : "assets/f_camera.png",
  583 + width: ScreenUtil().setWidth(22),
  584 + height: ScreenUtil().setWidth(22),
  585 + )
  586 + : Container()),
  587 + if (table.label != '' &&
  588 + table.label != null &&
  589 + table.signStr == '已预订' &&
  590 + !isSelf)
  591 + Positioned(
  592 + bottom: 0,
  593 + right: 0,
  594 + left: 0,
  595 + child: Container(
  596 + // width: ScreenUtil().setWidth(160),
  597 + height: ScreenUtil().setWidth(34),
  598 + alignment: Alignment.center,
  599 + padding: EdgeInsets.symmetric(
  600 + horizontal: ScreenUtil().setWidth(10)),
  601 + decoration: BoxDecoration(
  602 + color: table.sign == '10'
  603 + ? MyColours.color_F7C797
  604 + : MyColours.color_d9d9d9,
  605 + borderRadius: BorderRadius.only(
  606 + bottomLeft:
  607 + Radius.circular(ScreenUtil().setWidth(20)),
  608 + bottomRight: Radius.circular(
  609 + ScreenUtil().setWidth(20)))),
  610 + child: Text(
  611 + table.label!,
  612 + textAlign: TextAlign.center,
  613 + overflow: TextOverflow.ellipsis,
  614 + style: TextStyle(
  615 + color: MyColours.color_28323B,
  616 + fontSize: ScreenUtil().setSp(22),
  617 + decoration: TextDecoration.none,
  618 + fontWeight: FontWeight.normal),
  619 + ),
  620 + ))
623 ], 621 ],
624 ), 622 ),
625 ); 623 );
@@ -397,7 +397,7 @@ class FTableItemState extends State<FTableItem> { @@ -397,7 +397,7 @@ class FTableItemState extends State<FTableItem> {
397 // fontWeight: FontWeight.normal), 397 // fontWeight: FontWeight.normal),
398 // overflow: TextOverflow.ellipsis, 398 // overflow: TextOverflow.ellipsis,
399 // ) 399 // )
400 - signStr == '已预订' && !isSelf 400 + signStr == '已预订' && !isSelf && (table.sign == '10' || table.reserveCountShow != '')
401 ? Container( 401 ? Container(
402 // width: ScreenUtil().setWidth(160), 402 // width: ScreenUtil().setWidth(160),
403 height: ScreenUtil().setWidth(34), 403 height: ScreenUtil().setWidth(34),
@@ -519,7 +519,7 @@ class FTableItemState extends State<FTableItem> { @@ -519,7 +519,7 @@ class FTableItemState extends State<FTableItem> {
519 decoration: BoxDecoration( 519 decoration: BoxDecoration(
520 color: table.sign == '10' 520 color: table.sign == '10'
521 ? MyColours.color_F7C797 521 ? MyColours.color_F7C797
522 - : MyColours.color_d9d9d9, 522 + :table.reserveCountShow == ''? Colors.transparent: MyColours.color_d9d9d9,
523 borderRadius: BorderRadius.only( 523 borderRadius: BorderRadius.only(
524 bottomLeft: Radius.circular( 524 bottomLeft: Radius.circular(
525 ScreenUtil().setWidth(20)), 525 ScreenUtil().setWidth(20)),