xt / Flutter-ReserveApp · Commits

Go to a project

Commit 1a5ee6b7d6772936345b5960ab6de4e9a7cbbbbb

Authored by wdn127929
1 parent b67b2083
build: skipped

日订单UI OK

Inline Side-by-side
Showing 9 changed files with 1001 additions and 289 deletions
  1 +import 'package:flutter/material.dart';
  2 +import 'package:one_key/res/colors.dart';
  3 +import 'package:one_key/utils/utils.dart';
  4 +import 'package:one_key/widgets/MyDivider.dart';
  5 +import 'package:one_key/widgets/h_empty_view.dart';
  6 +import 'package:one_key/widgets/v_empty_view.dart';
  7 +
  8 +import '../../../../utils/screen_util.dart';
  9 +
  10 +class DayOrderLeftPage extends StatefulWidget {
  11 + const DayOrderLeftPage({Key key}) : super(key: key);
  12 +
  13 + @override
  14 + _DayOrderLeftPageState createState() => _DayOrderLeftPageState();
  15 +}
  16 +
  17 +var data = {
  18 + "早餐": {
  19 + 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
  20 + 'expansion': true
  21 + },
  22 + "午餐": {
  23 + 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
  24 + 'expansion': true
  25 + },
  26 + "晚餐": {
  27 + 'data': ["东城区", "西城区", "朝阳区", "丰台区", "石景山区", "顺义区", "海淀区"],
  28 + 'expansion': true
  29 + },
  30 +};
  31 +
  32 +class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
  33 + @override
  34 + Widget build(BuildContext context) {
  35 + return Container(
  36 + color: MyColours.color_f3f3f3,
  37 + child: ListView(
  38 + children: _buildList(),
  39 + ),
  40 + );
  41 + }
  42 +
  43 + List<Widget> _buildList() {
  44 + List<Widget> widgets = [];
  45 + data.keys.forEach((key) {
  46 + widgets.add(_item(key));
  47 + });
  48 +
  49 + return widgets;
  50 + }
  51 +
  52 + Widget _item(String city) {
  53 + return ExpansionTile(
  54 + // tilePadding: EdgeInsets.zero,
  55 +
  56 + // childrenPadding: EdgeInsets.zero,
  57 + title: Text(
  58 + city,
  59 + style: TextStyle(color: MyColours.color_515151, fontSize: font(16)),
  60 + ),
  61 + trailing: Image.asset(
  62 + data[city]['expansion']
  63 + ? Utils.getImgPath('up')
  64 + : Utils.getImgPath('down'),
  65 + width: w(12),
  66 + ),
  67 +
  68 + iconColor: Colors.red,
  69 + textColor: Colors.red,
  70 + backgroundColor: MyColours.color_ffffff,
  71 + collapsedBackgroundColor: MyColours.color_ffffff,
  72 + collapsedIconColor: Colors.red,
  73 + collapsedTextColor: Colors.red,
  74 +
  75 + onExpansionChanged: (value) {
  76 + print(value);
  77 + data[city]['expansion'] = value;
  78 + setState(() {});
  79 + },
  80 + initiallyExpanded: true,
  81 + // title:,
  82 + children: List.from(data[city]['data'])
  83 + .map((area) => _buildArea(area))
  84 + .toList(),
  85 + );
  86 + }
  87 +
  88 + Widget _buildArea(String area) {
  89 + return Container(
  90 + // constraints: BoxConstraints(minHeight: w(10)),
  91 + // padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
  92 + decoration: BoxDecoration(
  93 + color: MyColours.color_f3f3f3,
  94 + ),
  95 + padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
  96 + child: Container(
  97 + // constraints: BoxConstraints(minHeight: w(10)),
  98 + // padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
  99 + decoration: BoxDecoration(
  100 + color: MyColours.color_ffffff,
  101 + borderRadius: BorderRadius.circular(r(8))),
  102 + child: Row(
  103 + children: [
  104 + Expanded(
  105 + child: Container(
  106 + decoration: BoxDecoration(
  107 + // color: Colors.red,
  108 + border: Border(
  109 + right: BorderSide(
  110 + color: MyColours.color_f3f3f3, width: w(1)))),
  111 + child: Column(
  112 + crossAxisAlignment: CrossAxisAlignment.start,
  113 + children: [
  114 + Container(
  115 + // height: w(34),
  116 + padding: EdgeInsets.symmetric(
  117 + horizontal: w(10), vertical: w(10)),
  118 + child: Row(
  119 + mainAxisAlignment:
  120 + MainAxisAlignment.spaceBetween,
  121 + children: [
  122 + Text(
  123 + '包间1',
  124 + style: TextStyle(
  125 + color: MyColours.color_999999,
  126 + fontSize: font(14),
  127 + fontWeight: FontWeight.bold),
  128 + ),
  129 + Text(
  130 + '张先生',
  131 + style: TextStyle(
  132 + color: MyColours.color_999999,
  133 + fontSize: font(14),
  134 + fontWeight: FontWeight.bold),
  135 + ),
  136 + Text(
  137 + '186****6909',
  138 + style: TextStyle(
  139 + color: MyColours.color_999999,
  140 + fontSize: font(14),
  141 + ),
  142 + )
  143 + ],
  144 + )),
  145 + MyDivider(
  146 + double.infinity,
  147 + w(1),
  148 + color: MyColours.color_f3f3f3,
  149 + ),
  150 + VEmptyView(10),
  151 + Container(
  152 + padding: EdgeInsets.symmetric(horizontal: w(10)),
  153 + child: Wrap(
  154 + runSpacing: w(6),
  155 + children: [
  156 + Text(
  157 + '李霞订',
  158 + style: TextStyle(
  159 + color: MyColours.color_515151,
  160 + fontSize: font(10),
  161 + ),
  162 + ),
  163 + HEmptyView(10),
  164 + MyDivider(
  165 + w(1),
  166 + w(15),
  167 + color: MyColours.color_DBDBDB,
  168 + ),
  169 + HEmptyView(10),
  170 + Text(
  171 + '2023-11-05 12:23:34',
  172 + style: TextStyle(
  173 + color: MyColours.color_515151,
  174 + fontSize: font(10),
  175 + ),
  176 + ),
  177 + ],
  178 + )),
  179 + VEmptyView(10),
  180 + Padding(
  181 + padding: EdgeInsets.symmetric(horizontal: w(10)),
  182 + child: Wrap(
  183 + runSpacing: w(6),
  184 + children: [
  185 + Text(
  186 + '6人',
  187 + style: TextStyle(
  188 + color: MyColours.color_999999,
  189 + fontSize: font(10),
  190 + ),
  191 + ),
  192 + HEmptyView(10),
  193 + MyDivider(
  194 + w(1),
  195 + w(15),
  196 + color: MyColours.color_DBDBDB,
  197 + ),
  198 + HEmptyView(10),
  199 + Text(
  200 + '消费 25800.99元',
  201 + style: TextStyle(
  202 + color: MyColours.color_999999,
  203 + fontSize: font(10),
  204 + ),
  205 + ),
  206 + HEmptyView(10),
  207 + MyDivider(
  208 + w(1),
  209 + w(15),
  210 + color: MyColours.color_DBDBDB,
  211 + ),
  212 + HEmptyView(10),
  213 + Text(
  214 + '人均 103.2元',
  215 + style: TextStyle(
  216 + color: MyColours.color_999999,
  217 + fontSize: font(10),
  218 + ),
  219 + ),
  220 + HEmptyView(10),
  221 + MyDivider(
  222 + w(1),
  223 + w(15),
  224 + color: MyColours.color_DBDBDB,
  225 + ),
  226 + HEmptyView(10),
  227 + Text(
  228 + '存酒',
  229 + style: TextStyle(
  230 + color: MyColours.color_999999,
  231 + fontSize: font(10),
  232 + ),
  233 + ),
  234 + HEmptyView(10),
  235 + MyDivider(
  236 + w(1),
  237 + w(15),
  238 + color: MyColours.color_DBDBDB,
  239 + ),
  240 + HEmptyView(10),
  241 + Text(
  242 + '提前点餐',
  243 + style: TextStyle(
  244 + color: MyColours.color_999999,
  245 + fontSize: font(10),
  246 + ),
  247 + ),
  248 + ],
  249 + )),
  250 + VEmptyView(10),
  251 + Padding(
  252 + padding: EdgeInsets.symmetric(horizontal: w(10)),
  253 + child: Text(
  254 + '备注：生日女35岁 蛋糕布置备注：生日女35岁 蛋糕布置备注：生日女35岁 蛋糕布置备注：生日女35岁 蛋糕布置',
  255 + overflow: TextOverflow.ellipsis,
  256 + maxLines: 10,
  257 + style: TextStyle(
  258 + height: 1.2,
  259 + color: MyColours.color_999999,
  260 + fontSize: font(10),
  261 + ),
  262 + )),
  263 + VEmptyView(10),
  264 + ],
  265 + ))),
  266 + Container(
  267 + width: w(70),
  268 + padding: EdgeInsets.zero,
  269 + child: Image.asset(
  270 + Utils.getImgPath('arrow_right_new'),
  271 + width: w(12),
  272 + height: w(12),
  273 + ),
  274 + )
  275 + ],
  276 + ),
  277 + ));
  278 + }
  279 +}
  1 +import 'package:flutter/material.dart';
  2 +import 'package:one_key/pages/my/customer_type/store_customer/day_order_left_page.dart';
  3 +
  4 +import 'package:one_key/res/colors.dart';
  5 +import 'package:one_key/widgets/system_app_bar.dart';
  6 +import 'package:one_key/widgets/v_empty_view.dart';
  7 +
  8 +import '../../../../utils/screen_util.dart';
  9 +import '../../../../widgets/MyDivider.dart';
  10 +import '../../../../widgets/h_empty_view.dart';
  11 +
  12 +
  13 +/**
  14 + *
  15 + * 日订单
  16 + */
  17 +
  18 +class DayOrderPage extends StatefulWidget {
  19 + DayOrderPage({Key key}) : super(key: key);
  20 +
  21 + @override
  22 + _DayOrderPageState createState() => _DayOrderPageState();
  23 +}
  24 +
  25 +class _DayOrderPageState extends State<DayOrderPage>
  26 + with TickerProviderStateMixin {
  27 + ScrollController _controller = ScrollController();
  28 + TabController tabController;
  29 + Color selectedColor = MyColours.color_ffffff;
  30 + Color unSelectedColor = MyColours.color_BFC4D4;
  31 + List _elements = [
  32 + {'name': 'John', 'group': 'Team A'},
  33 + {'name': 'Will', 'group': 'Team B'},
  34 + {'name': 'Beth', 'group': 'Team A'},
  35 + {'name': 'Miranda', 'group': 'Team B'},
  36 + {'name': 'Mike', 'group': 'Team C'},
  37 + {'name': 'Danny', 'group': 'Team C'},
  38 + ];
  39 +
  40 + @override
  41 + void initState() {
  42 + // TODO: implement initState
  43 + super.initState();
  44 + tabController = TabController(length: 2, vsync: this);
  45 +
  46 + tabController.addListener(() {
  47 + //点击tab时或滑动tab回调一次
  48 + // if (tabController.index.toDouble() == tabController.animation.value) {
  49 + // getMessage(index: tabController.index);
  50 + // selectIndex = tabController.index;
  51 + // setState(() {});
  52 + // }
  53 + });
  54 + }
  55 +
  56 + Widget _headWidget() {
  57 + return Column(
  58 + children: [
  59 + Container(
  60 + color: MyColours.color_33438E93,
  61 + padding: EdgeInsets.symmetric(horizontal: w(15), vertical: w(10)),
  62 + child: Column(
  63 + crossAxisAlignment: CrossAxisAlignment.start,
  64 + children: [
  65 + Row(
  66 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  67 + children: [
  68 + Text(
  69 + '2023年12月30日',
  70 + style: TextStyle(
  71 + color: MyColours.color_515151,
  72 + fontSize: font(16),
  73 + fontWeight: FontWeight.bold),
  74 + ),
  75 + Text(
  76 + '十二月廿四',
  77 + style: TextStyle(
  78 + color: MyColours.color_515151,
  79 + fontSize: font(14),
  80 + ),
  81 + ),
  82 + Text(
  83 + '星期日',
  84 + style: TextStyle(
  85 + color: MyColours.color_515151,
  86 + fontSize: font(14),
  87 + ),
  88 + ),
  89 + ],
  90 + ),
  91 + VEmptyView(20),
  92 + Row(
  93 + crossAxisAlignment: CrossAxisAlignment.start,
  94 + children: [
  95 + Text(
  96 + '预订',
  97 + style: TextStyle(
  98 + fontWeight: FontWeight.bold,
  99 + color: MyColours.color_515151,
  100 + fontSize: font(
  101 + (14),
  102 + )),
  103 + ),
  104 + HEmptyView(10),
  105 + Text(
  106 + '1089单',
  107 + style: TextStyle(
  108 + color: MyColours.color_515151,
  109 + fontSize: font(
  110 + (14),
  111 + )),
  112 + ),
  113 + HEmptyView(10),
  114 + MyDivider(
  115 + w(1),
  116 + w(15),
  117 + color: MyColours.color_DBDBDB,
  118 + ),
  119 + HEmptyView(10),
  120 + Text(
  121 + '1190桌',
  122 + style: TextStyle(
  123 + color: MyColours.color_515151,
  124 + fontSize: font(
  125 + (14),
  126 + )),
  127 + ),
  128 + ],
  129 + ),
  130 + VEmptyView(20),
  131 + Wrap(
  132 + runSpacing: w(5),
  133 + children: [
  134 + Text(
  135 + '到店',
  136 + style: TextStyle(
  137 + fontWeight: FontWeight.bold,
  138 + color: MyColours.color_515151,
  139 + fontSize: font(
  140 + (14),
  141 + )),
  142 + ),
  143 + HEmptyView(10),
  144 + Text(
  145 + '1089单',
  146 + style: TextStyle(
  147 + color: MyColours.color_515151,
  148 + fontSize: font(
  149 + (14),
  150 + )),
  151 + ),
  152 + HEmptyView(10),
  153 + MyDivider(
  154 + w(1),
  155 + w(15),
  156 + color: MyColours.color_DBDBDB,
  157 + ),
  158 + HEmptyView(10),
  159 + Text(
  160 + '1190桌',
  161 + style: TextStyle(
  162 + color: MyColours.color_515151,
  163 + fontSize: font(
  164 + (14),
  165 + )),
  166 + ),
  167 + HEmptyView(10),
  168 + Text(
  169 + '1089人',
  170 + style: TextStyle(
  171 + color: MyColours.color_515151,
  172 + fontSize: font(
  173 + (14),
  174 + )),
  175 + ),
  176 + HEmptyView(10),
  177 + MyDivider(
  178 + w(1),
  179 + w(15),
  180 + color: MyColours.color_DBDBDB,
  181 + ),
  182 + HEmptyView(10),
  183 + Text(
  184 + '1190取消',
  185 + style: TextStyle(
  186 + color: MyColours.color_515151,
  187 + fontSize: font(
  188 + (14),
  189 + )),
  190 + ),
  191 + HEmptyView(10),
  192 + MyDivider(
  193 + w(1),
  194 + w(15),
  195 + color: MyColours.color_DBDBDB,
  196 + ),
  197 + HEmptyView(10),
  198 + Text(
  199 + '到客90.1%',
  200 + style: TextStyle(
  201 + color: MyColours.color_515151,
  202 + fontSize: font(
  203 + (14),
  204 + )),
  205 + ),
  206 + ],
  207 + ),
  208 + VEmptyView(20),
  209 + Wrap(
  210 + runSpacing: w(6),
  211 + children: [
  212 + Text(
  213 + '有金额订单数 25',
  214 + style: TextStyle(
  215 + color: MyColours.color_999999,
  216 + fontSize: font(
  217 + (10),
  218 + )),
  219 + ),
  220 + HEmptyView(10),
  221 + MyDivider(
  222 + w(1),
  223 + w(15),
  224 + color: MyColours.color_DBDBDB,
  225 + ),
  226 + HEmptyView(10),
  227 + Text(
  228 + '总消费 25800元',
  229 + style: TextStyle(
  230 + color: MyColours.color_999999,
  231 + fontSize: font(
  232 + (10),
  233 + )),
  234 + ),
  235 + HEmptyView(10),
  236 + Text(
  237 + '人均 103.2元',
  238 + style: TextStyle(
  239 + color: MyColours.color_999999,
  240 + fontSize: font(
  241 + (10),
  242 + )),
  243 + ),
  244 + HEmptyView(10),
  245 + MyDivider(
  246 + w(1),
  247 + w(15),
  248 + color: MyColours.color_DBDBDB,
  249 + ),
  250 + HEmptyView(10),
  251 + Text(
  252 + '桌均 860元',
  253 + style: TextStyle(
  254 + color: MyColours.color_999999,
  255 + fontSize: font(
  256 + (10),
  257 + )),
  258 + ),
  259 + HEmptyView(10),
  260 + Text(
  261 + '存酒 1位',
  262 + style: TextStyle(
  263 + color: MyColours.color_999999,
  264 + fontSize: font(
  265 + (10),
  266 + )),
  267 + ),
  268 + HEmptyView(10),
  269 + MyDivider(
  270 + w(1),
  271 + w(15),
  272 + color: MyColours.color_DBDBDB,
  273 + ),
  274 + HEmptyView(10),
  275 + Text(
  276 + '提前点餐 9位',
  277 + style: TextStyle(
  278 + color: MyColours.color_999999,
  279 + fontSize: font(
  280 + (10),
  281 + )),
  282 + ),
  283 + HEmptyView(10),
  284 + MyDivider(
  285 + w(1),
  286 + w(15),
  287 + color: MyColours.color_DBDBDB,
  288 + ),
  289 + HEmptyView(10),
  290 + Text(
  291 + '安排菜 9位',
  292 + style: TextStyle(
  293 + color: MyColours.color_999999,
  294 + fontSize: font(
  295 + (10),
  296 + )),
  297 + ),
  298 + ],
  299 + ),
  300 + ],
  301 + )),
  302 + ],
  303 + );
  304 + }
  305 +
  306 + @override
  307 + Widget build(BuildContext context) {
  308 + return Scaffold(
  309 + appBar: SystemAppBar('日订单'),
  310 + body: Column(
  311 + children: [
  312 + VEmptyView(10),
  313 + _headWidget(),
  314 + Container(
  315 + alignment: Alignment.center,
  316 + width: double.infinity,
  317 + color: MyColours.color_ffffff,
  318 + padding: EdgeInsets.only(bottom: w(9), top: w(9)),
  319 + child: TabBar(
  320 + onTap: (index) {
  321 + print(index);
  322 + },
  323 + controller: tabController,
  324 + isScrollable: true,
  325 + indicatorColor: MyColours.color_438E93,
  326 + indicatorSize: TabBarIndicatorSize.tab,
  327 + indicatorWeight: w(2),
  328 + unselectedLabelColor: MyColours.color_999999,
  329 + labelColor: MyColours.color_438E93,
  330 + labelStyle: TextStyle(
  331 + fontSize: w(14),
  332 + color: MyColours.color_438E93,
  333 + fontWeight: FontWeight.bold),
  334 + unselectedLabelStyle:
  335 + TextStyle(fontSize: w(12), color: MyColours.color_999999),
  336 + indicatorPadding: EdgeInsets.only(left: w(24), right: w(24)),
  337 + // labelPadding:
  338 + // EdgeInsets.symmetric(horizontal: w(32)), //tabs控件之间的间距
  339 + tabs: [
  340 + Tab(
  341 + height: w(30),
  342 + child: Container(
  343 + width: w(100),
  344 + alignment: Alignment.center,
  345 + child: Text(
  346 + '预订到店',
  347 + ),
  348 + )),
  349 + Tab(
  350 + height: w(30),
  351 + child: Container(
  352 + width: w(100),
  353 + alignment: Alignment.center,
  354 + child: Text(
  355 + '预订取消',
  356 + )),
  357 + ),
  358 + ],
  359 +
  360 + // indicatorPadding: EdgeInsets.only(
  361 + // left: ScreenUtil().setWidth(16),
  362 + // right: ScreenUtil().setWidth(32)),
  363 + // indicatorWeight: ScreenUtil().setWidth(6.0),
  364 + )),
  365 + VEmptyView(10),
  366 +
  367 + Expanded(
  368 + child:
  369 + TabBarView(controller: tabController, children: [
  370 + DayOrderLeftPage(),
  371 + DayOrderLeftPage(),
  372 + ]),
  373 + ),
  374 + ],
  375 + ),
  376 + );
  377 + }
  378 +}
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:flutter_screenutil/flutter_screenutil.dart'; 2 import 'package:flutter_screenutil/flutter_screenutil.dart';
3 import 'package:one_key/res/colors.dart'; 3 import 'package:one_key/res/colors.dart';
  4 +import 'package:one_key/route/navigator_util.dart';
4 import 'package:one_key/widgets/system_app_bar.dart'; 5 import 'package:one_key/widgets/system_app_bar.dart';
5 import 'package:one_key/widgets/v_empty_view.dart'; 6 import 'package:one_key/widgets/v_empty_view.dart';
6 import 'package:provider/provider.dart'; 7 import 'package:provider/provider.dart';
@@ -427,317 +428,333 @@ class _MonthOrderPageState extends State<MonthOrderPage> { @@ -427,317 +428,333 @@ class _MonthOrderPageState extends State<MonthOrderPage> {
427 shrinkWrap: true, 428 shrinkWrap: true,
428 padding: EdgeInsets.symmetric(horizontal: w(10)), 429 padding: EdgeInsets.symmetric(horizontal: w(10)),
429 itemBuilder: (context, index) { 430 itemBuilder: (context, index) {
430 - return Container(  
431 - margin: EdgeInsets.only(bottom: w(10)),  
432 - padding: EdgeInsets.symmetric(horizontal: w(10)),  
433 - decoration: BoxDecoration(  
434 - color: MyColours.color_ffffff,  
435 - borderRadius: BorderRadius.circular(r(8)),  
436 - ),  
437 - child: Row(  
438 - children: [  
439 - Container(  
440 - width: w(75),  
441 - padding: EdgeInsets.symmetric(vertical: w(5)),  
442 - decoration: BoxDecoration(  
443 - border: Border(  
444 - right: BorderSide(  
445 - color: MyColours.color_f3f3f3,  
446 - width: w(1)))),  
447 - child: Column(  
448 - children: [  
449 - VEmptyView(32),  
450 - Text(  
451 - '30日',  
452 - style: TextStyle(  
453 - fontSize: font(16),  
454 - fontWeight: FontWeight.bold,  
455 - color: MyColours.color_515151),  
456 - ),  
457 - VEmptyView(40),  
458 - Text(  
459 - '十二月廿四',  
460 - style: TextStyle(  
461 - fontSize: font(10),  
462 - color: MyColours.color_999999),  
463 - ),  
464 - VEmptyView(10),  
465 - Text(  
466 - '星期日',  
467 - style: TextStyle(  
468 - fontSize: font(10),  
469 - color: MyColours.color_999999),  
470 - ),  
471 - VEmptyView(20),  
472 - ],  
473 - ), 431 + return InkWell(
  432 + onTap: () {
  433 + NavigatorUtil.goDayOrderPage(context);
  434 + },
  435 + child: Container(
  436 + margin: EdgeInsets.only(bottom: w(10)),
  437 + padding:
  438 + EdgeInsets.symmetric(horizontal: w(10)),
  439 + decoration: BoxDecoration(
  440 + color: MyColours.color_ffffff,
  441 + borderRadius: BorderRadius.circular(r(8)),
474 ), 442 ),
475 - Expanded(  
476 - child: Container(  
477 - padding: EdgeInsets.only(  
478 - top: w(5), bottom: w(5), left: w(10)),  
479 - child: Row(  
480 - mainAxisAlignment:  
481 - MainAxisAlignment.spaceBetween,  
482 - // crossAxisAlignment: CrossAxisAlignment.start,  
483 - children: [  
484 - Expanded(  
485 - child: Column(  
486 - mainAxisAlignment:  
487 - MainAxisAlignment.start,  
488 - crossAxisAlignment:  
489 - CrossAxisAlignment.start, 443 + child: Row(
  444 + children: [
  445 + Container(
  446 + width: w(75),
  447 + padding:
  448 + EdgeInsets.symmetric(vertical: w(5)),
  449 + decoration: BoxDecoration(
  450 + border: Border(
  451 + right: BorderSide(
  452 + color: MyColours.color_f3f3f3,
  453 + width: w(1)))),
  454 + child: Column(
490 children: [ 455 children: [
491 - Row(  
492 - crossAxisAlignment:  
493 - CrossAxisAlignment.start,  
494 - children: [  
495 - Text(  
496 - '预订',  
497 - style: TextStyle(  
498 - fontWeight: FontWeight.bold,  
499 - color:  
500 - MyColours.color_515151,  
501 - fontSize: font(  
502 - (12),  
503 - )),  
504 - ),  
505 - HEmptyView(10),  
506 - Text(  
507 - '1089单',  
508 - style: TextStyle(  
509 - color:  
510 - MyColours.color_515151,  
511 - fontSize: font(  
512 - (10),  
513 - )),  
514 - ),  
515 - HEmptyView(10),  
516 - MyDivider(  
517 - w(1),  
518 - w(15),  
519 - color: MyColours.color_DBDBDB,  
520 - ),  
521 - HEmptyView(10),  
522 - Text(  
523 - '1190桌',  
524 - style: TextStyle(  
525 - color:  
526 - MyColours.color_515151,  
527 - fontSize: font(  
528 - (10),  
529 - )),  
530 - ),  
531 - ], 456 + VEmptyView(32),
  457 + Text(
  458 + '30日',
  459 + style: TextStyle(
  460 + fontSize: font(16),
  461 + fontWeight: FontWeight.bold,
  462 + color: MyColours.color_515151),
532 ), 463 ),
533 - VEmptyView(10),  
534 - Wrap(  
535 - runSpacing: w(5),  
536 - children: [  
537 - Text(  
538 - '到店',  
539 - style: TextStyle(  
540 - fontWeight: FontWeight.bold,  
541 - color:  
542 - MyColours.color_515151,  
543 - fontSize: font(  
544 - (12),  
545 - )),  
546 - ),  
547 - HEmptyView(10),  
548 - Text(  
549 - '1089单',  
550 - style: TextStyle(  
551 - color:  
552 - MyColours.color_515151,  
553 - fontSize: font(  
554 - (10),  
555 - )),  
556 - ),  
557 - HEmptyView(10),  
558 - MyDivider(  
559 - w(1),  
560 - w(15),  
561 - color: MyColours.color_DBDBDB,  
562 - ),  
563 - HEmptyView(10),  
564 - Text(  
565 - '1190桌',  
566 - style: TextStyle(  
567 - color:  
568 - MyColours.color_515151,  
569 - fontSize: font(  
570 - (10),  
571 - )),  
572 - ),  
573 - HEmptyView(10),  
574 - Text(  
575 - '1089人',  
576 - style: TextStyle(  
577 - color:  
578 - MyColours.color_515151,  
579 - fontSize: font(  
580 - (10),  
581 - )),  
582 - ),  
583 - HEmptyView(10),  
584 - MyDivider(  
585 - w(1),  
586 - w(15),  
587 - color: MyColours.color_DBDBDB,  
588 - ),  
589 - HEmptyView(10),  
590 - Text(  
591 - '1190取消',  
592 - style: TextStyle(  
593 - color:  
594 - MyColours.color_515151,  
595 - fontSize: font(  
596 - (10),  
597 - )),  
598 - ),  
599 - HEmptyView(10),  
600 - MyDivider(  
601 - w(1),  
602 - w(15),  
603 - color: MyColours.color_DBDBDB,  
604 - ),  
605 - HEmptyView(10),  
606 - Text(  
607 - '到客90.1%',  
608 - style: TextStyle(  
609 - color:  
610 - MyColours.color_515151,  
611 - fontSize: font(  
612 - (10),  
613 - )),  
614 - ),  
615 - ], 464 + VEmptyView(40),
  465 + Text(
  466 + '十二月廿四',
  467 + style: TextStyle(
  468 + fontSize: font(10),
  469 + color: MyColours.color_999999),
616 ), 470 ),
617 VEmptyView(10), 471 VEmptyView(10),
618 - Row( 472 + Text(
  473 + '星期日',
  474 + style: TextStyle(
  475 + fontSize: font(10),
  476 + color: MyColours.color_999999),
  477 + ),
  478 + VEmptyView(20),
  479 + ],
  480 + ),
  481 + ),
  482 + Expanded(
  483 + child: Container(
  484 + padding: EdgeInsets.only(
  485 + top: w(5), bottom: w(5), left: w(10)),
  486 + child: Row(
  487 + mainAxisAlignment:
  488 + MainAxisAlignment.spaceBetween,
  489 + // crossAxisAlignment: CrossAxisAlignment.start,
  490 + children: [
  491 + Expanded(
  492 + child: Column(
  493 + mainAxisAlignment:
  494 + MainAxisAlignment.start,
619 crossAxisAlignment: 495 crossAxisAlignment:
620 CrossAxisAlignment.start, 496 CrossAxisAlignment.start,
621 children: [ 497 children: [
622 - Text(  
623 - '有金额订单数 25',  
624 - style: TextStyle( 498 + Row(
  499 + crossAxisAlignment:
  500 + CrossAxisAlignment.start,
  501 + children: [
  502 + Text(
  503 + '预订',
  504 + style: TextStyle(
  505 + fontWeight:
  506 + FontWeight.bold,
  507 + color: MyColours
  508 + .color_515151,
  509 + fontSize: font(
  510 + (12),
  511 + )),
  512 + ),
  513 + HEmptyView(10),
  514 + Text(
  515 + '1089单',
  516 + style: TextStyle(
  517 + color: MyColours
  518 + .color_515151,
  519 + fontSize: font(
  520 + (10),
  521 + )),
  522 + ),
  523 + HEmptyView(10),
  524 + MyDivider(
  525 + w(1),
  526 + w(15),
625 color: 527 color:
626 - MyColours.color_999999,  
627 - fontSize: font(  
628 - (10),  
629 - )),  
630 - ),  
631 - HEmptyView(10),  
632 - MyDivider(  
633 - w(1),  
634 - w(15),  
635 - color: MyColours.color_DBDBDB, 528 + MyColours.color_DBDBDB,
  529 + ),
  530 + HEmptyView(10),
  531 + Text(
  532 + '1190桌',
  533 + style: TextStyle(
  534 + color: MyColours
  535 + .color_515151,
  536 + fontSize: font(
  537 + (10),
  538 + )),
  539 + ),
  540 + ],
636 ), 541 ),
637 - HEmptyView(10),  
638 - Text(  
639 - '总消费 25800元',  
640 - style: TextStyle( 542 + VEmptyView(10),
  543 + Wrap(
  544 + runSpacing: w(5),
  545 + children: [
  546 + Text(
  547 + '到店',
  548 + style: TextStyle(
  549 + fontWeight:
  550 + FontWeight.bold,
  551 + color: MyColours
  552 + .color_515151,
  553 + fontSize: font(
  554 + (12),
  555 + )),
  556 + ),
  557 + HEmptyView(10),
  558 + Text(
  559 + '1089单',
  560 + style: TextStyle(
  561 + color: MyColours
  562 + .color_515151,
  563 + fontSize: font(
  564 + (10),
  565 + )),
  566 + ),
  567 + HEmptyView(10),
  568 + MyDivider(
  569 + w(1),
  570 + w(15),
641 color: 571 color:
642 - MyColours.color_999999,  
643 - fontSize: font(  
644 - (10),  
645 - )),  
646 - ),  
647 - ],  
648 - ),  
649 - VEmptyView(10),  
650 - Row(  
651 - crossAxisAlignment:  
652 - CrossAxisAlignment.start,  
653 - children: [  
654 - Text(  
655 - '人均 103.2元',  
656 - style: TextStyle( 572 + MyColours.color_DBDBDB,
  573 + ),
  574 + HEmptyView(10),
  575 + Text(
  576 + '1190桌',
  577 + style: TextStyle(
  578 + color: MyColours
  579 + .color_515151,
  580 + fontSize: font(
  581 + (10),
  582 + )),
  583 + ),
  584 + HEmptyView(10),
  585 + Text(
  586 + '1089人',
  587 + style: TextStyle(
  588 + color: MyColours
  589 + .color_515151,
  590 + fontSize: font(
  591 + (10),
  592 + )),
  593 + ),
  594 + HEmptyView(10),
  595 + MyDivider(
  596 + w(1),
  597 + w(15),
657 color: 598 color:
658 - MyColours.color_999999,  
659 - fontSize: font(  
660 - (10),  
661 - )),  
662 - ),  
663 - HEmptyView(10),  
664 - MyDivider(  
665 - w(1),  
666 - w(15),  
667 - color: MyColours.color_DBDBDB,  
668 - ),  
669 - HEmptyView(10),  
670 - Text(  
671 - '桌均 860元',  
672 - style: TextStyle( 599 + MyColours.color_DBDBDB,
  600 + ),
  601 + HEmptyView(10),
  602 + Text(
  603 + '1190取消',
  604 + style: TextStyle(
  605 + color: MyColours
  606 + .color_515151,
  607 + fontSize: font(
  608 + (10),
  609 + )),
  610 + ),
  611 + HEmptyView(10),
  612 + MyDivider(
  613 + w(1),
  614 + w(15),
673 color: 615 color:
674 - MyColours.color_999999,  
675 - fontSize: font(  
676 - (10),  
677 - )), 616 + MyColours.color_DBDBDB,
  617 + ),
  618 + HEmptyView(10),
  619 + Text(
  620 + '到客90.1%',
  621 + style: TextStyle(
  622 + color: MyColours
  623 + .color_515151,
  624 + fontSize: font(
  625 + (10),
  626 + )),
  627 + ),
  628 + ],
678 ), 629 ),
679 - ],  
680 - ),  
681 - VEmptyView(10),  
682 - Row(  
683 - crossAxisAlignment:  
684 - CrossAxisAlignment.start,  
685 - children: [  
686 - Text(  
687 - '存酒 1位',  
688 - style: TextStyle( 630 + VEmptyView(10),
  631 + Row(
  632 + crossAxisAlignment:
  633 + CrossAxisAlignment.start,
  634 + children: [
  635 + Text(
  636 + '有金额订单数 25',
  637 + style: TextStyle(
  638 + color: MyColours
  639 + .color_999999,
  640 + fontSize: font(
  641 + (10),
  642 + )),
  643 + ),
  644 + HEmptyView(10),
  645 + MyDivider(
  646 + w(1),
  647 + w(15),
689 color: 648 color:
690 - MyColours.color_999999,  
691 - fontSize: font(  
692 - (10),  
693 - )),  
694 - ),  
695 - HEmptyView(10),  
696 - MyDivider(  
697 - w(1),  
698 - w(15),  
699 - color: MyColours.color_DBDBDB, 649 + MyColours.color_DBDBDB,
  650 + ),
  651 + HEmptyView(10),
  652 + Text(
  653 + '总消费 25800元',
  654 + style: TextStyle(
  655 + color: MyColours
  656 + .color_999999,
  657 + fontSize: font(
  658 + (10),
  659 + )),
  660 + ),
  661 + ],
700 ), 662 ),
701 - HEmptyView(10),  
702 - Text(  
703 - '提前点餐 9位',  
704 - style: TextStyle( 663 + VEmptyView(10),
  664 + Row(
  665 + crossAxisAlignment:
  666 + CrossAxisAlignment.start,
  667 + children: [
  668 + Text(
  669 + '人均 103.2元',
  670 + style: TextStyle(
  671 + color: MyColours
  672 + .color_999999,
  673 + fontSize: font(
  674 + (10),
  675 + )),
  676 + ),
  677 + HEmptyView(10),
  678 + MyDivider(
  679 + w(1),
  680 + w(15),
705 color: 681 color:
706 - MyColours.color_999999,  
707 - fontSize: font(  
708 - (10),  
709 - )), 682 + MyColours.color_DBDBDB,
  683 + ),
  684 + HEmptyView(10),
  685 + Text(
  686 + '桌均 860元',
  687 + style: TextStyle(
  688 + color: MyColours
  689 + .color_999999,
  690 + fontSize: font(
  691 + (10),
  692 + )),
  693 + ),
  694 + ],
710 ), 695 ),
711 - HEmptyView(10),  
712 - MyDivider(  
713 - w(1),  
714 - w(15),  
715 - color: MyColours.color_DBDBDB,  
716 - ),  
717 - HEmptyView(10),  
718 - Text(  
719 - '安排菜 9位',  
720 - style: TextStyle( 696 + VEmptyView(10),
  697 + Row(
  698 + crossAxisAlignment:
  699 + CrossAxisAlignment.start,
  700 + children: [
  701 + Text(
  702 + '存酒 1位',
  703 + style: TextStyle(
  704 + color: MyColours
  705 + .color_999999,
  706 + fontSize: font(
  707 + (10),
  708 + )),
  709 + ),
  710 + HEmptyView(10),
  711 + MyDivider(
  712 + w(1),
  713 + w(15),
  714 + color:
  715 + MyColours.color_DBDBDB,
  716 + ),
  717 + HEmptyView(10),
  718 + Text(
  719 + '提前点餐 9位',
  720 + style: TextStyle(
  721 + color: MyColours
  722 + .color_999999,
  723 + fontSize: font(
  724 + (10),
  725 + )),
  726 + ),
  727 + HEmptyView(10),
  728 + MyDivider(
  729 + w(1),
  730 + w(15),
721 color: 731 color:
722 - MyColours.color_999999,  
723 - fontSize: font(  
724 - (10),  
725 - )), 732 + MyColours.color_DBDBDB,
  733 + ),
  734 + HEmptyView(10),
  735 + Text(
  736 + '安排菜 9位',
  737 + style: TextStyle(
  738 + color: MyColours
  739 + .color_999999,
  740 + fontSize: font(
  741 + (10),
  742 + )),
  743 + ),
  744 + ],
726 ), 745 ),
727 ], 746 ],
728 - ), 747 + )),
  748 + Image.asset(
  749 + Utils.getImgPath('arrow_right_new'),
  750 + width: w(12),
  751 + )
729 ], 752 ],
730 - )),  
731 - Image.asset(  
732 - Utils.getImgPath('arrow_right_new'),  
733 - width: w(12),  
734 - )  
735 - ],  
736 - ),  
737 - ))  
738 - ],  
739 - ),  
740 - ); 753 + ),
  754 + ))
  755 + ],
  756 + ),
  757 + ));
741 }), 758 }),
742 ], 759 ],
743 )); 760 ));
@@ -1742,4 +1742,12 @@ class NavigatorUtil { @@ -1742,4 +1742,12 @@ class NavigatorUtil {
1742 }) { 1742 }) {
1743 return _navigateTo(context, "${Routes.month_order_page}", replace: replace); 1743 return _navigateTo(context, "${Routes.month_order_page}", replace: replace);
1744 } 1744 }
  1745 +
  1746 + /// 日订单
  1747 + static Future<dynamic> goDayOrderPage(
  1748 + BuildContext context, {
  1749 + replace = false,
  1750 + }) {
  1751 + return _navigateTo(context, "${Routes.day_order_page}", replace: replace);
  1752 + }
1745 } 1753 }
@@ -181,6 +181,7 @@ import '../pages/feast/feast_setmeal_page.dart'; @@ -181,6 +181,7 @@ import '../pages/feast/feast_setmeal_page.dart';
181 import '../pages/feast/feast_wine_page.dart'; 181 import '../pages/feast/feast_wine_page.dart';
182 import '../pages/message/message_recharge_info_page.dart'; 182 import '../pages/message/message_recharge_info_page.dart';
183 import '../pages/my/customer_type/my_customer/my_customer_home_page.dart'; 183 import '../pages/my/customer_type/my_customer/my_customer_home_page.dart';
  184 +import '../pages/my/customer_type/store_customer/day_order_page.dart';
184 import '../pages/my/customer_type/store_customer/month_order_page.dart'; 185 import '../pages/my/customer_type/store_customer/month_order_page.dart';
185 import '../pages/my/customer_type/store_customer/store_customer_home_page.dart'; 186 import '../pages/my/customer_type/store_customer/store_customer_home_page.dart';
186 import '../pages/my/customer_type/store_customer/store_customer_home_left_page.dart'; 187 import '../pages/my/customer_type/store_customer/store_customer_home_left_page.dart';
@@ -2829,3 +2830,19 @@ var monthOrderPageHandle = new Handler( @@ -2829,3 +2830,19 @@ var monthOrderPageHandle = new Handler(
2829 return ChangeNotifierProvider<CustomerProvider>( 2830 return ChangeNotifierProvider<CustomerProvider>(
2830 create: (_) => CustomerProvider(), child: MonthOrderPage()); 2831 create: (_) => CustomerProvider(), child: MonthOrderPage());
2831 }); 2832 });
  2833 +
  2834 +
  2835 +
  2836 +//日订单
  2837 +var dayOrderPageHandle = new Handler(
  2838 + handlerFunc: (BuildContext context, Map<String, List<Object>> params) {
  2839 + // String idStr = params["idStr"].first;
  2840 + // IsExamineSunModel isExamineSunModel = IsExamineSunModel.fromJson(json.decode(
  2841 + // FluroConvertUtils.fluroCnParamsDecode(
  2842 + // params["isExamineSunModel"].first)));
  2843 + // }
  2844 +
  2845 + return ChangeNotifierProvider<CustomerProvider>(
  2846 + create: (_) => CustomerProvider(), child: DayOrderPage());
  2847 +});
  2848 +
@@ -276,6 +276,8 @@ class Routes { @@ -276,6 +276,8 @@ class Routes {
276 276
277 277
278 static String month_order_page = "/month_order_page"; // 月度订单 278 static String month_order_page = "/month_order_page"; // 月度订单
  279 + static String day_order_page = "/day_order_page"; // 日订单
  280 +
279 281
280 282
281 static void configureRoutes(FluroRouter router) { 283 static void configureRoutes(FluroRouter router) {
@@ -516,5 +518,8 @@ class Routes { @@ -516,5 +518,8 @@ class Routes {
516 518
517 519
518 router.define(month_order_page, handler: monthOrderPageHandle); 520 router.define(month_order_page, handler: monthOrderPageHandle);
  521 + router.define(day_order_page, handler: dayOrderPageHandle);
  522 +
  523 +
519 } 524 }
520 } 525 }
@@ -630,6 +630,13 @@ packages: @@ -630,6 +630,13 @@ packages:
630 url: "https://pub.flutter-io.cn" 630 url: "https://pub.flutter-io.cn"
631 source: hosted 631 source: hosted
632 version: "2.1.0" 632 version: "2.1.0"
  633 + grouped_list:
  634 + dependency: "direct main"
  635 + description:
  636 + name: grouped_list
  637 + url: "https://pub.flutter-io.cn"
  638 + source: hosted
  639 + version: "5.1.2"
633 html: 640 html:
634 dependency: transitive 641 dependency: transitive
635 description: 642 description:
@@ -192,6 +192,7 @@ dependencies: @@ -192,6 +192,7 @@ dependencies:
192 barcode_scan2: ^4.2.4 192 barcode_scan2: ^4.2.4
193 # 柱形图 193 # 柱形图
194 fl_chart: ^0.62.0 194 fl_chart: ^0.62.0
  195 +
195 # ai_barcode 3.2.4 196 # ai_barcode 3.2.4
196 # qr_code_scanner: ^1.0.1 197 # qr_code_scanner: ^1.0.1
197 # mobile_scanner: ^3.2.0 198 # mobile_scanner: ^3.2.0