Commit db957ceb954bd892279c49af7393adf247aa65f6

Authored by wdn127929
1 parent eddf4bf6

核餐&预订订金打包

@@ -676,6 +676,7 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -676,6 +676,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
676 width: double.infinity, 676 width: double.infinity,
677 height: ScreenUtil() 677 height: ScreenUtil()
678 .setWidth(102), 678 .setWidth(102),
  679 + alignment: Alignment.center,
679 decoration: BoxDecoration( 680 decoration: BoxDecoration(
680 border: Border( 681 border: Border(
681 bottom: (index != 682 bottom: (index !=
@@ -695,85 +696,65 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -695,85 +696,65 @@ class _EditReserverPageState extends State<EditReserverPage> {
695 2)) 696 2))
696 : BorderSide 697 : BorderSide
697 .none)), 698 .none)),
698 - child: Wrap(  
699 - // mainAxisAlignment:  
700 - // MainAxisAlignment  
701 - // .spaceBetween,  
702 - runAlignment: WrapAlignment.center,  
703 - children: [  
704 - Text(  
705 - _nameNode.hasFocus  
706 - ? (detailModel 699 + child: Align(
  700 + alignment:
  701 + Alignment.centerLeft,
  702 + child: Text(
  703 + (_nameNode.hasFocus
  704 + ? (detailModel
  705 + .userHistorys[
  706 + index]
  707 + .rnameStr ==
  708 + null
  709 + ? ''
  710 + : detailModel
707 .userHistorys[ 711 .userHistorys[
708 index] 712 index]
709 - .rnameStr ==  
710 - null  
711 - ? ''  
712 - : detailModel  
713 - .userHistorys[  
714 - index]  
715 - .rnameStr)  
716 - : (detailModel 713 + .rnameStr)
  714 + : (detailModel
  715 + .userHistorys[
  716 + index]
  717 + .phone ==
  718 + null
  719 + ? ''
  720 + : detailModel
717 .userHistorys[ 721 .userHistorys[
718 index] 722 index]
719 - .phone ==  
720 - null  
721 - ? ''  
722 - : detailModel  
723 - .userHistorys[  
724 - index]  
725 - .phone),  
726 - style: TextStyle(  
727 - color: MyColours  
728 - .color_333333,  
729 - fontSize:  
730 - ScreenUtil()  
731 - .setSp(32)),  
732 - ),  
733 - HEmptyView(20),  
734 - Text(  
735 - _nameNode.hasFocus  
736 - ? (detailModel 723 + .phone)) +
  724 + ' ' +
  725 + (_nameNode.hasFocus
  726 + ? (detailModel
  727 + .userHistorys[
  728 + index]
  729 + .phone ==
  730 + null
  731 + ? ''
  732 + : detailModel
737 .userHistorys[ 733 .userHistorys[
738 index] 734 index]
739 - .phone ==  
740 - null  
741 - ? ''  
742 - : detailModel  
743 - .userHistorys[  
744 - index]  
745 - .phone)  
746 - : (detailModel 735 + .phone)
  736 + : (detailModel
  737 + .userHistorys[
  738 + index]
  739 + .rnameStr ==
  740 + null
  741 + ? ''
  742 + : detailModel
747 .userHistorys[ 743 .userHistorys[
748 index] 744 index]
749 - .rnameStr ==  
750 - null  
751 - ? ''  
752 - : detailModel  
753 - .userHistorys[  
754 - index]  
755 - .rnameStr),  
756 - style: TextStyle(  
757 - color: MyColours  
758 - .color_333333,  
759 - fontSize:  
760 - ScreenUtil()  
761 - .setSp(32)),  
762 - ),  
763 - HEmptyView(20),  
764 - Text(  
765 - detailModel  
766 - .userHistorys[index]  
767 - .nickName, 745 + .rnameStr)) +
  746 + ' ' +
  747 + detailModel
  748 + .userHistorys[
  749 + index]
  750 + .nickName,
768 style: TextStyle( 751 style: TextStyle(
769 color: MyColours 752 color: MyColours
770 .color_333333, 753 .color_333333,
771 fontSize: 754 fontSize:
772 ScreenUtil() 755 ScreenUtil()
773 .setSp(32)), 756 .setSp(32)),
774 - ),  
775 - ],  
776 - ), 757 + )),
777 ), 758 ),
778 ); 759 );
779 }, 760 },
@@ -1948,78 +1948,86 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1948,78 +1948,86 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1948 }); 1948 });
1949 }, 1949 },
1950 child: Container( 1950 child: Container(
1951 - width: double.infinity,  
1952 - height:  
1953 - ScreenUtil().setWidth(102),  
1954 - decoration: BoxDecoration(  
1955 - border: Border(  
1956 - bottom: (index !=  
1957 - (_notebookDetailChangeModel  
1958 - .userHistorys  
1959 - .length -  
1960 - 1) &&  
1961 - _notebookDetailChangeModel  
1962 - .userHistorys  
1963 - .length >  
1964 - 1)  
1965 - ? BorderSide(  
1966 - color: MyColours  
1967 - .color_e5e5e5,  
1968 - width:  
1969 - ScreenUtil()  
1970 - .setWidth(  
1971 - 2))  
1972 - : BorderSide.none)),  
1973 - child: Wrap(  
1974 - // mainAxisAlignment:  
1975 - // MainAxisAlignment  
1976 - // .spaceBetween,  
1977 - runAlignment:  
1978 - WrapAlignment.center,  
1979 - children: [  
1980 - Text(  
1981 - _nameNode.hasFocus  
1982 - ? _notebookDetailChangeModel  
1983 - .userHistorys[index]  
1984 - .rnameStr  
1985 - : _notebookDetailChangeModel  
1986 - .userHistorys[index]  
1987 - .phone,  
1988 - style: TextStyle(  
1989 - color: MyColours  
1990 - .color_333333,  
1991 - fontSize: ScreenUtil()  
1992 - .setSp(32)),  
1993 - ),  
1994 - HEmptyView(20),  
1995 - Text(  
1996 - _nameNode.hasFocus  
1997 - ? _notebookDetailChangeModel  
1998 - .userHistorys[index]  
1999 - .phone  
2000 - : _notebookDetailChangeModel  
2001 - .userHistorys[index]  
2002 - .rnameStr,  
2003 - style: TextStyle(  
2004 - color: MyColours  
2005 - .color_333333,  
2006 - fontSize: ScreenUtil()  
2007 - .setSp(32)),  
2008 - ),  
2009 - HEmptyView(20),  
2010 - Text(  
2011 - _notebookDetailChangeModel  
2012 - .userHistorys[index]  
2013 - .nickName,  
2014 - style: TextStyle(  
2015 - color: MyColours  
2016 - .color_333333,  
2017 - fontSize: ScreenUtil()  
2018 - .setSp(32)),  
2019 - ),  
2020 - ],  
2021 - ),  
2022 - ), 1951 + width: double.infinity,
  1952 + height:
  1953 + ScreenUtil().setWidth(102),
  1954 + decoration: BoxDecoration(
  1955 + border: Border(
  1956 + bottom: (index !=
  1957 + (_notebookDetailChangeModel
  1958 + .userHistorys
  1959 + .length -
  1960 + 1) &&
  1961 + _notebookDetailChangeModel
  1962 + .userHistorys
  1963 + .length >
  1964 + 1)
  1965 + ? BorderSide(
  1966 + color: MyColours
  1967 + .color_e5e5e5,
  1968 + width:
  1969 + ScreenUtil()
  1970 + .setWidth(
  1971 + 2))
  1972 + : BorderSide.none)),
  1973 + child: Align(
  1974 + alignment:
  1975 + Alignment.centerLeft,
  1976 + child: Text(
  1977 + (_nameNode.hasFocus
  1978 + ? (_notebookDetailChangeModel
  1979 + .userHistorys[
  1980 + index]
  1981 + .rnameStr ==
  1982 + null
  1983 + ? ''
  1984 + : _notebookDetailChangeModel
  1985 + .userHistorys[
  1986 + index]
  1987 + .rnameStr)
  1988 + : (_notebookDetailChangeModel
  1989 + .userHistorys[
  1990 + index]
  1991 + .phone ==
  1992 + null
  1993 + ? ''
  1994 + : _notebookDetailChangeModel
  1995 + .userHistorys[
  1996 + index]
  1997 + .phone)) +
  1998 + ' ' +
  1999 + (_nameNode.hasFocus
  2000 + ? (_notebookDetailChangeModel
  2001 + .userHistorys[
  2002 + index]
  2003 + .phone ==
  2004 + null
  2005 + ? ''
  2006 + : _notebookDetailChangeModel
  2007 + .userHistorys[
  2008 + index]
  2009 + .phone)
  2010 + : (_notebookDetailChangeModel
  2011 + .userHistorys[
  2012 + index]
  2013 + .rnameStr ==
  2014 + null
  2015 + ? ''
  2016 + : _notebookDetailChangeModel
  2017 + .userHistorys[
  2018 + index]
  2019 + .rnameStr)) +
  2020 + ' ' +
  2021 + _notebookDetailChangeModel
  2022 + .userHistorys[
  2023 + index]
  2024 + .nickName,
  2025 + style: TextStyle(
  2026 + color: MyColours
  2027 + .color_333333,
  2028 + fontSize: ScreenUtil()
  2029 + .setSp(32)),
  2030 + ))),
2023 ); 2031 );
2024 }, 2032 },
2025 itemExtent: ScreenUtil().setWidth(104), 2033 itemExtent: ScreenUtil().setWidth(104),
@@ -1573,8 +1573,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1573,8 +1573,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1573 ///订单操作UI 1573 ///订单操作UI
1574 Widget _operatingRecord() { 1574 Widget _operatingRecord() {
1575 return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ 1575 return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
1576 - VEmptyView(30),  
1577 - MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4), 1576 + // VEmptyView(30),
  1577 + // MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
1578 VEmptyView(56), 1578 VEmptyView(56),
1579 Text( 1579 Text(
1580 '订单操作', 1580 '订单操作',
@@ -3391,9 +3391,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -3391,9 +3391,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
3391 // } 3391 // }
3392 }, 3392 },
3393 child: Container( 3393 child: Container(
3394 - margin: EdgeInsets.only(  
3395 - right: ScreenUtil()  
3396 - .setWidth(20)), 3394 + // margin: EdgeInsets.only(
  3395 + // right: detailEntity
  3396 + // .order
  3397 + // .cookbooklist
  3398 + // .length ==
  3399 + // 0
  3400 + // ? EdgeInsets.zero
  3401 + // : ScreenUtil()
  3402 + // .setWidth(20)),
3397 decoration: BoxDecoration( 3403 decoration: BoxDecoration(
3398 color: MyColours 3404 color: MyColours
3399 .color_ffffff, 3405 .color_ffffff,
@@ -3475,11 +3481,10 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -3475,11 +3481,10 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
3475 // ), 3481 // ),
3476 // ), 3482 // ),
3477 // )), 3483 // )),
3478 - detailEntity.order.cookbooklist  
3479 - .length ==  
3480 - 0  
3481 - ? SizedBox()  
3482 - : Expanded( 3484 + if( detailEntity.order.cookbooklist
  3485 + .length >
  3486 + 0)
  3487 + Expanded(
3483 flex: 1, 3488 flex: 1,
3484 child: InkWell( 3489 child: InkWell(
3485 onTap: () { 3490 onTap: () {
@@ -2514,75 +2514,65 @@ class InvicationPageState extends State<InvicationPage> @@ -2514,75 +2514,65 @@ class InvicationPageState extends State<InvicationPage>
2514 width: ScreenUtil() 2514 width: ScreenUtil()
2515 .setWidth(2)) 2515 .setWidth(2))
2516 : BorderSide.none)), 2516 : BorderSide.none)),
2517 - child: Wrap(  
2518 - runAlignment: WrapAlignment.center,  
2519 - children: [  
2520 - Text(  
2521 - _nameNode.hasFocus  
2522 - ? (_baseIndoProvider  
2523 - .userHistorys[  
2524 - index]  
2525 - .rname ==  
2526 - null  
2527 - ? ''  
2528 - : _baseIndoProvider  
2529 - .userHistorys[index]  
2530 - .rnameStr)  
2531 - : (_baseIndoProvider  
2532 - .userHistorys[  
2533 - index]  
2534 - .phone ==  
2535 - null  
2536 - ? ''  
2537 - : _baseIndoProvider  
2538 - .userHistorys[index]  
2539 - .phone),  
2540 - style: TextStyle(  
2541 - color:  
2542 - MyColours.color_333333,  
2543 - fontSize:  
2544 - ScreenUtil().setSp(32)),  
2545 - ),  
2546 - HEmptyView(20),  
2547 - Text(  
2548 - _nameNode.hasFocus  
2549 - ? (_baseIndoProvider  
2550 - .userHistorys[  
2551 - index]  
2552 - .phone ==  
2553 - null  
2554 - ? ''  
2555 - : _baseIndoProvider  
2556 - .userHistorys[index]  
2557 - .phone)  
2558 - : (_baseIndoProvider  
2559 - .userHistorys[  
2560 - index]  
2561 - .rname ==  
2562 - null  
2563 - ? ''  
2564 - : _baseIndoProvider  
2565 - .userHistorys[index]  
2566 - .rnameStr),  
2567 - style: TextStyle(  
2568 - color:  
2569 - MyColours.color_333333,  
2570 - fontSize:  
2571 - ScreenUtil().setSp(32)),  
2572 - ),  
2573 - HEmptyView(20),  
2574 - Text(  
2575 - _baseIndoProvider  
2576 - .userHistorys[index]  
2577 - .nickName,  
2578 - style: TextStyle(  
2579 - color:  
2580 - MyColours.color_333333,  
2581 - fontSize:  
2582 - ScreenUtil().setSp(32)),  
2583 - ),  
2584 - ],  
2585 - ), 2517 + child: Align(
  2518 + alignment:
  2519 + Alignment.centerLeft,
  2520 + child: Text(
  2521 + (_nameNode.hasFocus
  2522 + ? (_baseIndoProvider
  2523 + .userHistorys[
  2524 + index]
  2525 + .rnameStr ==
  2526 + null
  2527 + ? ''
  2528 + : _baseIndoProvider
  2529 + .userHistorys[
  2530 + index]
  2531 + .rnameStr)
  2532 + : (_baseIndoProvider
  2533 + .userHistorys[
  2534 + index]
  2535 + .phone ==
  2536 + null
  2537 + ? ''
  2538 + : _baseIndoProvider
  2539 + .userHistorys[
  2540 + index]
  2541 + .phone)) +
  2542 + ' ' +
  2543 + (_nameNode.hasFocus
  2544 + ? (_baseIndoProvider
  2545 + .userHistorys[
  2546 + index]
  2547 + .phone ==
  2548 + null
  2549 + ? ''
  2550 + : _baseIndoProvider
  2551 + .userHistorys[
  2552 + index]
  2553 + .phone)
  2554 + : (_baseIndoProvider
  2555 + .userHistorys[
  2556 + index]
  2557 + .rnameStr ==
  2558 + null
  2559 + ? ''
  2560 + : _baseIndoProvider
  2561 + .userHistorys[
  2562 + index]
  2563 + .rnameStr)) +
  2564 + ' ' +
  2565 + _baseIndoProvider
  2566 + .userHistorys[
  2567 + index]
  2568 + .nickName,
  2569 + style: TextStyle(
  2570 + color: MyColours
  2571 + .color_333333,
  2572 + fontSize: ScreenUtil()
  2573 + .setSp(32)),
  2574 + ))
  2575 +
2586 ), 2576 ),
2587 ); 2577 );
2588 }, 2578 },
@@ -1315,100 +1315,85 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1315,100 +1315,85 @@ class TableManagerPageState extends State<TableManagerPage> {
1315 }); 1315 });
1316 }, 1316 },
1317 child: Container( 1317 child: Container(
1318 - width: double.infinity,  
1319 - height: ScreenUtil().setWidth(102),  
1320 - decoration: BoxDecoration(  
1321 - border: Border(  
1322 - bottom: (index !=  
1323 - (_baseIndoProvider  
1324 - .userHistorys  
1325 - .length -  
1326 - 1) &&  
1327 - _baseIndoProvider  
1328 - .userHistorys  
1329 - .length >  
1330 - 1)  
1331 - ? BorderSide(  
1332 - color: MyColours  
1333 - .color_e5e5e5,  
1334 - width: ScreenUtil()  
1335 - .setWidth(2))  
1336 - : BorderSide.none)),  
1337 - child: Wrap(  
1338 - runAlignment:  
1339 - WrapAlignment.center,  
1340 - children: [  
1341 - Text(  
1342 - _nameNode.hasFocus  
1343 - ? (_baseIndoProvider  
1344 - .userHistorys[  
1345 - index]  
1346 - .rname ==  
1347 - null  
1348 - ? ''  
1349 - : _baseIndoProvider  
1350 - .userHistorys[  
1351 - index]  
1352 - .rnameStr)  
1353 - : (_baseIndoProvider  
1354 - .userHistorys[  
1355 - index]  
1356 - .phone ==  
1357 - null  
1358 - ? ''  
1359 - : _baseIndoProvider  
1360 - .userHistorys[  
1361 - index]  
1362 - .phone),  
1363 - style: TextStyle(  
1364 - color: MyColours  
1365 - .color_333333,  
1366 - fontSize: ScreenUtil()  
1367 - .setSp(32)),  
1368 - ),  
1369 - HEmptyView(20),  
1370 - Text(  
1371 - _nameNode.hasFocus  
1372 - ? (_baseIndoProvider  
1373 - .userHistorys[  
1374 - index]  
1375 - .phone ==  
1376 - null  
1377 - ? ''  
1378 - : _baseIndoProvider  
1379 - .userHistorys[  
1380 - index]  
1381 - .phone)  
1382 - : (_baseIndoProvider  
1383 - .userHistorys[  
1384 - index]  
1385 - .rname ==  
1386 - null  
1387 - ? ''  
1388 - : _baseIndoProvider  
1389 - .userHistorys[  
1390 - index]  
1391 - .rnameStr),  
1392 - style: TextStyle(  
1393 - color: MyColours  
1394 - .color_333333,  
1395 - fontSize: ScreenUtil()  
1396 - .setSp(32)),  
1397 - ),  
1398 - HEmptyView(20),  
1399 - Text(  
1400 - _baseIndoProvider  
1401 - .userHistorys[index]  
1402 - .nickName,  
1403 - style: TextStyle(  
1404 - color: MyColours  
1405 - .color_333333,  
1406 - fontSize: ScreenUtil()  
1407 - .setSp(32)),  
1408 - ),  
1409 - ],  
1410 - ),  
1411 - ), 1318 + width: double.infinity,
  1319 + height:
  1320 + ScreenUtil().setWidth(102),
  1321 + decoration: BoxDecoration(
  1322 + border: Border(
  1323 + bottom: (index !=
  1324 + (_baseIndoProvider
  1325 + .userHistorys
  1326 + .length -
  1327 + 1) &&
  1328 + _baseIndoProvider
  1329 + .userHistorys
  1330 + .length >
  1331 + 1)
  1332 + ? BorderSide(
  1333 + color: MyColours
  1334 + .color_e5e5e5,
  1335 + width:
  1336 + ScreenUtil()
  1337 + .setWidth(
  1338 + 2))
  1339 + : BorderSide.none)),
  1340 + child: Align(
  1341 + alignment:
  1342 + Alignment.centerLeft,
  1343 + child: Text(
  1344 + (_nameNode.hasFocus
  1345 + ? (_baseIndoProvider
  1346 + .userHistorys[
  1347 + index]
  1348 + .rnameStr ==
  1349 + null
  1350 + ? ''
  1351 + : _baseIndoProvider
  1352 + .userHistorys[
  1353 + index]
  1354 + .rnameStr)
  1355 + : (_baseIndoProvider
  1356 + .userHistorys[
  1357 + index]
  1358 + .phone ==
  1359 + null
  1360 + ? ''
  1361 + : _baseIndoProvider
  1362 + .userHistorys[
  1363 + index]
  1364 + .phone)) +
  1365 + ' ' +
  1366 + (_nameNode.hasFocus
  1367 + ? (_baseIndoProvider
  1368 + .userHistorys[
  1369 + index]
  1370 + .phone ==
  1371 + null
  1372 + ? ''
  1373 + : _baseIndoProvider
  1374 + .userHistorys[
  1375 + index]
  1376 + .phone)
  1377 + : (_baseIndoProvider
  1378 + .userHistorys[
  1379 + index]
  1380 + .rnameStr ==
  1381 + null
  1382 + ? ''
  1383 + : _baseIndoProvider
  1384 + .userHistorys[
  1385 + index]
  1386 + .rnameStr)) +
  1387 + ' ' +
  1388 + _baseIndoProvider
  1389 + .userHistorys[index]
  1390 + .nickName,
  1391 + style: TextStyle(
  1392 + color: MyColours
  1393 + .color_333333,
  1394 + fontSize: ScreenUtil()
  1395 + .setSp(32)),
  1396 + ))),
1412 ); 1397 );
1413 }, 1398 },
1414 itemExtent: ScreenUtil().setWidth(104), 1399 itemExtent: ScreenUtil().setWidth(104),