Showing
11 changed files
with
1329 additions
and
22 deletions
assets/f_select.png
0 → 100644
1.81 KB
assets/f_select_not.png
0 → 100644
915 Bytes
| 1 | +import 'package:cached_network_image/cached_network_image.dart'; | ||
| 1 | import 'package:dotted_border/dotted_border.dart'; | 2 | import 'package:dotted_border/dotted_border.dart'; |
| 2 | import 'package:flutter/gestures.dart'; | 3 | import 'package:flutter/gestures.dart'; |
| 3 | import 'package:flutter/material.dart'; | 4 | import 'package:flutter/material.dart'; |
| 4 | import 'package:flutter_screenutil/flutter_screenutil.dart'; | 5 | import 'package:flutter_screenutil/flutter_screenutil.dart'; |
| 6 | +import 'package:one_key/models/cookbook_one_model.dart'; | ||
| 5 | import 'package:one_key/route/navigator_util.dart'; | 7 | import 'package:one_key/route/navigator_util.dart'; |
| 6 | import 'package:one_key/widgets/MyDivider.dart'; | 8 | import 'package:one_key/widgets/MyDivider.dart'; |
| 7 | import 'package:one_key/widgets/round_button.dart'; | 9 | import 'package:one_key/widgets/round_button.dart'; |
| @@ -991,6 +993,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | @@ -991,6 +993,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | ||
| 991 | isBold: false, | 993 | isBold: false, |
| 992 | gradientStart: MyColours.color_438E93, | 994 | gradientStart: MyColours.color_438E93, |
| 993 | gradientEnd: MyColours.color_438E93, | 995 | gradientEnd: MyColours.color_438E93, |
| 996 | + onPressed: () { | ||
| 997 | + NavigatorUtil.goFeastSetmealPage(context); | ||
| 998 | + }, | ||
| 994 | ), | 999 | ), |
| 995 | VEmptyView(52), | 1000 | VEmptyView(52), |
| 996 | Text( | 1001 | Text( |
| @@ -1049,6 +1054,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | @@ -1049,6 +1054,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | ||
| 1049 | isBold: false, | 1054 | isBold: false, |
| 1050 | gradientStart: MyColours.color_438E93, | 1055 | gradientStart: MyColours.color_438E93, |
| 1051 | gradientEnd: MyColours.color_438E93, | 1056 | gradientEnd: MyColours.color_438E93, |
| 1057 | + onPressed: () { | ||
| 1058 | + NavigatorUtil.goFeastWinePage(context); | ||
| 1059 | + }, | ||
| 1052 | ), | 1060 | ), |
| 1053 | VEmptyView(52), | 1061 | VEmptyView(52), |
| 1054 | Text( | 1062 | Text( |
| @@ -1107,6 +1115,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | @@ -1107,6 +1115,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | ||
| 1107 | isBold: false, | 1115 | isBold: false, |
| 1108 | gradientStart: MyColours.color_438E93, | 1116 | gradientStart: MyColours.color_438E93, |
| 1109 | gradientEnd: MyColours.color_438E93, | 1117 | gradientEnd: MyColours.color_438E93, |
| 1118 | + onPressed: () { | ||
| 1119 | + NavigatorUtil.goFeastSetPage(context); | ||
| 1120 | + }, | ||
| 1110 | ), | 1121 | ), |
| 1111 | ], | 1122 | ], |
| 1112 | )), | 1123 | )), |
| @@ -1242,10 +1253,22 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | @@ -1242,10 +1253,22 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | ||
| 1242 | fontSize: font(12)), | 1253 | fontSize: font(12)), |
| 1243 | ), | 1254 | ), |
| 1244 | InkWell( | 1255 | InkWell( |
| 1256 | + onTap: () { | ||
| 1257 | + //弹框确认是否删除 | ||
| 1258 | + DialogUtil.cupertinoAlertDialog(context, | ||
| 1259 | + title: "", | ||
| 1260 | + content: "是否确定删除?", | ||
| 1261 | + isBoldContent: true, | ||
| 1262 | + contentColor: MyColours.color_E6000000, | ||
| 1263 | + rTitle: "删除", rCallback: () { | ||
| 1264 | + Navigator.pop(context); | ||
| 1265 | + // _delGuestInfocDay(model.cday[index].id); | ||
| 1266 | + }); | ||
| 1267 | + }, | ||
| 1245 | child: Image.asset( | 1268 | child: Image.asset( |
| 1246 | - Utils.getImgPath('f_dj_delete'), | ||
| 1247 | - width: w(20), | ||
| 1248 | - )) | 1269 | + Utils.getImgPath('f_dj_delete'), |
| 1270 | + width: w(20), | ||
| 1271 | + )) | ||
| 1249 | ], | 1272 | ], |
| 1250 | ), | 1273 | ), |
| 1251 | ), | 1274 | ), |
| @@ -1408,9 +1431,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | @@ -1408,9 +1431,10 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | ||
| 1408 | Expanded( | 1431 | Expanded( |
| 1409 | child: _callButton( | 1432 | child: _callButton( |
| 1410 | onPress: () { | 1433 | onPress: () { |
| 1411 | - selectMenu = '选台'; | ||
| 1412 | - menuSet.add('意向'); | ||
| 1413 | - menuSet.add('选台'); | 1434 | + selectMenu = '签约'; |
| 1435 | + | ||
| 1436 | + menuSet.add('定金'); | ||
| 1437 | + menuSet.add('签约'); | ||
| 1414 | setState(() {}); | 1438 | setState(() {}); |
| 1415 | }, | 1439 | }, |
| 1416 | content: '保存并下一步', | 1440 | content: '保存并下一步', |
| @@ -1421,6 +1445,400 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | @@ -1421,6 +1445,400 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | ||
| 1421 | ], | 1445 | ], |
| 1422 | ); | 1446 | ); |
| 1423 | } | 1447 | } |
| 1448 | + /***********签约widget */ | ||
| 1449 | + | ||
| 1450 | + ///基本信息item | ||
| 1451 | + Widget baseInfoItem(String title, String content) { | ||
| 1452 | + return Padding( | ||
| 1453 | + padding: EdgeInsets.symmetric(vertical: h(6)), | ||
| 1454 | + child: Row( | ||
| 1455 | + children: [ | ||
| 1456 | + Container( | ||
| 1457 | + width: w(80), | ||
| 1458 | + child: Text(title, | ||
| 1459 | + style: TextStyle( | ||
| 1460 | + color: MyColours.color_999999, fontSize: font(12))), | ||
| 1461 | + ), | ||
| 1462 | + Expanded( | ||
| 1463 | + child: Text(content, | ||
| 1464 | + style: TextStyle( | ||
| 1465 | + color: MyColours.color_515151, fontSize: font(12)))) | ||
| 1466 | + ], | ||
| 1467 | + )); | ||
| 1468 | + } | ||
| 1469 | + | ||
| 1470 | +//基本信息板块 | ||
| 1471 | + Widget baseInfoWidget() { | ||
| 1472 | + return Container( | ||
| 1473 | + decoration: BoxDecoration( | ||
| 1474 | + borderRadius: BorderRadius.circular(r(6)), | ||
| 1475 | + border: Border.all(width: w(1), color: MyColours.color_438E93)), | ||
| 1476 | + child: Column( | ||
| 1477 | + children: [ | ||
| 1478 | + Container( | ||
| 1479 | + width: double.infinity, | ||
| 1480 | + // height: h(31), | ||
| 1481 | + padding: EdgeInsets.symmetric(horizontal: w(12), vertical: h(6)), | ||
| 1482 | + decoration: BoxDecoration( | ||
| 1483 | + color: MyColours.color_438E93, | ||
| 1484 | + borderRadius: BorderRadius.only( | ||
| 1485 | + topLeft: Radius.circular(r(5)), | ||
| 1486 | + topRight: Radius.circular(r(5)))), | ||
| 1487 | + child: Text( | ||
| 1488 | + '基本信息', | ||
| 1489 | + style: | ||
| 1490 | + TextStyle(color: MyColours.color_F6F6F6, fontSize: font(14)), | ||
| 1491 | + ), | ||
| 1492 | + ), | ||
| 1493 | + Padding( | ||
| 1494 | + padding: EdgeInsets.only( | ||
| 1495 | + left: w(12), right: w(12), top: w(8), bottom: w(11)), | ||
| 1496 | + child: Column( | ||
| 1497 | + children: [ | ||
| 1498 | + baseInfoItem('宴会日期:', '2022-08-02 (周二 七月初五)'), | ||
| 1499 | + baseInfoItem('宴会类型:', '婚宴'), | ||
| 1500 | + baseInfoItem('预订人:', '方 先生'), | ||
| 1501 | + baseInfoItem('场次数量:', '共 1 场'), | ||
| 1502 | + baseInfoItem('电话:', '15833517582'), | ||
| 1503 | + baseInfoItem('服务经理:', '刘经理'), | ||
| 1504 | + baseInfoItem('备注:', '无'), | ||
| 1505 | + ], | ||
| 1506 | + )) | ||
| 1507 | + ], | ||
| 1508 | + ), | ||
| 1509 | + ); | ||
| 1510 | + } | ||
| 1511 | + | ||
| 1512 | + ///第一场 。第二场。。。。 | ||
| 1513 | + Widget sessionsWidget( | ||
| 1514 | + String title, | ||
| 1515 | + ) { | ||
| 1516 | + return Container( | ||
| 1517 | + margin: EdgeInsets.only(bottom: h(26)), | ||
| 1518 | + decoration: BoxDecoration( | ||
| 1519 | + borderRadius: BorderRadius.circular(r(6)), | ||
| 1520 | + border: Border.all(width: w(1), color: MyColours.color_438E93)), | ||
| 1521 | + child: Column( | ||
| 1522 | + children: [ | ||
| 1523 | + Container( | ||
| 1524 | + width: double.infinity, | ||
| 1525 | + // height: h(31), | ||
| 1526 | + padding: EdgeInsets.symmetric(horizontal: w(12), vertical: h(6)), | ||
| 1527 | + decoration: BoxDecoration( | ||
| 1528 | + color: MyColours.color_438E93, | ||
| 1529 | + borderRadius: BorderRadius.only( | ||
| 1530 | + topLeft: Radius.circular(r(5)), | ||
| 1531 | + topRight: Radius.circular(r(5)))), | ||
| 1532 | + child: Text( | ||
| 1533 | + title, | ||
| 1534 | + style: | ||
| 1535 | + TextStyle(color: MyColours.color_F6F6F6, fontSize: font(14)), | ||
| 1536 | + ), | ||
| 1537 | + ), | ||
| 1538 | + Padding( | ||
| 1539 | + padding: EdgeInsets.only( | ||
| 1540 | + left: w(12), right: w(12), top: w(8), bottom: w(11)), | ||
| 1541 | + child: Column( | ||
| 1542 | + children: [ | ||
| 1543 | + baseInfoItem('场次时间:', '2022-08-02 午餐 12:00至14:00'), | ||
| 1544 | + baseInfoItem('桌位数量:', '共 32 桌'), | ||
| 1545 | + baseInfoItem('桌位信息:', '凤凰厅 (30桌)、包间1 (1桌)、包间2 (1桌)'), | ||
| 1546 | + Padding( | ||
| 1547 | + padding: EdgeInsets.symmetric(vertical: h(6)), | ||
| 1548 | + child: Row( | ||
| 1549 | + crossAxisAlignment: CrossAxisAlignment.start, | ||
| 1550 | + children: [ | ||
| 1551 | + Container( | ||
| 1552 | + width: w(80), | ||
| 1553 | + child: Text('套餐安排', | ||
| 1554 | + style: TextStyle( | ||
| 1555 | + color: MyColours.color_999999, | ||
| 1556 | + fontSize: font(12))), | ||
| 1557 | + ), | ||
| 1558 | + Expanded( | ||
| 1559 | + child: ListView.builder( | ||
| 1560 | + itemCount: 3, | ||
| 1561 | + shrinkWrap: true, | ||
| 1562 | + controller: _scrollController, | ||
| 1563 | + itemBuilder: | ||
| 1564 | + (BuildContext context, int index) { | ||
| 1565 | + return Container( | ||
| 1566 | + padding: EdgeInsets.only(bottom: w(8)), | ||
| 1567 | + margin: EdgeInsets.only(bottom: w(12)), | ||
| 1568 | + decoration: BoxDecoration( | ||
| 1569 | + border: Border( | ||
| 1570 | + bottom: BorderSide( | ||
| 1571 | + width: w(1), | ||
| 1572 | + color: MyColours | ||
| 1573 | + .color_DBDBDB))), | ||
| 1574 | + child: Column( | ||
| 1575 | + children: [ | ||
| 1576 | + Row( | ||
| 1577 | + children: [ | ||
| 1578 | + Text('1299套餐', | ||
| 1579 | + style: TextStyle( | ||
| 1580 | + color: MyColours | ||
| 1581 | + .color_515151, | ||
| 1582 | + fontSize: font(12))), | ||
| 1583 | + Spacer(), | ||
| 1584 | + RoundButton( | ||
| 1585 | + text: '查看菜单', | ||
| 1586 | + radius: r(7), | ||
| 1587 | + width: w(48), | ||
| 1588 | + height: h(18), | ||
| 1589 | + fontSize: 20, | ||
| 1590 | + textColor: | ||
| 1591 | + MyColours.color_F6F6F6, | ||
| 1592 | + isBold: false, | ||
| 1593 | + gradientStart: | ||
| 1594 | + MyColours.color_438E93, | ||
| 1595 | + gradientEnd: | ||
| 1596 | + MyColours.color_438E93, | ||
| 1597 | + onPressed: () { | ||
| 1598 | + // NavigatorUtil.goFeastSetmealPage(context); | ||
| 1599 | + }, | ||
| 1600 | + ), | ||
| 1601 | + ], | ||
| 1602 | + ), | ||
| 1603 | + VEmptyView(16), | ||
| 1604 | + Row( | ||
| 1605 | + children: [ | ||
| 1606 | + Text('10 人/桌', | ||
| 1607 | + style: TextStyle( | ||
| 1608 | + color: MyColours | ||
| 1609 | + .color_999999, | ||
| 1610 | + fontSize: font(12))), | ||
| 1611 | + HEmptyView(24), | ||
| 1612 | + Text('保证 30 桌', | ||
| 1613 | + style: TextStyle( | ||
| 1614 | + color: MyColours | ||
| 1615 | + .color_999999, | ||
| 1616 | + fontSize: font(12))), | ||
| 1617 | + HEmptyView(24), | ||
| 1618 | + Text('备用 2 桌', | ||
| 1619 | + style: TextStyle( | ||
| 1620 | + color: MyColours | ||
| 1621 | + .color_999999, | ||
| 1622 | + fontSize: font(12))), | ||
| 1623 | + ], | ||
| 1624 | + ) | ||
| 1625 | + ], | ||
| 1626 | + )); | ||
| 1627 | + })) | ||
| 1628 | + ], | ||
| 1629 | + )), | ||
| 1630 | + sessionsItem('酒水安排:'), | ||
| 1631 | + sessionsItem('其他配置:'), | ||
| 1632 | + remarkItem('备注:') | ||
| 1633 | + ], | ||
| 1634 | + )) | ||
| 1635 | + ], | ||
| 1636 | + ), | ||
| 1637 | + ); | ||
| 1638 | + } | ||
| 1639 | + | ||
| 1640 | + ///备注----照片 | ||
| 1641 | + Widget remarkItem(String title) { | ||
| 1642 | + return Padding( | ||
| 1643 | + padding: EdgeInsets.symmetric(vertical: h(6)), | ||
| 1644 | + child: Row( | ||
| 1645 | + crossAxisAlignment: CrossAxisAlignment.start, | ||
| 1646 | + children: [ | ||
| 1647 | + Container( | ||
| 1648 | + width: w(80), | ||
| 1649 | + child: Text(title, | ||
| 1650 | + style: TextStyle( | ||
| 1651 | + color: MyColours.color_999999, fontSize: font(12))), | ||
| 1652 | + ), | ||
| 1653 | + Expanded( | ||
| 1654 | + child: Column( | ||
| 1655 | + crossAxisAlignment: CrossAxisAlignment.start, | ||
| 1656 | + children: [ | ||
| 1657 | + Text( | ||
| 1658 | + '剑南春52度剑南春52度500ml剑南春52度500ml剑南春52度500ml剑南春52度500ml剑南春52度500ml剑南春52度500ml剑南春52度500ml剑南春52度500ml500ml', | ||
| 1659 | + style: TextStyle( | ||
| 1660 | + color: MyColours.color_515151, fontSize: font(12))), | ||
| 1661 | + VEmptyView(16), | ||
| 1662 | + _getGridImg(['fff', '', 'fff', '', 'fff', '', 'fff', '']) | ||
| 1663 | + ], | ||
| 1664 | + )), | ||
| 1665 | + ], | ||
| 1666 | + )); | ||
| 1667 | + } | ||
| 1668 | + | ||
| 1669 | + ///三组 左---中----右 | ||
| 1670 | + Widget sessionsItem(String title) { | ||
| 1671 | + return Padding( | ||
| 1672 | + padding: EdgeInsets.symmetric(vertical: h(6)), | ||
| 1673 | + child: Row( | ||
| 1674 | + crossAxisAlignment: CrossAxisAlignment.start, | ||
| 1675 | + children: [ | ||
| 1676 | + Container( | ||
| 1677 | + width: w(80), | ||
| 1678 | + child: Text(title, | ||
| 1679 | + style: TextStyle( | ||
| 1680 | + color: MyColours.color_999999, fontSize: font(12))), | ||
| 1681 | + ), | ||
| 1682 | + Expanded( | ||
| 1683 | + child: ListView.builder( | ||
| 1684 | + itemCount: 3, | ||
| 1685 | + shrinkWrap: true, | ||
| 1686 | + controller: _scrollController, | ||
| 1687 | + itemBuilder: (BuildContext context, int index) { | ||
| 1688 | + return Container( | ||
| 1689 | + padding: EdgeInsets.only(bottom: w(8)), | ||
| 1690 | + margin: EdgeInsets.only(bottom: w(12)), | ||
| 1691 | + // decoration: BoxDecoration( | ||
| 1692 | + // border: Border( | ||
| 1693 | + // bottom: BorderSide( | ||
| 1694 | + // width: w(1), | ||
| 1695 | + // color: MyColours.color_DBDBDB))), | ||
| 1696 | + child: Row( | ||
| 1697 | + children: [ | ||
| 1698 | + Expanded( | ||
| 1699 | + child: Text('剑南春52度500ml', | ||
| 1700 | + style: TextStyle( | ||
| 1701 | + color: MyColours.color_515151, | ||
| 1702 | + fontSize: font(12)))), | ||
| 1703 | + Text('60 份', | ||
| 1704 | + style: TextStyle( | ||
| 1705 | + color: MyColours.color_515151, | ||
| 1706 | + fontSize: font(12))) | ||
| 1707 | + ], | ||
| 1708 | + )); | ||
| 1709 | + })), | ||
| 1710 | + ], | ||
| 1711 | + )); | ||
| 1712 | + } | ||
| 1713 | + | ||
| 1714 | + /// 九宫格 | ||
| 1715 | + Widget _getGridImg(List<String> data) { | ||
| 1716 | + return GridView.builder( | ||
| 1717 | + controller: _scrollController, | ||
| 1718 | + // padding: EdgeInsets.only(top: ScreenUtil().getAdapterSize(10)), | ||
| 1719 | + shrinkWrap: true, | ||
| 1720 | + itemCount: data.length, | ||
| 1721 | + | ||
| 1722 | + //SliverGridDelegateWithFixedCrossAxisCount 构建一个横轴固定数量Widget | ||
| 1723 | + gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( | ||
| 1724 | + //横轴元素个数 | ||
| 1725 | + crossAxisCount: 4, | ||
| 1726 | + //纵轴间距 | ||
| 1727 | + mainAxisSpacing: ScreenUtil().setWidth(52), | ||
| 1728 | + //横轴间距 | ||
| 1729 | + crossAxisSpacing: ScreenUtil().setWidth(60), | ||
| 1730 | + //子组件宽高长度比例 | ||
| 1731 | + childAspectRatio: 1.0), | ||
| 1732 | + itemBuilder: (BuildContext context, int index) { | ||
| 1733 | + return InkWell( | ||
| 1734 | + onTap: () { | ||
| 1735 | + // _showPhotoView( | ||
| 1736 | + // context, index, widget.model.imageQiniuUrlList); | ||
| 1737 | + }, | ||
| 1738 | + child: Stack( | ||
| 1739 | + // alignment: Alignment.topRight, | ||
| 1740 | + children: [ | ||
| 1741 | + ClipRRect( | ||
| 1742 | + borderRadius: BorderRadius.circular(r(5)), | ||
| 1743 | + child: CachedNetworkImage( | ||
| 1744 | + // imageUrl: data[index].qiniuUrl, | ||
| 1745 | + imageUrl: | ||
| 1746 | + 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2F4k%2Fs%2F02%2F2109242332225H9-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1662806063&t=d576b5247e04ce721c266f098625f145', | ||
| 1747 | + fit: BoxFit.cover, | ||
| 1748 | + width: ScreenUtil().setWidth(38 * 2), | ||
| 1749 | + height: ScreenUtil().setWidth(38 * 2), | ||
| 1750 | + ), | ||
| 1751 | + ), | ||
| 1752 | + Positioned( | ||
| 1753 | + top: 0, | ||
| 1754 | + right: 0, | ||
| 1755 | + child: GestureDetector( | ||
| 1756 | + child: Image.asset( | ||
| 1757 | + Utils.getImgPath("f_delete"), | ||
| 1758 | + width: ScreenUtil().setWidth(24), | ||
| 1759 | + height: ScreenUtil().setWidth(24), | ||
| 1760 | + ), | ||
| 1761 | + onTap: () { | ||
| 1762 | + //已经传到服务器,弹提醒窗口,是否删除 | ||
| 1763 | + //修改之前有内容,则弹框 | ||
| 1764 | + DialogUtil.cupertinoAlertDialog(context, | ||
| 1765 | + title: "确认删除", | ||
| 1766 | + content: "是否确定删除该照片,删除操作不可逆转,请谨慎操作", | ||
| 1767 | + lCallback: () { | ||
| 1768 | + print("取消"); | ||
| 1769 | + }, rCallback: () { | ||
| 1770 | + print("确定"); | ||
| 1771 | + // widget.deleteCallback(index); | ||
| 1772 | + }); | ||
| 1773 | + } | ||
| 1774 | + // else { | ||
| 1775 | + // //点击删除按钮 | ||
| 1776 | + // setState(() { | ||
| 1777 | + // temp.removeWhere((element) => | ||
| 1778 | + // element == temp[index]); | ||
| 1779 | + // widget.model.imageQiniuUrlList | ||
| 1780 | + // .removeWhere((element) => | ||
| 1781 | + // element == | ||
| 1782 | + // widget.model | ||
| 1783 | + // .imageQiniuUrlList[index]); | ||
| 1784 | + // }); | ||
| 1785 | + // } | ||
| 1786 | + // }, | ||
| 1787 | + )), | ||
| 1788 | + ], | ||
| 1789 | + ), | ||
| 1790 | + ); | ||
| 1791 | + }); | ||
| 1792 | + } | ||
| 1793 | + | ||
| 1794 | + ///签约 | ||
| 1795 | + Widget qyWidget() { | ||
| 1796 | + return Column(children: [ | ||
| 1797 | + Expanded( | ||
| 1798 | + child: SingleChildScrollView( | ||
| 1799 | + child: Column(children: <Widget>[ | ||
| 1800 | + menu(), | ||
| 1801 | + MyDivider(double.infinity, h(1), color: MyColours.color_DBDBDB), | ||
| 1802 | + VEmptyView(26), | ||
| 1803 | + Padding( | ||
| 1804 | + padding: EdgeInsets.symmetric(horizontal: w(12)), | ||
| 1805 | + child: Column(children: [ | ||
| 1806 | + baseInfoWidget(), | ||
| 1807 | + VEmptyView(52), | ||
| 1808 | + ListView.builder( | ||
| 1809 | + itemCount: 3, | ||
| 1810 | + shrinkWrap: true, | ||
| 1811 | + controller: _scrollController, | ||
| 1812 | + itemBuilder: (BuildContext context, int index) { | ||
| 1813 | + return sessionsWidget('第${index + 1}场'); | ||
| 1814 | + }), | ||
| 1815 | + VEmptyView(52), | ||
| 1816 | + ])) | ||
| 1817 | + ]))), | ||
| 1818 | + Row( | ||
| 1819 | + children: [ | ||
| 1820 | + Expanded( | ||
| 1821 | + child: _callButton( | ||
| 1822 | + onPress: () {}, | ||
| 1823 | + content: '分享宴会单', | ||
| 1824 | + hasLeftBorder: true, | ||
| 1825 | + isSelect: false)), | ||
| 1826 | + Expanded( | ||
| 1827 | + child: _callButton( | ||
| 1828 | + onPress: () { | ||
| 1829 | + selectMenu = '签约'; | ||
| 1830 | + | ||
| 1831 | + menuSet.add('定金'); | ||
| 1832 | + menuSet.add('签约'); | ||
| 1833 | + setState(() {}); | ||
| 1834 | + }, | ||
| 1835 | + content: '保存', | ||
| 1836 | + hasLeftBorder: true, | ||
| 1837 | + isSelect: true)) | ||
| 1838 | + ], | ||
| 1839 | + ) | ||
| 1840 | + ]); | ||
| 1841 | + } | ||
| 1424 | 1842 | ||
| 1425 | Widget taocanTextType(String per1, String title, String per) { | 1843 | Widget taocanTextType(String per1, String title, String per) { |
| 1426 | return RichText( | 1844 | return RichText( |
| @@ -1555,6 +1973,6 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | @@ -1555,6 +1973,6 @@ class _FeastCreatePageState extends State<FeastCreatePage> { | ||
| 1555 | ? xtWidget() | 1973 | ? xtWidget() |
| 1556 | : selectMenu == '定金' | 1974 | : selectMenu == '定金' |
| 1557 | ? djWidget() | 1975 | ? djWidget() |
| 1558 | - : SizedBox()); | 1976 | + : qyWidget()); |
| 1559 | } | 1977 | } |
| 1560 | } | 1978 | } |
| @@ -133,6 +133,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> { | @@ -133,6 +133,7 @@ class _FeastMenuPageState extends State<FeastMenuPage> { | ||
| 133 | return _buildHeaderWidget(context, index); | 133 | return _buildHeaderWidget(context, index); |
| 134 | } else { | 134 | } else { |
| 135 | int itemIndex = index - 1; | 135 | int itemIndex = index - 1; |
| 136 | + | ||
| 136 | return Container( | 137 | return Container( |
| 137 | margin: new EdgeInsets.only(bottom: h(12)), | 138 | margin: new EdgeInsets.only(bottom: h(12)), |
| 138 | color: MyColours.color_ffffff, | 139 | color: MyColours.color_ffffff, |
| @@ -166,18 +167,32 @@ class _FeastMenuPageState extends State<FeastMenuPage> { | @@ -166,18 +167,32 @@ class _FeastMenuPageState extends State<FeastMenuPage> { | ||
| 166 | fontSize: ScreenUtil().setSp(32)), | 167 | fontSize: ScreenUtil().setSp(32)), |
| 167 | )), | 168 | )), |
| 168 | HEmptyView(16), | 169 | HEmptyView(16), |
| 169 | - Text( | ||
| 170 | - '调为', | ||
| 171 | - overflow: TextOverflow.ellipsis, | ||
| 172 | - maxLines: 1, | ||
| 173 | - style: TextStyle( | ||
| 174 | - color: MyColours.color_438E93, | ||
| 175 | - fontSize: ScreenUtil().setSp(32)), | ||
| 176 | - ), | ||
| 177 | - HEmptyView(16), | ||
| 178 | - Expanded(child: _textfield('菜名', null, null)), | ||
| 179 | - HEmptyView(16), | ||
| 180 | - _textfield('数量', null, null, width: w(56)) | 170 | + index == 1 |
| 171 | + ? Text( | ||
| 172 | + '不可调菜', | ||
| 173 | + overflow: TextOverflow.ellipsis, | ||
| 174 | + maxLines: 1, | ||
| 175 | + style: TextStyle( | ||
| 176 | + color: MyColours.color_E34D59, | ||
| 177 | + fontSize: ScreenUtil().setSp(32)), | ||
| 178 | + ) | ||
| 179 | + : Expanded( | ||
| 180 | + child: Row( | ||
| 181 | + children: [ | ||
| 182 | + Text( | ||
| 183 | + '调为', | ||
| 184 | + overflow: TextOverflow.ellipsis, | ||
| 185 | + maxLines: 1, | ||
| 186 | + style: TextStyle( | ||
| 187 | + color: MyColours.color_438E93, | ||
| 188 | + fontSize: ScreenUtil().setSp(32)), | ||
| 189 | + ), | ||
| 190 | + HEmptyView(16), | ||
| 191 | + Expanded(child: _textfield('菜名', null, null)), | ||
| 192 | + HEmptyView(16), | ||
| 193 | + _textfield('数量', null, null, width: w(56)) | ||
| 194 | + ], | ||
| 195 | + )) | ||
| 181 | ], | 196 | ], |
| 182 | )), | 197 | )), |
| 183 | ), | 198 | ), |
lib/pages/feast/feast_set_page.dart
0 → 100644
| 1 | +import 'package:flutter/material.dart'; | ||
| 2 | +import 'package:flutter_screenutil/flutter_screenutil.dart'; | ||
| 3 | +import 'package:one_key/widgets/h_empty_view.dart'; | ||
| 4 | + | ||
| 5 | +import '../../res/colors.dart'; | ||
| 6 | +import '../../utils/screen_util.dart'; | ||
| 7 | +import '../../utils/utils.dart'; | ||
| 8 | +import '../../widgets/round_button.dart'; | ||
| 9 | +import '../../widgets/system_app_bar.dart'; | ||
| 10 | +import '../../widgets/v_empty_view.dart'; | ||
| 11 | + | ||
| 12 | +/** | ||
| 13 | + * 添加配置 | ||
| 14 | + */ | ||
| 15 | +class FeastSetPage extends StatefulWidget { | ||
| 16 | + FeastSetPage({Key key}) : super(key: key); | ||
| 17 | + | ||
| 18 | + @override | ||
| 19 | + _FeastSetPageState createState() => _FeastSetPageState(); | ||
| 20 | +} | ||
| 21 | + | ||
| 22 | +class _FeastSetPageState extends State<FeastSetPage> { | ||
| 23 | + @override | ||
| 24 | + void initState() { | ||
| 25 | + super.initState(); | ||
| 26 | + Utils.changeStatusColor(color: MyColours.color_438E93); | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | + Widget _callButton( | ||
| 30 | + {GestureTapCallback onPress, | ||
| 31 | + content, | ||
| 32 | + hasLeftBorder = true, | ||
| 33 | + isSelect = false}) { | ||
| 34 | + return InkWell( | ||
| 35 | + onTap: onPress, | ||
| 36 | + child: Container( | ||
| 37 | + height: h(48), | ||
| 38 | + decoration: BoxDecoration( | ||
| 39 | + color: isSelect ? MyColours.color_438E93 : MyColours.color_ffffff, | ||
| 40 | + border: Border( | ||
| 41 | + bottom: BorderSide( | ||
| 42 | + color: MyColours.color_438E93, | ||
| 43 | + width: ScreenUtil().setWidth(2)), | ||
| 44 | + top: BorderSide( | ||
| 45 | + color: MyColours.color_438E93, | ||
| 46 | + width: ScreenUtil().setWidth(2)), | ||
| 47 | + left: hasLeftBorder | ||
| 48 | + ? BorderSide( | ||
| 49 | + color: MyColours.color_438E93, | ||
| 50 | + width: ScreenUtil().setWidth(2)) | ||
| 51 | + : BorderSide.none, | ||
| 52 | + right: BorderSide( | ||
| 53 | + color: MyColours.color_438E93, | ||
| 54 | + width: ScreenUtil().setWidth(2)))), | ||
| 55 | + child: Align( | ||
| 56 | + alignment: Alignment.center, | ||
| 57 | + child: Text( | ||
| 58 | + content, | ||
| 59 | + style: TextStyle( | ||
| 60 | + color: | ||
| 61 | + isSelect ? MyColours.color_F6F6F6 : MyColours.color_438E93, | ||
| 62 | + fontSize: ScreenUtil().setSp(36)), | ||
| 63 | + ), | ||
| 64 | + ), | ||
| 65 | + ), | ||
| 66 | + ); | ||
| 67 | + } | ||
| 68 | + | ||
| 69 | + ///输入框 | ||
| 70 | + Widget _textfield(String hintText, TextEditingController editingController, | ||
| 71 | + FocusNode focusNode, | ||
| 72 | + {TextInputType inputType = TextInputType.text, double width}) { | ||
| 73 | + return Container( | ||
| 74 | + width: width, | ||
| 75 | + padding: EdgeInsets.symmetric(horizontal: w(6)), | ||
| 76 | + decoration: BoxDecoration( | ||
| 77 | + border: Border.all(width: h(1), color: MyColours.color_438E93)), | ||
| 78 | + child: Container( | ||
| 79 | + // height: ScreenUtil().setHeight(120), | ||
| 80 | + height: ScreenUtil().setWidth(44), | ||
| 81 | + child: TextField( | ||
| 82 | + controller: editingController, | ||
| 83 | + // textAlign: TextAlign.right, | ||
| 84 | + // textAlignVertical: TextAlignVertical.bottom, | ||
| 85 | + maxLines: 1, | ||
| 86 | + inputFormatters: [], | ||
| 87 | + | ||
| 88 | + // //光标颜色 | ||
| 89 | + // cursorColor: | ||
| 90 | + // widget.isSelect ? Colors.white : MyColours.color_199095, | ||
| 91 | + //输入文本的样式 | ||
| 92 | + style: TextStyle( | ||
| 93 | + fontSize: ScreenUtil().setSp(32), | ||
| 94 | + ), | ||
| 95 | + focusNode: focusNode, | ||
| 96 | + textAlign: TextAlign.center, | ||
| 97 | + decoration: InputDecoration( | ||
| 98 | + border: OutlineInputBorder(borderSide: BorderSide.none), | ||
| 99 | + hintText: hintText, | ||
| 100 | + hintStyle: TextStyle( | ||
| 101 | + color: hintText == '' | ||
| 102 | + ? MyColours.color_999999 | ||
| 103 | + : MyColours.color_000000, | ||
| 104 | + fontSize: ScreenUtil().setSp(28), | ||
| 105 | + ), | ||
| 106 | + contentPadding: EdgeInsets.zero, | ||
| 107 | + ), | ||
| 108 | + onChanged: (value) {}, | ||
| 109 | + onEditingComplete: () { | ||
| 110 | + FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 | ||
| 111 | + }, | ||
| 112 | + keyboardType: inputType, | ||
| 113 | + )), | ||
| 114 | + ); | ||
| 115 | + } | ||
| 116 | + | ||
| 117 | + Widget buildListItem(BuildContext context, int index, bool select) { | ||
| 118 | + return Container( | ||
| 119 | + padding: EdgeInsets.only( | ||
| 120 | + top: h(25), bottom: h(10), left: w(12), right: w(12)), | ||
| 121 | + decoration: BoxDecoration( | ||
| 122 | + border: Border( | ||
| 123 | + bottom: | ||
| 124 | + BorderSide(width: w(1), color: MyColours.color_DBDBDB))), | ||
| 125 | + child: Column( | ||
| 126 | + children: [ | ||
| 127 | + Row( | ||
| 128 | + children: [ | ||
| 129 | + Row(children: [ | ||
| 130 | + InkWell( | ||
| 131 | + onTap: () { | ||
| 132 | + setState(() { | ||
| 133 | + select = !select; | ||
| 134 | + }); | ||
| 135 | + }, | ||
| 136 | + child: Row( | ||
| 137 | + children: [ | ||
| 138 | + Image.asset( | ||
| 139 | + Utils.getImgPath( | ||
| 140 | + select ? 'f_select' : 'f_select_not'), | ||
| 141 | + width: w(24), | ||
| 142 | + ), | ||
| 143 | + HEmptyView(24), | ||
| 144 | + Text( | ||
| 145 | + 'LED大屏', | ||
| 146 | + style: TextStyle( | ||
| 147 | + color: select | ||
| 148 | + ? MyColours.color_515151 | ||
| 149 | + : MyColours.color_999999, | ||
| 150 | + fontSize: font(16), | ||
| 151 | + fontWeight: FontWeight.bold), | ||
| 152 | + ) | ||
| 153 | + ], | ||
| 154 | + )) | ||
| 155 | + ]), | ||
| 156 | + Spacer(), | ||
| 157 | + Text( | ||
| 158 | + '原价:1100元/份', | ||
| 159 | + style: TextStyle( | ||
| 160 | + color: MyColours.color_999999, | ||
| 161 | + fontSize: font(14), | ||
| 162 | + ), | ||
| 163 | + ), | ||
| 164 | + ], | ||
| 165 | + ), | ||
| 166 | + select ? VEmptyView(42) : SizedBox(), | ||
| 167 | + select | ||
| 168 | + ? Row( | ||
| 169 | + children: [ | ||
| 170 | + Text( | ||
| 171 | + '议价:不可议价', | ||
| 172 | + style: TextStyle( | ||
| 173 | + color: MyColours.color_515151, | ||
| 174 | + fontSize: font(14), | ||
| 175 | + ), | ||
| 176 | + ), | ||
| 177 | + // _textfield('1299', null, null, width: w(103)), | ||
| 178 | + // Text( | ||
| 179 | + // ' 元', | ||
| 180 | + // style: TextStyle( | ||
| 181 | + // color: MyColours.color_515151, | ||
| 182 | + // fontSize: font(14), | ||
| 183 | + // ), | ||
| 184 | + // ), | ||
| 185 | + Spacer(), | ||
| 186 | + Text( | ||
| 187 | + '数量:', | ||
| 188 | + style: TextStyle( | ||
| 189 | + color: MyColours.color_515151, | ||
| 190 | + fontSize: font(14), | ||
| 191 | + ), | ||
| 192 | + ), | ||
| 193 | + _textfield('1299', null, null, width: w(103)), | ||
| 194 | + Text( | ||
| 195 | + ' 份', | ||
| 196 | + style: TextStyle( | ||
| 197 | + color: MyColours.color_515151, | ||
| 198 | + fontSize: font(14), | ||
| 199 | + ), | ||
| 200 | + ), | ||
| 201 | + ], | ||
| 202 | + ) | ||
| 203 | + : SizedBox(), | ||
| 204 | + ], | ||
| 205 | + )); | ||
| 206 | + } | ||
| 207 | + | ||
| 208 | + @override | ||
| 209 | + Widget build(BuildContext context) { | ||
| 210 | + return Scaffold( | ||
| 211 | + backgroundColor: MyColours.color_ffffff, | ||
| 212 | + appBar: SystemAppBar( | ||
| 213 | + '选择酒水', | ||
| 214 | + needWhite: true, | ||
| 215 | + bgColor: MyColours.color_438E93, | ||
| 216 | + titleColor: MyColours.color_F6F6F6, | ||
| 217 | + onTap: () { | ||
| 218 | + Navigator.pop(context); | ||
| 219 | + }, | ||
| 220 | + ), | ||
| 221 | + body: Column( | ||
| 222 | + crossAxisAlignment: CrossAxisAlignment.start, | ||
| 223 | + children: [ | ||
| 224 | + Expanded( | ||
| 225 | + child: ListView.builder( | ||
| 226 | + shrinkWrap: true, | ||
| 227 | + itemCount: 10, | ||
| 228 | + itemBuilder: (BuildContext context, int index) { | ||
| 229 | + return buildListItem(context, index, true); | ||
| 230 | + }, | ||
| 231 | + )), | ||
| 232 | + Row( | ||
| 233 | + children: [ | ||
| 234 | + Expanded( | ||
| 235 | + child: _callButton( | ||
| 236 | + onPress: () { | ||
| 237 | + Navigator.pop(context); | ||
| 238 | + }, | ||
| 239 | + content: '返回', | ||
| 240 | + hasLeftBorder: true, | ||
| 241 | + isSelect: false)), | ||
| 242 | + Expanded( | ||
| 243 | + child: _callButton( | ||
| 244 | + onPress: () {}, | ||
| 245 | + content: '保存并返回', | ||
| 246 | + hasLeftBorder: true, | ||
| 247 | + isSelect: true)) | ||
| 248 | + ], | ||
| 249 | + ) | ||
| 250 | + ], | ||
| 251 | + )); | ||
| 252 | + } | ||
| 253 | +} |
lib/pages/feast/feast_setmeal_page.dart
0 → 100644
| 1 | +import 'package:flutter/material.dart'; | ||
| 2 | +import 'package:flutter_screenutil/flutter_screenutil.dart'; | ||
| 3 | +import 'package:one_key/widgets/h_empty_view.dart'; | ||
| 4 | + | ||
| 5 | +import '../../res/colors.dart'; | ||
| 6 | +import '../../utils/screen_util.dart'; | ||
| 7 | +import '../../utils/utils.dart'; | ||
| 8 | +import '../../widgets/round_button.dart'; | ||
| 9 | +import '../../widgets/system_app_bar.dart'; | ||
| 10 | +import '../../widgets/v_empty_view.dart'; | ||
| 11 | + | ||
| 12 | +/** | ||
| 13 | + * 添加套餐 | ||
| 14 | + */ | ||
| 15 | +class FeastSetmealPage extends StatefulWidget { | ||
| 16 | + FeastSetmealPage({Key key}) : super(key: key); | ||
| 17 | + | ||
| 18 | + @override | ||
| 19 | + _FeastSetmealPageState createState() => _FeastSetmealPageState(); | ||
| 20 | +} | ||
| 21 | + | ||
| 22 | +class _FeastSetmealPageState extends State<FeastSetmealPage> { | ||
| 23 | + @override | ||
| 24 | + void initState() { | ||
| 25 | + super.initState(); | ||
| 26 | + Utils.changeStatusColor(color: MyColours.color_438E93); | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | + Widget _callButton( | ||
| 30 | + {GestureTapCallback onPress, | ||
| 31 | + content, | ||
| 32 | + hasLeftBorder = true, | ||
| 33 | + isSelect = false}) { | ||
| 34 | + return InkWell( | ||
| 35 | + onTap: onPress, | ||
| 36 | + child: Container( | ||
| 37 | + height: h(48), | ||
| 38 | + decoration: BoxDecoration( | ||
| 39 | + color: isSelect ? MyColours.color_438E93 : MyColours.color_ffffff, | ||
| 40 | + border: Border( | ||
| 41 | + bottom: BorderSide( | ||
| 42 | + color: MyColours.color_438E93, | ||
| 43 | + width: ScreenUtil().setWidth(2)), | ||
| 44 | + top: BorderSide( | ||
| 45 | + color: MyColours.color_438E93, | ||
| 46 | + width: ScreenUtil().setWidth(2)), | ||
| 47 | + left: hasLeftBorder | ||
| 48 | + ? BorderSide( | ||
| 49 | + color: MyColours.color_438E93, | ||
| 50 | + width: ScreenUtil().setWidth(2)) | ||
| 51 | + : BorderSide.none, | ||
| 52 | + right: BorderSide( | ||
| 53 | + color: MyColours.color_438E93, | ||
| 54 | + width: ScreenUtil().setWidth(2)))), | ||
| 55 | + child: Align( | ||
| 56 | + alignment: Alignment.center, | ||
| 57 | + child: Text( | ||
| 58 | + content, | ||
| 59 | + style: TextStyle( | ||
| 60 | + color: | ||
| 61 | + isSelect ? MyColours.color_F6F6F6 : MyColours.color_438E93, | ||
| 62 | + fontSize: ScreenUtil().setSp(36)), | ||
| 63 | + ), | ||
| 64 | + ), | ||
| 65 | + ), | ||
| 66 | + ); | ||
| 67 | + } | ||
| 68 | + | ||
| 69 | + ///输入框 | ||
| 70 | + Widget _textfield(String hintText, TextEditingController editingController, | ||
| 71 | + FocusNode focusNode, | ||
| 72 | + {TextInputType inputType = TextInputType.text, double width}) { | ||
| 73 | + return Container( | ||
| 74 | + width: width, | ||
| 75 | + padding: EdgeInsets.symmetric(horizontal: w(6)), | ||
| 76 | + decoration: BoxDecoration( | ||
| 77 | + border: Border.all(width: h(1), color: MyColours.color_438E93)), | ||
| 78 | + child: Container( | ||
| 79 | + // height: ScreenUtil().setHeight(120), | ||
| 80 | + height: ScreenUtil().setWidth(44), | ||
| 81 | + child: TextField( | ||
| 82 | + controller: editingController, | ||
| 83 | + // textAlign: TextAlign.right, | ||
| 84 | + // textAlignVertical: TextAlignVertical.bottom, | ||
| 85 | + maxLines: 1, | ||
| 86 | + inputFormatters: [], | ||
| 87 | + | ||
| 88 | + // //光标颜色 | ||
| 89 | + // cursorColor: | ||
| 90 | + // widget.isSelect ? Colors.white : MyColours.color_199095, | ||
| 91 | + //输入文本的样式 | ||
| 92 | + style: TextStyle( | ||
| 93 | + fontSize: ScreenUtil().setSp(32), | ||
| 94 | + ), | ||
| 95 | + focusNode: focusNode, | ||
| 96 | + textAlign: TextAlign.center, | ||
| 97 | + decoration: InputDecoration( | ||
| 98 | + border: OutlineInputBorder(borderSide: BorderSide.none), | ||
| 99 | + hintText: hintText, | ||
| 100 | + hintStyle: TextStyle( | ||
| 101 | + color: hintText == '' | ||
| 102 | + ? MyColours.color_999999 | ||
| 103 | + : MyColours.color_000000, | ||
| 104 | + fontSize: ScreenUtil().setSp(28), | ||
| 105 | + ), | ||
| 106 | + contentPadding: EdgeInsets.zero, | ||
| 107 | + ), | ||
| 108 | + onChanged: (value) {}, | ||
| 109 | + onEditingComplete: () { | ||
| 110 | + FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 | ||
| 111 | + }, | ||
| 112 | + keyboardType: inputType, | ||
| 113 | + )), | ||
| 114 | + ); | ||
| 115 | + } | ||
| 116 | + | ||
| 117 | + Widget buildListItem(BuildContext context, int index, bool select) { | ||
| 118 | + return Container( | ||
| 119 | + padding: EdgeInsets.only( | ||
| 120 | + top: h(25), bottom: h(10), left: w(12), right: w(12)), | ||
| 121 | + decoration: BoxDecoration( | ||
| 122 | + border: Border( | ||
| 123 | + bottom: | ||
| 124 | + BorderSide(width: w(1), color: MyColours.color_DBDBDB))), | ||
| 125 | + child: Column( | ||
| 126 | + children: [ | ||
| 127 | + Row( | ||
| 128 | + children: [ | ||
| 129 | + InkWell( | ||
| 130 | + onTap: () { | ||
| 131 | + setState(() { | ||
| 132 | + select = !select; | ||
| 133 | + }); | ||
| 134 | + }, | ||
| 135 | + child: Row( | ||
| 136 | + children: [ | ||
| 137 | + Image.asset( | ||
| 138 | + Utils.getImgPath( | ||
| 139 | + select ? 'f_select' : 'f_select_not'), | ||
| 140 | + width: w(24), | ||
| 141 | + ), | ||
| 142 | + HEmptyView(24), | ||
| 143 | + Text( | ||
| 144 | + '1299套餐', | ||
| 145 | + style: TextStyle( | ||
| 146 | + color: select | ||
| 147 | + ? MyColours.color_515151 | ||
| 148 | + : MyColours.color_999999, | ||
| 149 | + fontSize: font(16), | ||
| 150 | + fontWeight: FontWeight.bold), | ||
| 151 | + ) | ||
| 152 | + ], | ||
| 153 | + )), | ||
| 154 | + Spacer(), | ||
| 155 | + RoundButton( | ||
| 156 | + text: '查看菜单', | ||
| 157 | + radius: r(7), | ||
| 158 | + width: w(48), | ||
| 159 | + height: h(18), | ||
| 160 | + fontSize: 20, | ||
| 161 | + textColor: MyColours.color_F6F6F6, | ||
| 162 | + isBold: false, | ||
| 163 | + gradientStart: MyColours.color_438E93, | ||
| 164 | + gradientEnd: MyColours.color_438E93, | ||
| 165 | + onPressed: () { | ||
| 166 | + // NavigatorUtil.goFeastSetmealPage(context); | ||
| 167 | + }, | ||
| 168 | + ), | ||
| 169 | + ], | ||
| 170 | + ), | ||
| 171 | + select | ||
| 172 | + ? Column( | ||
| 173 | + children: [ | ||
| 174 | + VEmptyView(42), | ||
| 175 | + Row( | ||
| 176 | + children: [ | ||
| 177 | + Text( | ||
| 178 | + '原价:1299元', | ||
| 179 | + style: TextStyle( | ||
| 180 | + color: MyColours.color_515151, | ||
| 181 | + fontSize: font(14), | ||
| 182 | + ), | ||
| 183 | + ), | ||
| 184 | + Spacer(), | ||
| 185 | + Text( | ||
| 186 | + '议价:', | ||
| 187 | + style: TextStyle( | ||
| 188 | + color: MyColours.color_515151, | ||
| 189 | + fontSize: font(14), | ||
| 190 | + ), | ||
| 191 | + ), | ||
| 192 | + _textfield('1299', null, null, width: w(126)), | ||
| 193 | + Text( | ||
| 194 | + ' 元', | ||
| 195 | + style: TextStyle( | ||
| 196 | + color: MyColours.color_515151, | ||
| 197 | + fontSize: font(14), | ||
| 198 | + ), | ||
| 199 | + ), | ||
| 200 | + ], | ||
| 201 | + ), | ||
| 202 | + VEmptyView(42), | ||
| 203 | + Row( | ||
| 204 | + children: [ | ||
| 205 | + Text( | ||
| 206 | + '每桌:', | ||
| 207 | + style: TextStyle( | ||
| 208 | + color: MyColours.color_515151, | ||
| 209 | + fontSize: font(14), | ||
| 210 | + ), | ||
| 211 | + ), | ||
| 212 | + _textfield('3', null, null, width: w(45)), | ||
| 213 | + Text( | ||
| 214 | + ' 人', | ||
| 215 | + style: TextStyle( | ||
| 216 | + color: MyColours.color_515151, | ||
| 217 | + fontSize: font(14), | ||
| 218 | + ), | ||
| 219 | + ), | ||
| 220 | + Spacer(), | ||
| 221 | + Text( | ||
| 222 | + '保证:', | ||
| 223 | + style: TextStyle( | ||
| 224 | + color: MyColours.color_515151, | ||
| 225 | + fontSize: font(14), | ||
| 226 | + ), | ||
| 227 | + ), | ||
| 228 | + _textfield('3', null, null, width: w(45)), | ||
| 229 | + Text( | ||
| 230 | + ' 桌', | ||
| 231 | + style: TextStyle( | ||
| 232 | + color: MyColours.color_515151, | ||
| 233 | + fontSize: font(14), | ||
| 234 | + ), | ||
| 235 | + ), | ||
| 236 | + Spacer(), | ||
| 237 | + Text( | ||
| 238 | + '备用:', | ||
| 239 | + style: TextStyle( | ||
| 240 | + color: MyColours.color_515151, | ||
| 241 | + fontSize: font(14), | ||
| 242 | + ), | ||
| 243 | + ), | ||
| 244 | + _textfield('3', null, null, width: w(45)), | ||
| 245 | + Text( | ||
| 246 | + ' 桌', | ||
| 247 | + style: TextStyle( | ||
| 248 | + color: MyColours.color_515151, | ||
| 249 | + fontSize: font(14), | ||
| 250 | + ), | ||
| 251 | + ), | ||
| 252 | + ], | ||
| 253 | + ), | ||
| 254 | + ], | ||
| 255 | + ) | ||
| 256 | + : SizedBox() | ||
| 257 | + ], | ||
| 258 | + )); | ||
| 259 | + } | ||
| 260 | + | ||
| 261 | + @override | ||
| 262 | + Widget build(BuildContext context) { | ||
| 263 | + return Scaffold( | ||
| 264 | + backgroundColor: MyColours.color_ffffff, | ||
| 265 | + appBar: SystemAppBar( | ||
| 266 | + '选择套餐', | ||
| 267 | + needWhite: true, | ||
| 268 | + bgColor: MyColours.color_438E93, | ||
| 269 | + titleColor: MyColours.color_F6F6F6, | ||
| 270 | + onTap: () { | ||
| 271 | + Navigator.pop(context); | ||
| 272 | + }, | ||
| 273 | + ), | ||
| 274 | + body: Column( | ||
| 275 | + crossAxisAlignment: CrossAxisAlignment.start, | ||
| 276 | + children: [ | ||
| 277 | + Expanded( | ||
| 278 | + child: ListView.builder( | ||
| 279 | + shrinkWrap: true, | ||
| 280 | + itemCount: 10, | ||
| 281 | + itemBuilder: (BuildContext context, int index) { | ||
| 282 | + return buildListItem(context, index, true); | ||
| 283 | + }, | ||
| 284 | + )), | ||
| 285 | + Row( | ||
| 286 | + children: [ | ||
| 287 | + Expanded( | ||
| 288 | + child: _callButton( | ||
| 289 | + onPress: () { | ||
| 290 | + Navigator.pop(context); | ||
| 291 | + }, | ||
| 292 | + content: '返回', | ||
| 293 | + hasLeftBorder: true, | ||
| 294 | + isSelect: false)), | ||
| 295 | + Expanded( | ||
| 296 | + child: _callButton( | ||
| 297 | + onPress: () {}, | ||
| 298 | + content: '保存并返回', | ||
| 299 | + hasLeftBorder: true, | ||
| 300 | + isSelect: true)) | ||
| 301 | + ], | ||
| 302 | + ) | ||
| 303 | + ], | ||
| 304 | + )); | ||
| 305 | + } | ||
| 306 | +} |
lib/pages/feast/feast_wine_page.dart
0 → 100644
| 1 | +import 'package:flutter/material.dart'; | ||
| 2 | +import 'package:flutter_screenutil/flutter_screenutil.dart'; | ||
| 3 | +import 'package:one_key/widgets/h_empty_view.dart'; | ||
| 4 | + | ||
| 5 | +import '../../res/colors.dart'; | ||
| 6 | +import '../../utils/screen_util.dart'; | ||
| 7 | +import '../../utils/utils.dart'; | ||
| 8 | +import '../../widgets/round_button.dart'; | ||
| 9 | +import '../../widgets/system_app_bar.dart'; | ||
| 10 | +import '../../widgets/v_empty_view.dart'; | ||
| 11 | + | ||
| 12 | +/** | ||
| 13 | + * 添加酒水 | ||
| 14 | + */ | ||
| 15 | +class FeastWinePage extends StatefulWidget { | ||
| 16 | + FeastWinePage({Key key}) : super(key: key); | ||
| 17 | + | ||
| 18 | + @override | ||
| 19 | + _FeastWinePageState createState() => _FeastWinePageState(); | ||
| 20 | +} | ||
| 21 | + | ||
| 22 | +class _FeastWinePageState extends State<FeastWinePage> { | ||
| 23 | + @override | ||
| 24 | + void initState() { | ||
| 25 | + super.initState(); | ||
| 26 | + Utils.changeStatusColor(color: MyColours.color_438E93); | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | + Widget _callButton( | ||
| 30 | + {GestureTapCallback onPress, | ||
| 31 | + content, | ||
| 32 | + hasLeftBorder = true, | ||
| 33 | + isSelect = false}) { | ||
| 34 | + return InkWell( | ||
| 35 | + onTap: onPress, | ||
| 36 | + child: Container( | ||
| 37 | + height: h(48), | ||
| 38 | + decoration: BoxDecoration( | ||
| 39 | + color: isSelect ? MyColours.color_438E93 : MyColours.color_ffffff, | ||
| 40 | + border: Border( | ||
| 41 | + bottom: BorderSide( | ||
| 42 | + color: MyColours.color_438E93, | ||
| 43 | + width: ScreenUtil().setWidth(2)), | ||
| 44 | + top: BorderSide( | ||
| 45 | + color: MyColours.color_438E93, | ||
| 46 | + width: ScreenUtil().setWidth(2)), | ||
| 47 | + left: hasLeftBorder | ||
| 48 | + ? BorderSide( | ||
| 49 | + color: MyColours.color_438E93, | ||
| 50 | + width: ScreenUtil().setWidth(2)) | ||
| 51 | + : BorderSide.none, | ||
| 52 | + right: BorderSide( | ||
| 53 | + color: MyColours.color_438E93, | ||
| 54 | + width: ScreenUtil().setWidth(2)))), | ||
| 55 | + child: Align( | ||
| 56 | + alignment: Alignment.center, | ||
| 57 | + child: Text( | ||
| 58 | + content, | ||
| 59 | + style: TextStyle( | ||
| 60 | + color: | ||
| 61 | + isSelect ? MyColours.color_F6F6F6 : MyColours.color_438E93, | ||
| 62 | + fontSize: ScreenUtil().setSp(36)), | ||
| 63 | + ), | ||
| 64 | + ), | ||
| 65 | + ), | ||
| 66 | + ); | ||
| 67 | + } | ||
| 68 | + | ||
| 69 | + ///输入框 | ||
| 70 | + Widget _textfield(String hintText, TextEditingController editingController, | ||
| 71 | + FocusNode focusNode, | ||
| 72 | + {TextInputType inputType = TextInputType.text, double width}) { | ||
| 73 | + return Container( | ||
| 74 | + width: width, | ||
| 75 | + padding: EdgeInsets.symmetric(horizontal: w(6)), | ||
| 76 | + decoration: BoxDecoration( | ||
| 77 | + border: Border.all(width: h(1), color: MyColours.color_438E93)), | ||
| 78 | + child: Container( | ||
| 79 | + // height: ScreenUtil().setHeight(120), | ||
| 80 | + height: ScreenUtil().setWidth(44), | ||
| 81 | + child: TextField( | ||
| 82 | + controller: editingController, | ||
| 83 | + // textAlign: TextAlign.right, | ||
| 84 | + // textAlignVertical: TextAlignVertical.bottom, | ||
| 85 | + maxLines: 1, | ||
| 86 | + inputFormatters: [], | ||
| 87 | + | ||
| 88 | + // //光标颜色 | ||
| 89 | + // cursorColor: | ||
| 90 | + // widget.isSelect ? Colors.white : MyColours.color_199095, | ||
| 91 | + //输入文本的样式 | ||
| 92 | + style: TextStyle( | ||
| 93 | + fontSize: ScreenUtil().setSp(32), | ||
| 94 | + ), | ||
| 95 | + focusNode: focusNode, | ||
| 96 | + textAlign: TextAlign.center, | ||
| 97 | + decoration: InputDecoration( | ||
| 98 | + border: OutlineInputBorder(borderSide: BorderSide.none), | ||
| 99 | + hintText: hintText, | ||
| 100 | + hintStyle: TextStyle( | ||
| 101 | + color: hintText == '' | ||
| 102 | + ? MyColours.color_999999 | ||
| 103 | + : MyColours.color_000000, | ||
| 104 | + fontSize: ScreenUtil().setSp(28), | ||
| 105 | + ), | ||
| 106 | + contentPadding: EdgeInsets.zero, | ||
| 107 | + ), | ||
| 108 | + onChanged: (value) {}, | ||
| 109 | + onEditingComplete: () { | ||
| 110 | + FocusScope.of(context).requestFocus(FocusNode()); //点击空白处隐藏键盘 | ||
| 111 | + }, | ||
| 112 | + keyboardType: inputType, | ||
| 113 | + )), | ||
| 114 | + ); | ||
| 115 | + } | ||
| 116 | + | ||
| 117 | + Widget buildListItem(BuildContext context, int index, bool select) { | ||
| 118 | + return Container( | ||
| 119 | + padding: EdgeInsets.only( | ||
| 120 | + top: h(25), bottom: h(10), left: w(12), right: w(12)), | ||
| 121 | + decoration: BoxDecoration( | ||
| 122 | + border: Border( | ||
| 123 | + bottom: | ||
| 124 | + BorderSide(width: w(1), color: MyColours.color_DBDBDB))), | ||
| 125 | + child: Column( | ||
| 126 | + children: [ | ||
| 127 | + Row( | ||
| 128 | + children: [ | ||
| 129 | + Row(children: [ | ||
| 130 | + InkWell( | ||
| 131 | + onTap: () { | ||
| 132 | + setState(() { | ||
| 133 | + select = !select; | ||
| 134 | + }); | ||
| 135 | + }, | ||
| 136 | + child: Row( | ||
| 137 | + children: [ | ||
| 138 | + Image.asset( | ||
| 139 | + Utils.getImgPath( | ||
| 140 | + select ? 'f_select' : 'f_select_not'), | ||
| 141 | + width: w(24), | ||
| 142 | + ), | ||
| 143 | + HEmptyView(24), | ||
| 144 | + Text( | ||
| 145 | + '剑南春52度500ml', | ||
| 146 | + style: TextStyle( | ||
| 147 | + color: select | ||
| 148 | + ? MyColours.color_515151 | ||
| 149 | + : MyColours.color_999999, | ||
| 150 | + fontSize: font(16), | ||
| 151 | + fontWeight: FontWeight.bold), | ||
| 152 | + ) | ||
| 153 | + ], | ||
| 154 | + )) | ||
| 155 | + ]), | ||
| 156 | + Spacer(), | ||
| 157 | + Text( | ||
| 158 | + '原价:460元/份', | ||
| 159 | + style: TextStyle( | ||
| 160 | + color: MyColours.color_999999, | ||
| 161 | + fontSize: font(14), | ||
| 162 | + ), | ||
| 163 | + ), | ||
| 164 | + ], | ||
| 165 | + ), | ||
| 166 | + select ? VEmptyView(42) : SizedBox(), | ||
| 167 | + select | ||
| 168 | + ? Row( | ||
| 169 | + children: [ | ||
| 170 | + Text( | ||
| 171 | + '议价:', | ||
| 172 | + style: TextStyle( | ||
| 173 | + color: MyColours.color_515151, | ||
| 174 | + fontSize: font(14), | ||
| 175 | + ), | ||
| 176 | + ), | ||
| 177 | + _textfield('1299', null, null, width: w(103)), | ||
| 178 | + Text( | ||
| 179 | + ' 元', | ||
| 180 | + style: TextStyle( | ||
| 181 | + color: MyColours.color_515151, | ||
| 182 | + fontSize: font(14), | ||
| 183 | + ), | ||
| 184 | + ), | ||
| 185 | + Spacer(), | ||
| 186 | + Text( | ||
| 187 | + '数量:', | ||
| 188 | + style: TextStyle( | ||
| 189 | + color: MyColours.color_515151, | ||
| 190 | + fontSize: font(14), | ||
| 191 | + ), | ||
| 192 | + ), | ||
| 193 | + _textfield('1299', null, null, width: w(103)), | ||
| 194 | + Text( | ||
| 195 | + ' 份', | ||
| 196 | + style: TextStyle( | ||
| 197 | + color: MyColours.color_515151, | ||
| 198 | + fontSize: font(14), | ||
| 199 | + ), | ||
| 200 | + ), | ||
| 201 | + ], | ||
| 202 | + ) | ||
| 203 | + : SizedBox(), | ||
| 204 | + ], | ||
| 205 | + )); | ||
| 206 | + } | ||
| 207 | + | ||
| 208 | + @override | ||
| 209 | + Widget build(BuildContext context) { | ||
| 210 | + return Scaffold( | ||
| 211 | + backgroundColor: MyColours.color_ffffff, | ||
| 212 | + appBar: SystemAppBar( | ||
| 213 | + '选择酒水', | ||
| 214 | + needWhite: true, | ||
| 215 | + bgColor: MyColours.color_438E93, | ||
| 216 | + titleColor: MyColours.color_F6F6F6, | ||
| 217 | + onTap: () { | ||
| 218 | + Navigator.pop(context); | ||
| 219 | + }, | ||
| 220 | + ), | ||
| 221 | + body: Column( | ||
| 222 | + crossAxisAlignment: CrossAxisAlignment.start, | ||
| 223 | + children: [ | ||
| 224 | + Expanded( | ||
| 225 | + child: ListView.builder( | ||
| 226 | + shrinkWrap: true, | ||
| 227 | + itemCount: 10, | ||
| 228 | + itemBuilder: (BuildContext context, int index) { | ||
| 229 | + return buildListItem(context, index, true); | ||
| 230 | + }, | ||
| 231 | + )), | ||
| 232 | + Row( | ||
| 233 | + children: [ | ||
| 234 | + Expanded( | ||
| 235 | + child: _callButton( | ||
| 236 | + onPress: () { | ||
| 237 | + Navigator.pop(context); | ||
| 238 | + }, | ||
| 239 | + content: '返回', | ||
| 240 | + hasLeftBorder: true, | ||
| 241 | + isSelect: false)), | ||
| 242 | + Expanded( | ||
| 243 | + child: _callButton( | ||
| 244 | + onPress: () {}, | ||
| 245 | + content: '保存并返回', | ||
| 246 | + hasLeftBorder: true, | ||
| 247 | + isSelect: true)) | ||
| 248 | + ], | ||
| 249 | + ) | ||
| 250 | + ], | ||
| 251 | + )); | ||
| 252 | + } | ||
| 253 | +} |
| @@ -867,4 +867,23 @@ class NavigatorUtil { | @@ -867,4 +867,23 @@ class NavigatorUtil { | ||
| 867 | {replace = false, bool onlyShow = false}) { | 867 | {replace = false, bool onlyShow = false}) { |
| 868 | return _navigateTo(context, "${Routes.feast_menu_page}", replace: replace); | 868 | return _navigateTo(context, "${Routes.feast_menu_page}", replace: replace); |
| 869 | } | 869 | } |
| 870 | + | ||
| 871 | + ///宴会----添加套餐 | ||
| 872 | + static Future<dynamic> goFeastSetmealPage(BuildContext context, | ||
| 873 | + {replace = false, bool onlyShow = false}) { | ||
| 874 | + return _navigateTo(context, "${Routes.feast_setmeal_page}", | ||
| 875 | + replace: replace); | ||
| 876 | + } | ||
| 877 | + | ||
| 878 | + ///宴会----添加酒水 | ||
| 879 | + static Future<dynamic> goFeastWinePage(BuildContext context, | ||
| 880 | + {replace = false, bool onlyShow = false}) { | ||
| 881 | + return _navigateTo(context, "${Routes.feast_wine_page}", replace: replace); | ||
| 882 | + } | ||
| 883 | + | ||
| 884 | + ///宴会----添加配置 | ||
| 885 | + static Future<dynamic> goFeastSetPage(BuildContext context, | ||
| 886 | + {replace = false, bool onlyShow = false}) { | ||
| 887 | + return _navigateTo(context, "${Routes.feast_set_page}", replace: replace); | ||
| 888 | + } | ||
| 870 | } | 889 | } |
| @@ -145,6 +145,9 @@ import '../pages/feast/feast_board.dart'; | @@ -145,6 +145,9 @@ import '../pages/feast/feast_board.dart'; | ||
| 145 | import '../pages/feast/feast_create_page.dart'; | 145 | import '../pages/feast/feast_create_page.dart'; |
| 146 | import '../pages/feast/feast_deposit_page.dart'; | 146 | import '../pages/feast/feast_deposit_page.dart'; |
| 147 | import '../pages/feast/feast_menu_page.dart'; | 147 | import '../pages/feast/feast_menu_page.dart'; |
| 148 | +import '../pages/feast/feast_set_page.dart'; | ||
| 149 | +import '../pages/feast/feast_setmeal_page.dart'; | ||
| 150 | +import '../pages/feast/feast_wine_page.dart'; | ||
| 148 | import '../provider/feast_model.dart'; | 151 | import '../provider/feast_model.dart'; |
| 149 | 152 | ||
| 150 | // 登录页 | 153 | // 登录页 |
| @@ -1362,3 +1365,36 @@ var feastMenuPageHandle = new Handler( | @@ -1362,3 +1365,36 @@ var feastMenuPageHandle = new Handler( | ||
| 1362 | return ChangeNotifierProvider<FeastModel>( | 1365 | return ChangeNotifierProvider<FeastModel>( |
| 1363 | create: (_) => FeastModel(), child: FeastMenuPage()); | 1366 | create: (_) => FeastModel(), child: FeastMenuPage()); |
| 1364 | }); | 1367 | }); |
| 1368 | + | ||
| 1369 | +///宴会----添加套餐 | ||
| 1370 | +var feastSetmealPageHandle = new Handler( | ||
| 1371 | + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { | ||
| 1372 | + // String uids = params["uids"].first; | ||
| 1373 | + | ||
| 1374 | + // bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first); | ||
| 1375 | + return ChangeNotifierProvider<FeastModel>( | ||
| 1376 | + create: (_) => FeastModel(), child: FeastSetmealPage()); | ||
| 1377 | +}); | ||
| 1378 | + | ||
| 1379 | +///宴会----添加酒水 | ||
| 1380 | +var feastWinePageHandle = new Handler( | ||
| 1381 | + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { | ||
| 1382 | + // String uids = params["uids"].first; | ||
| 1383 | + | ||
| 1384 | + // bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first); | ||
| 1385 | + return ChangeNotifierProvider<FeastModel>( | ||
| 1386 | + create: (_) => FeastModel(), child: FeastWinePage()); | ||
| 1387 | +}); | ||
| 1388 | + | ||
| 1389 | + | ||
| 1390 | +///宴会----添加配置 | ||
| 1391 | +var feastSetPageHandle = new Handler( | ||
| 1392 | + handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { | ||
| 1393 | + // String uids = params["uids"].first; | ||
| 1394 | + | ||
| 1395 | + // bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first); | ||
| 1396 | + return ChangeNotifierProvider<FeastModel>( | ||
| 1397 | + create: (_) => FeastModel(), child: FeastSetPage()); | ||
| 1398 | +}); | ||
| 1399 | + | ||
| 1400 | + |
| @@ -119,6 +119,9 @@ class Routes { | @@ -119,6 +119,9 @@ class Routes { | ||
| 119 | static String feast_create_page = "/feast_create_page"; //宴会----新建宴会 | 119 | static String feast_create_page = "/feast_create_page"; //宴会----新建宴会 |
| 120 | static String feast_deposit_page = "/feast_deposit_page"; //宴会----定金 | 120 | static String feast_deposit_page = "/feast_deposit_page"; //宴会----定金 |
| 121 | static String feast_menu_page = "/feast_menu_page"; //宴会----调菜 | 121 | static String feast_menu_page = "/feast_menu_page"; //宴会----调菜 |
| 122 | + static String feast_setmeal_page = "/feast_setmeal_page"; //宴会----添加套餐 | ||
| 123 | + static String feast_wine_page = "/feast_wine_page"; //宴会----添加酒水 | ||
| 124 | + static String feast_set_page = "/feast_set_page"; //宴会----添加配置 | ||
| 122 | 125 | ||
| 123 | static void configureRoutes(FluroRouter router) { | 126 | static void configureRoutes(FluroRouter router) { |
| 124 | router.notFoundHandler = new Handler( | 127 | router.notFoundHandler = new Handler( |
| @@ -240,7 +243,9 @@ class Routes { | @@ -240,7 +243,9 @@ class Routes { | ||
| 240 | router.define(feast_board_page, handler: feastBoardPageHandle); | 243 | router.define(feast_board_page, handler: feastBoardPageHandle); |
| 241 | router.define(feast_create_page, handler: feastCreatePageHandle); | 244 | router.define(feast_create_page, handler: feastCreatePageHandle); |
| 242 | router.define(feast_deposit_page, handler: feastDepositPageHandle); | 245 | router.define(feast_deposit_page, handler: feastDepositPageHandle); |
| 243 | - | ||
| 244 | router.define(feast_menu_page, handler: feastMenuPageHandle); | 246 | router.define(feast_menu_page, handler: feastMenuPageHandle); |
| 247 | + router.define(feast_setmeal_page, handler: feastSetmealPageHandle); | ||
| 248 | + router.define(feast_wine_page, handler: feastWinePageHandle); | ||
| 249 | + router.define(feast_set_page, handler: feastSetPageHandle); | ||
| 245 | } | 250 | } |
| 246 | } | 251 | } |
| @@ -4192,7 +4192,7 @@ class DialogUtil { | @@ -4192,7 +4192,7 @@ class DialogUtil { | ||
| 4192 | if (valueChanged != null) { | 4192 | if (valueChanged != null) { |
| 4193 | valueChanged(picker.adapter.text); | 4193 | valueChanged(picker.adapter.text); |
| 4194 | } | 4194 | } |
| 4195 | - }).showModal(context,backgroundColor: MyColours.color_40000000); | 4195 | + }).showModal(context, backgroundColor: MyColours.color_40000000); |
| 4196 | } | 4196 | } |
| 4197 | 4197 | ||
| 4198 | ///年月日时分秒选择器 | 4198 | ///年月日时分秒选择器 |
| @@ -4706,6 +4706,7 @@ class DialogUtil { | @@ -4706,6 +4706,7 @@ class DialogUtil { | ||
| 4706 | Color rColor = MyColours.color_438E93, | 4706 | Color rColor = MyColours.color_438E93, |
| 4707 | bool isBold = false, | 4707 | bool isBold = false, |
| 4708 | bool isBoldContent = false, | 4708 | bool isBoldContent = false, |
| 4709 | + Color contentColor = MyColours.color_99000000, | ||
| 4709 | VoidCallback lCallback, | 4710 | VoidCallback lCallback, |
| 4710 | VoidCallback rCallback}) { | 4711 | VoidCallback rCallback}) { |
| 4711 | showCupertinoDialog( | 4712 | showCupertinoDialog( |
| @@ -4724,7 +4725,8 @@ class DialogUtil { | @@ -4724,7 +4725,8 @@ class DialogUtil { | ||
| 4724 | fontWeight: | 4725 | fontWeight: |
| 4725 | isBoldContent ? FontWeight.bold : FontWeight.normal, | 4726 | isBoldContent ? FontWeight.bold : FontWeight.normal, |
| 4726 | fontSize: ScreenUtil().setSp(32), | 4727 | fontSize: ScreenUtil().setSp(32), |
| 4727 | - color: MyColours.color_99000000)), | 4728 | + color: contentColor |
| 4729 | + )), | ||
| 4728 | actions: [ | 4730 | actions: [ |
| 4729 | CupertinoDialogAction( | 4731 | CupertinoDialogAction( |
| 4730 | child: Text(lTitle, | 4732 | child: Text(lTitle, |
-
Please register or login to post a comment