xt / Flutter-ReserveApp · Commits

Go to a project

Commit 0b203b907a7032f18ab69bda1a1f759aa0ea16b5

Authored by wdn127929
1 parent 1a5ee6b7
build: skipped

日订单UI

Inline Side-by-side
Showing 3 changed files with 95 additions and 87 deletions
... ... @@ -8,7 +8,8 @@ import 'package:one_key/widgets/v_empty_view.dart';
import '../../../../utils/screen_util.dart';
class DayOrderLeftPage extends StatefulWidget {
const DayOrderLeftPage({Key key}) : super(key: key);
final int index;
const DayOrderLeftPage({Key key, this.index}) : super(key: key);
@override
_DayOrderLeftPageState createState() => _DayOrderLeftPageState();
... ... @@ -51,9 +52,10 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
Widget _item(String city) {
return ExpansionTile(
// tilePadding: EdgeInsets.zero,
tilePadding: EdgeInsets.symmetric(horizontal: w(10)),
// childrenPadding: EdgeInsets.only(bottom: w(10)),
// childrenPadding: EdgeInsets.zero,
title: Text(
city,
style: TextStyle(color: MyColours.color_515151, fontSize: font(16)),
... ... @@ -65,12 +67,12 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
width: w(12),
),
iconColor: Colors.red,
textColor: Colors.red,
backgroundColor: MyColours.color_ffffff,
collapsedBackgroundColor: MyColours.color_ffffff,
collapsedIconColor: Colors.red,
collapsedTextColor: Colors.red,
collapsedIconColor: MyColours.color_ffffff,
collapsedTextColor: MyColours.color_ffffff,
iconColor: MyColours.color_ffffff,
textColor: MyColours.color_ffffff,
onExpansionChanged: (value) {
print(value);
... ... @@ -92,7 +94,8 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
decoration: BoxDecoration(
color: MyColours.color_f3f3f3,
),
padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
padding:
EdgeInsets.only(top: w(5), bottom: w(5), left: w(10), right: w(10)),
child: Container(
// constraints: BoxConstraints(minHeight: w(10)),
// padding: EdgeInsets.only(top: w(10), left: w(10), right: w(10)),
... ... @@ -177,76 +180,88 @@ class _DayOrderLeftPageState extends State<DayOrderLeftPage> {
],
)),
VEmptyView(10),
Padding(
padding: EdgeInsets.symmetric(horizontal: w(10)),
child: Wrap(
runSpacing: w(6),
children: [
Text(
widget.index == 1
? Padding(
padding:
EdgeInsets.symmetric(horizontal: w(10)),
child: Text(
'6人',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'消费 25800.99元',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'人均 103.2元',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'存酒',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'提前点餐',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
],
)),
))
: Padding(
padding:
EdgeInsets.symmetric(horizontal: w(10)),
child: Wrap(
runSpacing: w(6),
children: [
Text(
'6人',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'消费 25800.99元',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'人均 103.2元',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'存酒',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
HEmptyView(10),
MyDivider(
w(1),
w(15),
color: MyColours.color_DBDBDB,
),
HEmptyView(10),
Text(
'提前点餐',
style: TextStyle(
color: MyColours.color_999999,
fontSize: font(10),
),
),
],
)),
VEmptyView(10),
Padding(
padding: EdgeInsets.symmetric(horizontal: w(10)),
... ...
... ... @@ -9,7 +9,6 @@ import '../../../../utils/screen_util.dart';
import '../../../../widgets/MyDivider.dart';
import '../../../../widgets/h_empty_view.dart';
/**
*
* 日订单
... ... @@ -306,6 +305,7 @@ class _DayOrderPageState extends State<DayOrderPage>
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: MyColours.color_f3f3f3,
appBar: SystemAppBar('日订单'),
body: Column(
children: [
... ... @@ -362,13 +362,13 @@ class _DayOrderPageState extends State<DayOrderPage>
// right: ScreenUtil().setWidth(32)),
// indicatorWeight: ScreenUtil().setWidth(6.0),
)),
VEmptyView(10),
// VEmptyView(10),
Expanded(
child:
TabBarView(controller: tabController, children: [
DayOrderLeftPage(),
DayOrderLeftPage(),
child: TabBarView(controller: tabController, children: [
DayOrderLeftPage(index: 0),
DayOrderLeftPage(
index: 1,
),
]),
),
],
... ...
... ... @@ -630,13 +630,6 @@ packages:
url: "https://pub.flutter-io.cn"
source: hosted
version: "2.1.0"
grouped_list:
dependency: "direct main"
description:
name: grouped_list
url: "https://pub.flutter-io.cn"
source: hosted
version: "5.1.2"
html:
dependency: transitive
description:
... ...