xt / Flutter-ReserveApp · Commits

Go to a project

Commit db957ceb954bd892279c49af7393adf247aa65f6

Authored by wdn127929
1 parent eddf4bf6
build: skipped

核餐&预订订金打包

Inline Side-by-side
Showing 5 changed files with 279 additions and 310 deletions
... ... @@ -676,6 +676,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
width: double.infinity,
height: ScreenUtil()
.setWidth(102),
alignment: Alignment.center,
decoration: BoxDecoration(
border: Border(
bottom: (index !=
... ... @@ -695,85 +696,65 @@ class _EditReserverPageState extends State<EditReserverPage> {
2))
: BorderSide
.none)),
child: Wrap(
// mainAxisAlignment:
// MainAxisAlignment
// .spaceBetween,
runAlignment: WrapAlignment.center,
children: [
Text(
_nameNode.hasFocus
? (detailModel
child: Align(
alignment:
Alignment.centerLeft,
child: Text(
(_nameNode.hasFocus
? (detailModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: detailModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: detailModel
.userHistorys[
index]
.rnameStr)
: (detailModel
.rnameStr)
: (detailModel
.userHistorys[
index]
.phone ==
null
? ''
: detailModel
.userHistorys[
index]
.phone ==
null
? ''
: detailModel
.userHistorys[
index]
.phone),
style: TextStyle(
color: MyColours
.color_333333,
fontSize:
ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Text(
_nameNode.hasFocus
? (detailModel
.phone)) +
' ' +
(_nameNode.hasFocus
? (detailModel
.userHistorys[
index]
.phone ==
null
? ''
: detailModel
.userHistorys[
index]
.phone ==
null
? ''
: detailModel
.userHistorys[
index]
.phone)
: (detailModel
.phone)
: (detailModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: detailModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: detailModel
.userHistorys[
index]
.rnameStr),
style: TextStyle(
color: MyColours
.color_333333,
fontSize:
ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Text(
detailModel
.userHistorys[index]
.nickName,
.rnameStr)) +
' ' +
detailModel
.userHistorys[
index]
.nickName,
style: TextStyle(
color: MyColours
.color_333333,
fontSize:
ScreenUtil()
.setSp(32)),
),
],
),
)),
),
);
},
... ...
... ... @@ -1948,78 +1948,86 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
});
},
child: Container(
width: double.infinity,
height:
ScreenUtil().setWidth(102),
decoration: BoxDecoration(
border: Border(
bottom: (index !=
(_notebookDetailChangeModel
.userHistorys
.length -
1) &&
_notebookDetailChangeModel
.userHistorys
.length >
1)
? BorderSide(
color: MyColours
.color_e5e5e5,
width:
ScreenUtil()
.setWidth(
2))
: BorderSide.none)),
child: Wrap(
// mainAxisAlignment:
// MainAxisAlignment
// .spaceBetween,
runAlignment:
WrapAlignment.center,
children: [
Text(
_nameNode.hasFocus
? _notebookDetailChangeModel
.userHistorys[index]
.rnameStr
: _notebookDetailChangeModel
.userHistorys[index]
.phone,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Text(
_nameNode.hasFocus
? _notebookDetailChangeModel
.userHistorys[index]
.phone
: _notebookDetailChangeModel
.userHistorys[index]
.rnameStr,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Text(
_notebookDetailChangeModel
.userHistorys[index]
.nickName,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
],
),
),
width: double.infinity,
height:
ScreenUtil().setWidth(102),
decoration: BoxDecoration(
border: Border(
bottom: (index !=
(_notebookDetailChangeModel
.userHistorys
.length -
1) &&
_notebookDetailChangeModel
.userHistorys
.length >
1)
? BorderSide(
color: MyColours
.color_e5e5e5,
width:
ScreenUtil()
.setWidth(
2))
: BorderSide.none)),
child: Align(
alignment:
Alignment.centerLeft,
child: Text(
(_nameNode.hasFocus
? (_notebookDetailChangeModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: _notebookDetailChangeModel
.userHistorys[
index]
.rnameStr)
: (_notebookDetailChangeModel
.userHistorys[
index]
.phone ==
null
? ''
: _notebookDetailChangeModel
.userHistorys[
index]
.phone)) +
' ' +
(_nameNode.hasFocus
? (_notebookDetailChangeModel
.userHistorys[
index]
.phone ==
null
? ''
: _notebookDetailChangeModel
.userHistorys[
index]
.phone)
: (_notebookDetailChangeModel
.userHistorys[
index]
.rnameStr ==
null
? ''
: _notebookDetailChangeModel
.userHistorys[
index]
.rnameStr)) +
' ' +
_notebookDetailChangeModel
.userHistorys[
index]
.nickName,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
))),
);
},
itemExtent: ScreenUtil().setWidth(104),
... ...
... ... @@ -1573,8 +1573,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
///订单操作UI
Widget _operatingRecord() {
return Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
VEmptyView(30),
MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
// VEmptyView(30),
// MyDivider(double.infinity, w(0.5), color: MyColours.color_BFC4D4),
VEmptyView(56),
Text(
'订单操作',
... ... @@ -3391,9 +3391,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
// }
},
child: Container(
margin: EdgeInsets.only(
right: ScreenUtil()
.setWidth(20)),
// margin: EdgeInsets.only(
// right: detailEntity
// .order
// .cookbooklist
// .length ==
// 0
// ? EdgeInsets.zero
// : ScreenUtil()
// .setWidth(20)),
decoration: BoxDecoration(
color: MyColours
.color_ffffff,
... ... @@ -3475,11 +3481,10 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
// ),
// ),
// )),
detailEntity.order.cookbooklist
.length ==
0
? SizedBox()
: Expanded(
if( detailEntity.order.cookbooklist
.length >
0)
Expanded(
flex: 1,
child: InkWell(
onTap: () {
... ...
... ... @@ -2514,75 +2514,65 @@ class InvicationPageState extends State<InvicationPage>
width: ScreenUtil()
.setWidth(2))
: BorderSide.none)),
child: Wrap(
runAlignment: WrapAlignment.center,
children: [
Text(
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.rnameStr)
: (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.phone),
style: TextStyle(
color:
MyColours.color_333333,
fontSize:
ScreenUtil().setSp(32)),
),
HEmptyView(20),
Text(
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.phone)
: (_baseIndoProvider
.userHistorys[
index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[index]
.rnameStr),
style: TextStyle(
color:
MyColours.color_333333,
fontSize:
ScreenUtil().setSp(32)),
),
HEmptyView(20),
Text(
_baseIndoProvider
.userHistorys[index]
.nickName,
style: TextStyle(
color:
MyColours.color_333333,
fontSize:
ScreenUtil().setSp(32)),
),
],
),
child: Align(
alignment:
Alignment.centerLeft,
child: Text(
(_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.rnameStr ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.rnameStr)
: (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.phone)) +
' ' +
(_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.phone)
: (_baseIndoProvider
.userHistorys[
index]
.rnameStr ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.rnameStr)) +
' ' +
_baseIndoProvider
.userHistorys[
index]
.nickName,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
))
),
);
},
... ...
... ... @@ -1315,100 +1315,85 @@ class TableManagerPageState extends State<TableManagerPage> {
});
},
child: Container(
width: double.infinity,
height: ScreenUtil().setWidth(102),
decoration: BoxDecoration(
border: Border(
bottom: (index !=
(_baseIndoProvider
.userHistorys
.length -
1) &&
_baseIndoProvider
.userHistorys
.length >
1)
? BorderSide(
color: MyColours
.color_e5e5e5,
width: ScreenUtil()
.setWidth(2))
: BorderSide.none)),
child: Wrap(
runAlignment:
WrapAlignment.center,
children: [
Text(
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.rnameStr)
: (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.phone),
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Text(
_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.phone)
: (_baseIndoProvider
.userHistorys[
index]
.rname ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.rnameStr),
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
HEmptyView(20),
Text(
_baseIndoProvider
.userHistorys[index]
.nickName,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
),
],
),
),
width: double.infinity,
height:
ScreenUtil().setWidth(102),
decoration: BoxDecoration(
border: Border(
bottom: (index !=
(_baseIndoProvider
.userHistorys
.length -
1) &&
_baseIndoProvider
.userHistorys
.length >
1)
? BorderSide(
color: MyColours
.color_e5e5e5,
width:
ScreenUtil()
.setWidth(
2))
: BorderSide.none)),
child: Align(
alignment:
Alignment.centerLeft,
child: Text(
(_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.rnameStr ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.rnameStr)
: (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.phone)) +
' ' +
(_nameNode.hasFocus
? (_baseIndoProvider
.userHistorys[
index]
.phone ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.phone)
: (_baseIndoProvider
.userHistorys[
index]
.rnameStr ==
null
? ''
: _baseIndoProvider
.userHistorys[
index]
.rnameStr)) +
' ' +
_baseIndoProvider
.userHistorys[index]
.nickName,
style: TextStyle(
color: MyColours
.color_333333,
fontSize: ScreenUtil()
.setSp(32)),
))),
);
},
itemExtent: ScreenUtil().setWidth(104),
... ...