xt / Flutter-ReserveApp · Commits

Go to a project

Commit 24dbf58bc914c69bede22515206db6b515d0ebd8

Authored by gaiyaguang
1 parent f9478704
build: skipped

UI 修改1.0

Inline Side-by-side
Showing 11 changed files with 181 additions and 170 deletions
... ... @@ -120,7 +120,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
child: Row(
mainAxisSize: MainAxisSize.min,
children: detailEntity.demands.map((table){
return TableItem(table);
return TableItem(table,height: 160,);
}).toList(),
),
)
... ... @@ -139,7 +139,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
),
RowMultiText("客户姓名", detailEntity.rnameStr),
RowMultiText("客户电话", detailEntity.phone),
MyDivider(double.infinity, ScreenUtil().setHeight(2)),
MyDivider(double.infinity, ScreenUtil().setHeight(1)),
Container(
color: MyColours.color_ffffff,
width: double.infinity,
... ... @@ -154,7 +154,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
"客户经理",
style: TextStyle(
color: MyColours.color_828282,
fontSize: ScreenUtil().setSp(22)),
fontSize: ScreenUtil().setSp(30)),
),
),
Positioned(
... ... @@ -178,7 +178,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
cusmanText,
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(26),
fontSize: ScreenUtil().setSp(30),
decoration: TextDecoration.underline,
),
),
... ... @@ -210,14 +210,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
width: double.infinity,
decoration: BoxDecoration(
color: MyColours.color_ffffff,
border: Border(top:BorderSide(color: MyColours.color_dbe3e3,width: ScreenUtil().setWidth(2)))
border: Border(top:BorderSide(color: MyColours.color_dbe3e3,width: ScreenUtil().setWidth(1)))
),
padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(20),horizontal: ScreenUtil().setHeight(36)),
child:CommonButton(
content: "通知顾客",
width: 669,
height: 76,
fontSize: 26,
height: 80,
fontSize: 34,
onPress: () {
DialogUtil.showShareDialog(context)?.then((value){
switch(value){
... ...
... ... @@ -142,57 +142,60 @@ class HomePageState extends State<HomePage>{
// TODO: implement build
return new Scaffold(
bottomNavigationBar: BottomNavigationBar(
iconSize: ScreenUtil().setWidth(70),
unselectedFontSize: ScreenUtil().setSp(22),
selectedFontSize: ScreenUtil().setSp(22),
backgroundColor: MyColours.color_ffffff,
items: [
BottomNavigationBarItem(
icon: Image(
image: AssetImage("assets/message_default.png"),
width: ScreenUtil().setWidth(60),
height: ScreenUtil().setWidth(60),
width: ScreenUtil().setWidth(70),
height: ScreenUtil().setWidth(70),
),
activeIcon: Image(
image: AssetImage("assets/message_selected.png"),
width: ScreenUtil().setWidth(60),
height: ScreenUtil().setWidth(60),
width: ScreenUtil().setWidth(70),
height: ScreenUtil().setWidth(70),
),
title: Text(
"消息中心",
style: TextStyle(
color: _currIndex == 0 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(16)),
color: _currIndex == 0 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(22)),
),
),
BottomNavigationBarItem(
icon: Image(
image: AssetImage("assets/notebook_default.png"),
width: ScreenUtil().setWidth(60),
height: ScreenUtil().setWidth(60),
width: ScreenUtil().setWidth(70),
height: ScreenUtil().setWidth(70),
),
activeIcon: Image(
image: AssetImage("assets/notebook_selected.png"),
width: ScreenUtil().setWidth(60),
height: ScreenUtil().setWidth(60),
width: ScreenUtil().setWidth(70),
height: ScreenUtil().setWidth(70),
),
title: Text(
"预定本",
style: TextStyle(
color: _currIndex == 1 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(16)),
color: _currIndex == 1 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(22)),
),
),
BottomNavigationBarItem(
icon: Image(
image: AssetImage("assets/my_default.png"),
width: ScreenUtil().setWidth(60),
height: ScreenUtil().setWidth(60),
width: ScreenUtil().setWidth(70),
height: ScreenUtil().setWidth(70),
),
activeIcon: Image(
image: AssetImage("assets/my_selected.png"),
width: ScreenUtil().setWidth(60),
height: ScreenUtil().setWidth(60),
width: ScreenUtil().setWidth(70),
height: ScreenUtil().setWidth(70),
),
title: Text(
"我的",
style: TextStyle(
color: _currIndex == 2 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(16)),
color: _currIndex == 2 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(22)),
),
),
],
... ...
... ... @@ -133,17 +133,18 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
children: <Widget>[
Image.asset("assets/icon_sellercode.png",width: prefixIconWidth,),
HEmptyView(26),
Text("商户编号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),),
Text("商户编号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),),
Expanded(
child: TextField(
controller: _sellerCodeController,
focusNode: _sellerCodeFocusNode,
autofocus: _sellerCodeController.text.isEmpty,
style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),
decoration: InputDecoration(
hintText: "请输入6位商户编码",
hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(26)),
hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(10))
contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(30))
),
onChanged: (_){
setActivate();
... ... @@ -169,16 +170,17 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
children: <Widget>[
Image.asset("assets/icon_account.png",width: prefixIconWidth,),
HEmptyView(26),
Text("工 号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),),
Text("工 号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),),
Expanded(
child: TextField(
controller: _accountController,
focusNode: _accountFocusNode,
style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),
decoration: InputDecoration(
hintText: "请输入4位工号",
hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(26)),
hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(10))
contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(30))
),
onChanged: (_){
setActivate();
... ... @@ -204,17 +206,18 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
children: <Widget>[
Image.asset("assets/icon_pwd.png",width: prefixIconWidth,),
HEmptyView(26),
Text("密 码",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),),
Text("密 码",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),),
Expanded(
child: TextField(
controller: _pwdController,
focusNode: _pwdFocusNode,
autofocus: _sellerCodeController.text.isNotEmpty&&_accountController.text.isNotEmpty&&_pwdController.text.isEmpty,
style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),
decoration: InputDecoration(
hintText: "请输入密码",
hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(26)),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(10))
hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)),
border: InputBorder.none,
contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(30))
),
onChanged: (_){
setActivate();
... ... @@ -258,7 +261,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
});
},
child: Container(
height: ScreenUtil().setHeight(84),
height: ScreenUtil().setHeight(80),
width: ScreenUtil().setWidth(611),
margin: EdgeInsets.only(top: ScreenUtil().setHeight(56)),
alignment: Alignment.center,
... ... @@ -269,7 +272,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
],
borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))
),
child: Text("登录",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(30)),),
child: Text("登录",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(34)),),
),
);
},
... ...
... ... @@ -27,83 +27,85 @@ class MessageDialogItem extends StatelessWidget {
NavigatorUtil.goNotebookDetailPage(context,message.rid.toString());
}
},
child: Container(
margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(22),vertical: ScreenUtil().setWidth(11)),
padding: EdgeInsets.fromLTRB(
ScreenUtil().setWidth(17),
ScreenUtil().setWidth(45),
ScreenUtil().setWidth(12),
ScreenUtil().setWidth(34)),
decoration: BoxDecoration(
color: MyColours.color_fefefe,
borderRadius:
BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
crossAxisAlignment: CrossAxisAlignment.center,
child: Stack(
children: <Widget>[
Container(
margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(39),vertical: ScreenUtil().setWidth(12)),
padding: EdgeInsets.fromLTRB(
ScreenUtil().setWidth(12),
ScreenUtil().setWidth(45),
ScreenUtil().setWidth(21),
ScreenUtil().setWidth(43)),
decoration: BoxDecoration(
color: MyColours.color_fefefe,
borderRadius:
BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))),
child:Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Text(
"在线预订",
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(28)),
),
Spacer(),
Text(
message.cdateStr,
style: TextStyle(
color: MyColours.color_999999,
fontSize: ScreenUtil().setSp(24)),
),
],
),
VEmptyView(20),
Text(
"在线预订",
"包间需求：${message.room_demand}",
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(28)),
),
Spacer(),
VEmptyView(10),
Text(
message.cdateStr,
"就餐时间：${message.ddateStr}",
style: TextStyle(
color: MyColours.color_999999,
fontSize: ScreenUtil().setSp(22)),
color: textColor,
fontSize: ScreenUtil().setSp(28)),
),
],
),
VEmptyView(20),
Text(
"包间需求：${message.room_demand}",
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(26)),
),
VEmptyView(10),
Text(
"就餐时间：${message.ddateStr}",
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(26)),
),
VEmptyView(10),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
VEmptyView(10),
Text(
"预订人：${message.rnameStr}",
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(28)),
),
Spacer(),
Offstage(
offstage: isTreated?true:false,
child: CommonButton(
width: 160,
height: 48,
fontSize: 26,
content: "立即处理",
state: 1,
onPress: () {
messageDialogModel.removeMessage(message.id);
NavigatorUtil.goHandleOnlinePage(context,message.rid.toString(),message.id,replace: messageDialogModel.messages.isEmpty);
},
),
)
],
)
],
),
),
),
),
Positioned(
right: ScreenUtil().setWidth(60),
bottom: ScreenUtil().setWidth(55),
child:Offstage(
offstage: isTreated?true:false,
child: CommonButton(
width: 160,
height: 48,
fontSize: 28,
content: "立即处理",
state: 1,
onPress: () {
messageDialogModel.removeMessage(message.id);
NavigatorUtil.goHandleOnlinePage(context,message.rid.toString(),message.id,replace: messageDialogModel.messages.isEmpty);
},
),
),
)
],
)
);
}
}
... ...
... ... @@ -40,10 +40,10 @@ class MyPageState extends State<MyPage>{
children: <Widget>[
VEmptyView(25),
Image.asset("assets/my_logo.png",width: ScreenUtil().setWidth(228),height: ScreenUtil().setWidth(228),),
VEmptyView(30),
Text(model.user.sellername,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(26)),),
VEmptyView(40),
Text(model.user.sellername,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(32)),),
VEmptyView(12),
Text(model.user.account+" | "+model.user.role_name,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(24)),)
Text(model.user.account+" | "+model.user.role_name,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(30)),)
],
);
},)
... ... @@ -66,9 +66,9 @@ class MyPageState extends State<MyPage>{
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Image.asset("assets/icon_exist.png",width: ScreenUtil().setWidth(25),height: ScreenUtil().setWidth(25),),
Image.asset("assets/icon_exist.png",width: ScreenUtil().setWidth(30),height: ScreenUtil().setWidth(30),),
HEmptyView(18),
Text("退出登录",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(30)))
Text("退出登录",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(34),))
],
),
),
... ...
... ... @@ -42,18 +42,18 @@ class NotebookItemState extends State<NoteBookItem>{
},
child: Container(
width: double.infinity,
height: ScreenUtil().setHeight(112),
height: ScreenUtil().setHeight(110),
color: (widget.index % 2 == 0) ? MyColours.color_f7fdfd : MyColours.color_ffffff,
child: Row(
children: <Widget>[
Container(
width: ScreenUtil().setWidth(144),
width: ScreenUtil().setWidth(171),
alignment: Alignment.center,
child: Text(
notebook.tableinfoStr,
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(28)),
),
),
MyDivider(
... ... @@ -62,13 +62,13 @@ class NotebookItemState extends State<NoteBookItem>{
color: MyColours.color_ededed,
),
Container(
width: ScreenUtil().setWidth(195),
width: ScreenUtil().setWidth(230),
alignment: Alignment.center,
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Text(notebook.rnameStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(26)),),
VEmptyView(18),
Text(notebook.rnameStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(28)),),
VEmptyView(10),
Text(notebook.phoneStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(22)),)
],
),
... ... @@ -79,13 +79,13 @@ class NotebookItemState extends State<NoteBookItem>{
color: MyColours.color_ededed,
),
Container(
width: ScreenUtil().setWidth(195),
width: ScreenUtil().setWidth(159),
alignment: Alignment.center,
child: Text(
notebook.ddateStr,
style: TextStyle(
color: textColor,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(28)),
),
),
MyDivider(
... ... @@ -96,13 +96,13 @@ class NotebookItemState extends State<NoteBookItem>{
GestureDetector(
onTap: _onOperateClick,
child: Container(
width: ScreenUtil().setWidth(209),
width: ScreenUtil().setWidth(184),
alignment: Alignment.center,
child: Text(
notebook.operationText,
style: TextStyle(
color: (notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_2bb5b7,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(28)),
),
),
),
... ...
... ... @@ -172,13 +172,13 @@ class NoteBookPageState extends State<NoteBookPage> {
child: Row(
children: <Widget>[
Container(
width: ScreenUtil().setWidth(144),
width: ScreenUtil().setWidth(171),
alignment: Alignment.center,
child: Text(
"桌号",
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(22)),
fontSize: ScreenUtil().setSp(30)),
),
),
MyDivider(
... ... @@ -187,13 +187,13 @@ class NoteBookPageState extends State<NoteBookPage> {
color: MyColours.color_ededed,
),
Container(
width: ScreenUtil().setWidth(195),
width: ScreenUtil().setWidth(230),
alignment: Alignment.center,
child: Text(
"用户姓名",
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(22)),
fontSize: ScreenUtil().setSp(30)),
),
),
MyDivider(
... ... @@ -202,13 +202,13 @@ class NoteBookPageState extends State<NoteBookPage> {
color: MyColours.color_ededed,
),
Container(
width: ScreenUtil().setWidth(195),
width: ScreenUtil().setWidth(159),
alignment: Alignment.center,
child: Text(
"时间",
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(22)),
fontSize: ScreenUtil().setSp(30)),
),
),
MyDivider(
... ... @@ -217,13 +217,13 @@ class NoteBookPageState extends State<NoteBookPage> {
color: MyColours.color_ededed,
),
Container(
width: ScreenUtil().setWidth(209),
width: ScreenUtil().setWidth(184),
alignment: Alignment.center,
child: Text(
"操作",
style: TextStyle(
color: MyColours.color_2bb5b7,
fontSize: ScreenUtil().setSp(22)),
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(30)),
),
),
],
... ... @@ -285,7 +285,7 @@ class NoteBookPageState extends State<NoteBookPage> {
dateText,
style: TextStyle(
color: MyColours.color_2bb5b7,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(32)),
),
),
),
... ... @@ -312,13 +312,13 @@ class NoteBookPageState extends State<NoteBookPage> {
},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(7)),
horizontal: ScreenUtil().setWidth(10)),
child: CommonButton(
content: "早市",
state: currTimeIndex == 1 ? 1 : 0,
width: ScreenUtil().setWidth(85),
height: ScreenUtil().setHeight(47),
fontSize: ScreenUtil().setSp(26),
width: ScreenUtil().setWidth(180),
height: ScreenUtil().setHeight(75),
fontSize: 32,
)),
),
),
... ... @@ -334,13 +334,13 @@ class NoteBookPageState extends State<NoteBookPage> {
},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(7)),
horizontal: ScreenUtil().setWidth(10)),
child: CommonButton(
content: "午市",
state: currTimeIndex == 2 ? 1 : 0,
width: ScreenUtil().setWidth(85),
height: ScreenUtil().setHeight(47),
fontSize: ScreenUtil().setSp(26),
width: ScreenUtil().setWidth(180),
height: ScreenUtil().setHeight(75),
fontSize: 32,
)),
)),
Offstage(
... ... @@ -355,13 +355,13 @@ class NoteBookPageState extends State<NoteBookPage> {
},
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: ScreenUtil().setWidth(7)),
horizontal: ScreenUtil().setWidth(10)),
child: CommonButton(
content: "晚市",
state: currTimeIndex == 3 ? 1 : 0,
width: ScreenUtil().setWidth(85),
height: ScreenUtil().setHeight(47),
fontSize: ScreenUtil().setSp(26),
width: ScreenUtil().setWidth(180),
height: ScreenUtil().setHeight(75),
fontSize: 32,
)),
)),
],
... ... @@ -383,7 +383,7 @@ class NoteBookPageState extends State<NoteBookPage> {
total,
style: TextStyle(
color: MyColours.color_131313,
fontSize: ScreenUtil().setSp(18)),
fontSize: ScreenUtil().setSp(24)),
),
);
},
... ...
... ... @@ -41,7 +41,7 @@ class DialogUtil {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Container(
height: ScreenUtil().setHeight(53),
margin: EdgeInsets.only(top: ScreenUtil().setWidth(21),bottom: ScreenUtil().setWidth(12)),
width: double.infinity,
child: Stack(
alignment: Alignment.center,
... ... @@ -50,10 +50,10 @@ class DialogUtil {
"您有一条新的消息",
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(32)),
),
Positioned(
right: ScreenUtil().setWidth(8),
right: ScreenUtil().setWidth(23),
child: GestureDetector(
onTap: () {
Navigator.of(dialogContext).pop();
... ... @@ -92,7 +92,7 @@ class DialogUtil {
"在线预订",
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(32)),
),
Spacer(),
Text(
... ... @@ -108,7 +108,7 @@ class DialogUtil {
"在线预订：${model.messages.length}个",
style: TextStyle(
color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(32)),
),
Row(
crossAxisAlignment: CrossAxisAlignment.center,
... ... @@ -117,7 +117,7 @@ class DialogUtil {
CommonButton(
width: 160,
height: 48,
fontSize: 26,
fontSize: 32,
content: "立即处理",
state: 1,
onPress: () {
... ... @@ -185,7 +185,7 @@ class DialogUtil {
},
titleTextStyle: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(32)),
leftChevronIcon:
const Icon(Icons.chevron_left, color: Colors.white),
rightChevronIcon:
... ... @@ -195,10 +195,10 @@ class DialogUtil {
contentPadding: const EdgeInsets.only(bottom: 4.0),
weekdayStyle: TextStyle(
color: MyColours.color_2bb5b7,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(32)),
weekendStyle: TextStyle(
color: MyColours.color_f49a5e,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(32)),
selectedColor: MyColours.color_2bb5b7,
outsideDaysVisible: false,
),
... ... @@ -213,7 +213,7 @@ class DialogUtil {
weekday,
style: TextStyle(
color: MyColours.color_97e9ea,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(32)),
),
);
},
... ... @@ -232,7 +232,7 @@ class DialogUtil {
.now()
.day ? '今' : date.day.toString(),
style: TextStyle().copyWith(
fontSize: ScreenUtil().setSp(26),
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_ffffff),
),
);
... ... @@ -250,7 +250,7 @@ class DialogUtil {
child: Text(
'今',
style: TextStyle().copyWith(
fontSize: ScreenUtil().setSp(26),
fontSize: ScreenUtil().setSp(32),
color: MyColours.color_2bb5b7),
),
);
... ... @@ -274,7 +274,7 @@ class DialogUtil {
),
Positioned(
right: ScreenUtil().setWidth(62),
bottom: ScreenUtil().setHeight(7),
bottom: ScreenUtil().setHeight(20),
child: Container(
child: GestureDetector(
onTap: () {
... ... @@ -284,15 +284,15 @@ class DialogUtil {
child: Container(
child: ClipOval(
child: Container(
width: ScreenUtil().setWidth(95),
height: ScreenUtil().setWidth(95),
width: ScreenUtil().setWidth(100),
height: ScreenUtil().setWidth(100),
alignment: Alignment.center,
color: MyColours.color_2bb5b7,
child: Text(
"回到\n今天",
"今天",
style: TextStyle(
color: MyColours.color_ffffff,
fontSize: ScreenUtil().setSp(26)),
fontSize: ScreenUtil().setSp(32)),
),
)),
),
... ... @@ -316,7 +316,7 @@ class DialogUtil {
Widget widget = Container(
width: double.infinity,
height: ScreenUtil().setHeight(233),
color: MyColours.color_dfdfdf,
color: MyColours.color_f1f1f1,
child: Row(
children: <Widget>[
Expanded(
... ... @@ -329,11 +329,10 @@ class DialogUtil {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Image.asset(
"assets/icon_wechat.png", width: ScreenUtil().setWidth(126),
height: ScreenUtil().setWidth(126),),
VEmptyView(18),
"assets/icon_wechat.png", width: ScreenUtil().setWidth(140),
height: ScreenUtil().setWidth(140),),
Text("微信", style: TextStyle(color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(26)),)
fontSize: ScreenUtil().setSp(32)),)
],
),
),
... ... @@ -348,11 +347,10 @@ class DialogUtil {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Image.asset(
"assets/icon_sms.png", width: ScreenUtil().setWidth(126),
height: ScreenUtil().setWidth(126),),
VEmptyView(18),
"assets/icon_sms.png", width: ScreenUtil().setWidth(140),
height: ScreenUtil().setWidth(140),),
Text("短信", style: TextStyle(color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(26)),)
fontSize: ScreenUtil().setSp(32)),)
],
),
),
... ... @@ -367,11 +365,10 @@ class DialogUtil {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
Image.asset(
"assets/icon_phone.png", width: ScreenUtil().setWidth(126),
height: ScreenUtil().setWidth(126),),
VEmptyView(18),
"assets/icon_phone.png", width: ScreenUtil().setWidth(140),
height: ScreenUtil().setWidth(140),),
Text("电话", style: TextStyle(color: MyColours.color_353535,
fontSize: ScreenUtil().setSp(26)),)
fontSize: ScreenUtil().setSp(32)),)
],
),
),
... ...
... ... @@ -43,7 +43,10 @@ class MyAppBar extends StatelessWidget {
title,
style: TextStyle(
color: fontColor,
fontSize: ScreenUtil().setSp(28)),
fontSize: ScreenUtil().setSp(34),
fontWeight: FontWeight.normal,
decoration: TextDecoration.none
),
),
)
],
... ...
... ... @@ -22,11 +22,11 @@ class RowMultiText extends StatelessWidget{
children: <Widget>[
Positioned(
left: 0,
child: Text(title,style: TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(22)),),
child: Text(title,style: TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(30)),),
),
Positioned(
right: 0,
child: Text(content,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),),
child: Text(content,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(30)),),
)
],
),
... ...
... ... @@ -10,8 +10,10 @@ class TableItem extends StatefulWidget{
final t.Table table;
final bool canSelected;//是否能选中
final ValueChanged onSelected;
final int height;//高度
TableItem(this.table,{this.onSelected,this.canSelected=false});
TableItem(this.table,{this.onSelected,this.canSelected=false,this.height=183});
@override
State<StatefulWidget> createState() {
... ... @@ -39,7 +41,7 @@ class TableItemState extends State<TableItem>{
},
child: Container(
width: ScreenUtil().setWidth(150),
height: ScreenUtil().setHeight(183),
height: ScreenUtil().setWidth(widget.height),
margin:EdgeInsets.all( ScreenUtil().setWidth(9)),
decoration: BoxDecoration(
color: MyColours.color_a8e2e4,
... ... @@ -64,6 +66,7 @@ class TableItemState extends State<TableItem>{
),
Container(
alignment: Alignment.centerLeft,
margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
... ...