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> { @@ -120,7 +120,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
120 child: Row( 120 child: Row(
121 mainAxisSize: MainAxisSize.min, 121 mainAxisSize: MainAxisSize.min,
122 children: detailEntity.demands.map((table){ 122 children: detailEntity.demands.map((table){
123 - return TableItem(table); 123 + return TableItem(table,height: 160,);
124 }).toList(), 124 }).toList(),
125 ), 125 ),
126 ) 126 )
@@ -139,7 +139,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -139,7 +139,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
139 ), 139 ),
140 RowMultiText("客户姓名", detailEntity.rnameStr), 140 RowMultiText("客户姓名", detailEntity.rnameStr),
141 RowMultiText("客户电话", detailEntity.phone), 141 RowMultiText("客户电话", detailEntity.phone),
142 - MyDivider(double.infinity, ScreenUtil().setHeight(2)), 142 + MyDivider(double.infinity, ScreenUtil().setHeight(1)),
143 Container( 143 Container(
144 color: MyColours.color_ffffff, 144 color: MyColours.color_ffffff,
145 width: double.infinity, 145 width: double.infinity,
@@ -154,7 +154,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -154,7 +154,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
154 "客户经理", 154 "客户经理",
155 style: TextStyle( 155 style: TextStyle(
156 color: MyColours.color_828282, 156 color: MyColours.color_828282,
157 - fontSize: ScreenUtil().setSp(22)), 157 + fontSize: ScreenUtil().setSp(30)),
158 ), 158 ),
159 ), 159 ),
160 Positioned( 160 Positioned(
@@ -178,7 +178,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -178,7 +178,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
178 cusmanText, 178 cusmanText,
179 style: TextStyle( 179 style: TextStyle(
180 color: MyColours.color_353535, 180 color: MyColours.color_353535,
181 - fontSize: ScreenUtil().setSp(26), 181 + fontSize: ScreenUtil().setSp(30),
182 decoration: TextDecoration.underline, 182 decoration: TextDecoration.underline,
183 ), 183 ),
184 ), 184 ),
@@ -210,14 +210,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -210,14 +210,14 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
210 width: double.infinity, 210 width: double.infinity,
211 decoration: BoxDecoration( 211 decoration: BoxDecoration(
212 color: MyColours.color_ffffff, 212 color: MyColours.color_ffffff,
213 - border: Border(top:BorderSide(color: MyColours.color_dbe3e3,width: ScreenUtil().setWidth(2))) 213 + border: Border(top:BorderSide(color: MyColours.color_dbe3e3,width: ScreenUtil().setWidth(1)))
214 ), 214 ),
215 padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(20),horizontal: ScreenUtil().setHeight(36)), 215 padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(20),horizontal: ScreenUtil().setHeight(36)),
216 child:CommonButton( 216 child:CommonButton(
217 content: "通知顾客", 217 content: "通知顾客",
218 width: 669, 218 width: 669,
219 - height: 76,  
220 - fontSize: 26, 219 + height: 80,
  220 + fontSize: 34,
221 onPress: () { 221 onPress: () {
222 DialogUtil.showShareDialog(context)?.then((value){ 222 DialogUtil.showShareDialog(context)?.then((value){
223 switch(value){ 223 switch(value){
@@ -142,57 +142,60 @@ class HomePageState extends State<HomePage>{ @@ -142,57 +142,60 @@ class HomePageState extends State<HomePage>{
142 // TODO: implement build 142 // TODO: implement build
143 return new Scaffold( 143 return new Scaffold(
144 bottomNavigationBar: BottomNavigationBar( 144 bottomNavigationBar: BottomNavigationBar(
  145 + iconSize: ScreenUtil().setWidth(70),
  146 + unselectedFontSize: ScreenUtil().setSp(22),
  147 + selectedFontSize: ScreenUtil().setSp(22),
145 backgroundColor: MyColours.color_ffffff, 148 backgroundColor: MyColours.color_ffffff,
146 items: [ 149 items: [
147 BottomNavigationBarItem( 150 BottomNavigationBarItem(
148 icon: Image( 151 icon: Image(
149 image: AssetImage("assets/message_default.png"), 152 image: AssetImage("assets/message_default.png"),
150 - width: ScreenUtil().setWidth(60),  
151 - height: ScreenUtil().setWidth(60), 153 + width: ScreenUtil().setWidth(70),
  154 + height: ScreenUtil().setWidth(70),
152 ), 155 ),
153 activeIcon: Image( 156 activeIcon: Image(
154 image: AssetImage("assets/message_selected.png"), 157 image: AssetImage("assets/message_selected.png"),
155 - width: ScreenUtil().setWidth(60),  
156 - height: ScreenUtil().setWidth(60), 158 + width: ScreenUtil().setWidth(70),
  159 + height: ScreenUtil().setWidth(70),
157 ), 160 ),
158 title: Text( 161 title: Text(
159 "消息中心", 162 "消息中心",
160 style: TextStyle( 163 style: TextStyle(
161 - color: _currIndex == 0 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(16)), 164 + color: _currIndex == 0 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(22)),
162 ), 165 ),
163 ), 166 ),
164 BottomNavigationBarItem( 167 BottomNavigationBarItem(
165 icon: Image( 168 icon: Image(
166 image: AssetImage("assets/notebook_default.png"), 169 image: AssetImage("assets/notebook_default.png"),
167 - width: ScreenUtil().setWidth(60),  
168 - height: ScreenUtil().setWidth(60), 170 + width: ScreenUtil().setWidth(70),
  171 + height: ScreenUtil().setWidth(70),
169 ), 172 ),
170 activeIcon: Image( 173 activeIcon: Image(
171 image: AssetImage("assets/notebook_selected.png"), 174 image: AssetImage("assets/notebook_selected.png"),
172 - width: ScreenUtil().setWidth(60),  
173 - height: ScreenUtil().setWidth(60), 175 + width: ScreenUtil().setWidth(70),
  176 + height: ScreenUtil().setWidth(70),
174 ), 177 ),
175 title: Text( 178 title: Text(
176 "预定本", 179 "预定本",
177 style: TextStyle( 180 style: TextStyle(
178 - color: _currIndex == 1 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(16)), 181 + color: _currIndex == 1 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(22)),
179 ), 182 ),
180 ), 183 ),
181 BottomNavigationBarItem( 184 BottomNavigationBarItem(
182 icon: Image( 185 icon: Image(
183 image: AssetImage("assets/my_default.png"), 186 image: AssetImage("assets/my_default.png"),
184 - width: ScreenUtil().setWidth(60),  
185 - height: ScreenUtil().setWidth(60), 187 + width: ScreenUtil().setWidth(70),
  188 + height: ScreenUtil().setWidth(70),
186 ), 189 ),
187 activeIcon: Image( 190 activeIcon: Image(
188 image: AssetImage("assets/my_selected.png"), 191 image: AssetImage("assets/my_selected.png"),
189 - width: ScreenUtil().setWidth(60),  
190 - height: ScreenUtil().setWidth(60), 192 + width: ScreenUtil().setWidth(70),
  193 + height: ScreenUtil().setWidth(70),
191 ), 194 ),
192 title: Text( 195 title: Text(
193 "我的", 196 "我的",
194 style: TextStyle( 197 style: TextStyle(
195 - color: _currIndex == 2 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(16)), 198 + color: _currIndex == 2 ? _activeColor : _defaultColor,fontSize: ScreenUtil().setSp(22)),
196 ), 199 ),
197 ), 200 ),
198 ], 201 ],
@@ -133,17 +133,18 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -133,17 +133,18 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
133 children: <Widget>[ 133 children: <Widget>[
134 Image.asset("assets/icon_sellercode.png",width: prefixIconWidth,), 134 Image.asset("assets/icon_sellercode.png",width: prefixIconWidth,),
135 HEmptyView(26), 135 HEmptyView(26),
136 - Text("商户编号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),), 136 + Text("商户编号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),),
137 Expanded( 137 Expanded(
138 child: TextField( 138 child: TextField(
139 controller: _sellerCodeController, 139 controller: _sellerCodeController,
140 focusNode: _sellerCodeFocusNode, 140 focusNode: _sellerCodeFocusNode,
141 autofocus: _sellerCodeController.text.isEmpty, 141 autofocus: _sellerCodeController.text.isEmpty,
  142 + style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),
142 decoration: InputDecoration( 143 decoration: InputDecoration(
143 hintText: "请输入6位商户编码", 144 hintText: "请输入6位商户编码",
144 - hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(26)), 145 + hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)),
145 border: InputBorder.none, 146 border: InputBorder.none,
146 - contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(10)) 147 + contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(30))
147 ), 148 ),
148 onChanged: (_){ 149 onChanged: (_){
149 setActivate(); 150 setActivate();
@@ -169,16 +170,17 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -169,16 +170,17 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
169 children: <Widget>[ 170 children: <Widget>[
170 Image.asset("assets/icon_account.png",width: prefixIconWidth,), 171 Image.asset("assets/icon_account.png",width: prefixIconWidth,),
171 HEmptyView(26), 172 HEmptyView(26),
172 - Text("工 号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),), 173 + Text("工 号",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),),
173 Expanded( 174 Expanded(
174 child: TextField( 175 child: TextField(
175 controller: _accountController, 176 controller: _accountController,
176 focusNode: _accountFocusNode, 177 focusNode: _accountFocusNode,
  178 + style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),
177 decoration: InputDecoration( 179 decoration: InputDecoration(
178 hintText: "请输入4位工号", 180 hintText: "请输入4位工号",
179 - hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(26)), 181 + hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)),
180 border: InputBorder.none, 182 border: InputBorder.none,
181 - contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(10)) 183 + contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(30))
182 ), 184 ),
183 onChanged: (_){ 185 onChanged: (_){
184 setActivate(); 186 setActivate();
@@ -204,17 +206,18 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -204,17 +206,18 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
204 children: <Widget>[ 206 children: <Widget>[
205 Image.asset("assets/icon_pwd.png",width: prefixIconWidth,), 207 Image.asset("assets/icon_pwd.png",width: prefixIconWidth,),
206 HEmptyView(26), 208 HEmptyView(26),
207 - Text("密 码",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),), 209 + Text("密 码",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),),
208 Expanded( 210 Expanded(
209 child: TextField( 211 child: TextField(
210 controller: _pwdController, 212 controller: _pwdController,
211 focusNode: _pwdFocusNode, 213 focusNode: _pwdFocusNode,
212 autofocus: _sellerCodeController.text.isNotEmpty&&_accountController.text.isNotEmpty&&_pwdController.text.isEmpty, 214 autofocus: _sellerCodeController.text.isNotEmpty&&_accountController.text.isNotEmpty&&_pwdController.text.isEmpty,
  215 + style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(28)),
213 decoration: InputDecoration( 216 decoration: InputDecoration(
214 hintText: "请输入密码", 217 hintText: "请输入密码",
215 - hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(26)),  
216 - border: InputBorder.none,  
217 - contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(10)) 218 + hintStyle: TextStyle(color: MyColours.color_c1c1c1,fontSize: ScreenUtil().setSp(28)),
  219 + border: InputBorder.none,
  220 + contentPadding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(30),horizontal: ScreenUtil().setWidth(30))
218 ), 221 ),
219 onChanged: (_){ 222 onChanged: (_){
220 setActivate(); 223 setActivate();
@@ -258,7 +261,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -258,7 +261,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
258 }); 261 });
259 }, 262 },
260 child: Container( 263 child: Container(
261 - height: ScreenUtil().setHeight(84), 264 + height: ScreenUtil().setHeight(80),
262 width: ScreenUtil().setWidth(611), 265 width: ScreenUtil().setWidth(611),
263 margin: EdgeInsets.only(top: ScreenUtil().setHeight(56)), 266 margin: EdgeInsets.only(top: ScreenUtil().setHeight(56)),
264 alignment: Alignment.center, 267 alignment: Alignment.center,
@@ -269,7 +272,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{ @@ -269,7 +272,7 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver{
269 ], 272 ],
270 borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8))) 273 borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))
271 ), 274 ),
272 - child: Text("登录",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(30)),), 275 + child: Text("登录",style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(34)),),
273 ), 276 ),
274 ); 277 );
275 }, 278 },
@@ -27,83 +27,85 @@ class MessageDialogItem extends StatelessWidget { @@ -27,83 +27,85 @@ class MessageDialogItem extends StatelessWidget {
27 NavigatorUtil.goNotebookDetailPage(context,message.rid.toString()); 27 NavigatorUtil.goNotebookDetailPage(context,message.rid.toString());
28 } 28 }
29 }, 29 },
30 - child: Container(  
31 - margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(22),vertical: ScreenUtil().setWidth(11)),  
32 - padding: EdgeInsets.fromLTRB(  
33 - ScreenUtil().setWidth(17),  
34 - ScreenUtil().setWidth(45),  
35 - ScreenUtil().setWidth(12),  
36 - ScreenUtil().setWidth(34)),  
37 - decoration: BoxDecoration(  
38 - color: MyColours.color_fefefe,  
39 - borderRadius:  
40 - BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))),  
41 - child: Column(  
42 - mainAxisSize: MainAxisSize.min,  
43 - crossAxisAlignment: CrossAxisAlignment.start,  
44 - children: <Widget>[  
45 - Row(  
46 - crossAxisAlignment: CrossAxisAlignment.center, 30 + child: Stack(
  31 + children: <Widget>[
  32 + Container(
  33 + margin: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(39),vertical: ScreenUtil().setWidth(12)),
  34 + padding: EdgeInsets.fromLTRB(
  35 + ScreenUtil().setWidth(12),
  36 + ScreenUtil().setWidth(45),
  37 + ScreenUtil().setWidth(21),
  38 + ScreenUtil().setWidth(43)),
  39 + decoration: BoxDecoration(
  40 + color: MyColours.color_fefefe,
  41 + borderRadius:
  42 + BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))),
  43 + child:Column(
  44 + mainAxisSize: MainAxisSize.min,
  45 + crossAxisAlignment: CrossAxisAlignment.start,
47 children: <Widget>[ 46 children: <Widget>[
  47 + Row(
  48 + crossAxisAlignment: CrossAxisAlignment.center,
  49 + children: <Widget>[
  50 + Text(
  51 + "在线预订",
  52 + style: TextStyle(
  53 + color: textColor,
  54 + fontSize: ScreenUtil().setSp(28)),
  55 + ),
  56 + Spacer(),
  57 + Text(
  58 + message.cdateStr,
  59 + style: TextStyle(
  60 + color: MyColours.color_999999,
  61 + fontSize: ScreenUtil().setSp(24)),
  62 + ),
  63 + ],
  64 + ),
  65 + VEmptyView(20),
48 Text( 66 Text(
49 - "在线预订", 67 + "包间需求：${message.room_demand}",
50 style: TextStyle( 68 style: TextStyle(
51 color: textColor, 69 color: textColor,
52 - fontSize: ScreenUtil().setSp(26)), 70 + fontSize: ScreenUtil().setSp(28)),
53 ), 71 ),
54 - Spacer(), 72 + VEmptyView(10),
55 Text( 73 Text(
56 - message.cdateStr, 74 + "就餐时间：${message.ddateStr}",
57 style: TextStyle( 75 style: TextStyle(
58 - color: MyColours.color_999999,  
59 - fontSize: ScreenUtil().setSp(22)), 76 + color: textColor,
  77 + fontSize: ScreenUtil().setSp(28)),
60 ), 78 ),
61 - ],  
62 - ),  
63 - VEmptyView(20),  
64 - Text(  
65 - "包间需求：${message.room_demand}",  
66 - style: TextStyle(  
67 - color: textColor,  
68 - fontSize: ScreenUtil().setSp(26)),  
69 - ),  
70 - VEmptyView(10),  
71 - Text(  
72 - "就餐时间：${message.ddateStr}",  
73 - style: TextStyle(  
74 - color: textColor,  
75 - fontSize: ScreenUtil().setSp(26)),  
76 - ),  
77 - VEmptyView(10),  
78 - Row(  
79 - crossAxisAlignment: CrossAxisAlignment.center,  
80 - children: <Widget>[ 79 + VEmptyView(10),
81 Text( 80 Text(
82 "预订人：${message.rnameStr}", 81 "预订人：${message.rnameStr}",
83 style: TextStyle( 82 style: TextStyle(
84 color: textColor, 83 color: textColor,
85 - fontSize: ScreenUtil().setSp(26)), 84 + fontSize: ScreenUtil().setSp(28)),
86 ), 85 ),
87 - Spacer(),  
88 - Offstage(  
89 - offstage: isTreated?true:false,  
90 - child: CommonButton(  
91 - width: 160,  
92 - height: 48,  
93 - fontSize: 26,  
94 - content: "立即处理",  
95 - state: 1,  
96 - onPress: () {  
97 - messageDialogModel.removeMessage(message.id);  
98 - NavigatorUtil.goHandleOnlinePage(context,message.rid.toString(),message.id,replace: messageDialogModel.messages.isEmpty);  
99 - },  
100 - ),  
101 - )  
102 ], 86 ],
103 - )  
104 - ],  
105 - ),  
106 - ), 87 + ),
  88 + ),
  89 + Positioned(
  90 + right: ScreenUtil().setWidth(60),
  91 + bottom: ScreenUtil().setWidth(55),
  92 + child:Offstage(
  93 + offstage: isTreated?true:false,
  94 + child: CommonButton(
  95 + width: 160,
  96 + height: 48,
  97 + fontSize: 28,
  98 + content: "立即处理",
  99 + state: 1,
  100 + onPress: () {
  101 + messageDialogModel.removeMessage(message.id);
  102 + NavigatorUtil.goHandleOnlinePage(context,message.rid.toString(),message.id,replace: messageDialogModel.messages.isEmpty);
  103 + },
  104 + ),
  105 + ),
  106 + )
  107 + ],
  108 + )
107 ); 109 );
108 } 110 }
109 } 111 }
@@ -40,10 +40,10 @@ class MyPageState extends State<MyPage>{ @@ -40,10 +40,10 @@ class MyPageState extends State<MyPage>{
40 children: <Widget>[ 40 children: <Widget>[
41 VEmptyView(25), 41 VEmptyView(25),
42 Image.asset("assets/my_logo.png",width: ScreenUtil().setWidth(228),height: ScreenUtil().setWidth(228),), 42 Image.asset("assets/my_logo.png",width: ScreenUtil().setWidth(228),height: ScreenUtil().setWidth(228),),
43 - VEmptyView(30),  
44 - Text(model.user.sellername,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(26)),), 43 + VEmptyView(40),
  44 + Text(model.user.sellername,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(32)),),
45 VEmptyView(12), 45 VEmptyView(12),
46 - Text(model.user.account+" | "+model.user.role_name,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(24)),) 46 + Text(model.user.account+" | "+model.user.role_name,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(30)),)
47 ], 47 ],
48 ); 48 );
49 },) 49 },)
@@ -66,9 +66,9 @@ class MyPageState extends State<MyPage>{ @@ -66,9 +66,9 @@ class MyPageState extends State<MyPage>{
66 mainAxisSize: MainAxisSize.min, 66 mainAxisSize: MainAxisSize.min,
67 crossAxisAlignment: CrossAxisAlignment.center, 67 crossAxisAlignment: CrossAxisAlignment.center,
68 children: <Widget>[ 68 children: <Widget>[
69 - Image.asset("assets/icon_exist.png",width: ScreenUtil().setWidth(25),height: ScreenUtil().setWidth(25),), 69 + Image.asset("assets/icon_exist.png",width: ScreenUtil().setWidth(30),height: ScreenUtil().setWidth(30),),
70 HEmptyView(18), 70 HEmptyView(18),
71 - Text("退出登录",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(30))) 71 + Text("退出登录",style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(34),))
72 ], 72 ],
73 ), 73 ),
74 ), 74 ),
@@ -42,18 +42,18 @@ class NotebookItemState extends State<NoteBookItem>{ @@ -42,18 +42,18 @@ class NotebookItemState extends State<NoteBookItem>{
42 }, 42 },
43 child: Container( 43 child: Container(
44 width: double.infinity, 44 width: double.infinity,
45 - height: ScreenUtil().setHeight(112), 45 + height: ScreenUtil().setHeight(110),
46 color: (widget.index % 2 == 0) ? MyColours.color_f7fdfd : MyColours.color_ffffff, 46 color: (widget.index % 2 == 0) ? MyColours.color_f7fdfd : MyColours.color_ffffff,
47 child: Row( 47 child: Row(
48 children: <Widget>[ 48 children: <Widget>[
49 Container( 49 Container(
50 - width: ScreenUtil().setWidth(144), 50 + width: ScreenUtil().setWidth(171),
51 alignment: Alignment.center, 51 alignment: Alignment.center,
52 child: Text( 52 child: Text(
53 notebook.tableinfoStr, 53 notebook.tableinfoStr,
54 style: TextStyle( 54 style: TextStyle(
55 color: textColor, 55 color: textColor,
56 - fontSize: ScreenUtil().setSp(26)), 56 + fontSize: ScreenUtil().setSp(28)),
57 ), 57 ),
58 ), 58 ),
59 MyDivider( 59 MyDivider(
@@ -62,13 +62,13 @@ class NotebookItemState extends State<NoteBookItem>{ @@ -62,13 +62,13 @@ class NotebookItemState extends State<NoteBookItem>{
62 color: MyColours.color_ededed, 62 color: MyColours.color_ededed,
63 ), 63 ),
64 Container( 64 Container(
65 - width: ScreenUtil().setWidth(195), 65 + width: ScreenUtil().setWidth(230),
66 alignment: Alignment.center, 66 alignment: Alignment.center,
67 child: Column( 67 child: Column(
68 mainAxisSize: MainAxisSize.min, 68 mainAxisSize: MainAxisSize.min,
69 children: <Widget>[ 69 children: <Widget>[
70 - Text(notebook.rnameStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(26)),),  
71 - VEmptyView(18), 70 + Text(notebook.rnameStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(28)),),
  71 + VEmptyView(10),
72 Text(notebook.phoneStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(22)),) 72 Text(notebook.phoneStr,style: TextStyle(color: textColor,fontSize: ScreenUtil().setSp(22)),)
73 ], 73 ],
74 ), 74 ),
@@ -79,13 +79,13 @@ class NotebookItemState extends State<NoteBookItem>{ @@ -79,13 +79,13 @@ class NotebookItemState extends State<NoteBookItem>{
79 color: MyColours.color_ededed, 79 color: MyColours.color_ededed,
80 ), 80 ),
81 Container( 81 Container(
82 - width: ScreenUtil().setWidth(195), 82 + width: ScreenUtil().setWidth(159),
83 alignment: Alignment.center, 83 alignment: Alignment.center,
84 child: Text( 84 child: Text(
85 notebook.ddateStr, 85 notebook.ddateStr,
86 style: TextStyle( 86 style: TextStyle(
87 color: textColor, 87 color: textColor,
88 - fontSize: ScreenUtil().setSp(26)), 88 + fontSize: ScreenUtil().setSp(28)),
89 ), 89 ),
90 ), 90 ),
91 MyDivider( 91 MyDivider(
@@ -96,13 +96,13 @@ class NotebookItemState extends State<NoteBookItem>{ @@ -96,13 +96,13 @@ class NotebookItemState extends State<NoteBookItem>{
96 GestureDetector( 96 GestureDetector(
97 onTap: _onOperateClick, 97 onTap: _onOperateClick,
98 child: Container( 98 child: Container(
99 - width: ScreenUtil().setWidth(209), 99 + width: ScreenUtil().setWidth(184),
100 alignment: Alignment.center, 100 alignment: Alignment.center,
101 child: Text( 101 child: Text(
102 notebook.operationText, 102 notebook.operationText,
103 style: TextStyle( 103 style: TextStyle(
104 color: (notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_2bb5b7, 104 color: (notebook.status=="3"||notebook.status=="4"||notebook.status=="6")?MyColours.color_bfbfbf:MyColours.color_2bb5b7,
105 - fontSize: ScreenUtil().setSp(26)), 105 + fontSize: ScreenUtil().setSp(28)),
106 ), 106 ),
107 ), 107 ),
108 ), 108 ),
@@ -172,13 +172,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -172,13 +172,13 @@ class NoteBookPageState extends State<NoteBookPage> {
172 child: Row( 172 child: Row(
173 children: <Widget>[ 173 children: <Widget>[
174 Container( 174 Container(
175 - width: ScreenUtil().setWidth(144), 175 + width: ScreenUtil().setWidth(171),
176 alignment: Alignment.center, 176 alignment: Alignment.center,
177 child: Text( 177 child: Text(
178 "桌号", 178 "桌号",
179 style: TextStyle( 179 style: TextStyle(
180 color: MyColours.color_353535, 180 color: MyColours.color_353535,
181 - fontSize: ScreenUtil().setSp(22)), 181 + fontSize: ScreenUtil().setSp(30)),
182 ), 182 ),
183 ), 183 ),
184 MyDivider( 184 MyDivider(
@@ -187,13 +187,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -187,13 +187,13 @@ class NoteBookPageState extends State<NoteBookPage> {
187 color: MyColours.color_ededed, 187 color: MyColours.color_ededed,
188 ), 188 ),
189 Container( 189 Container(
190 - width: ScreenUtil().setWidth(195), 190 + width: ScreenUtil().setWidth(230),
191 alignment: Alignment.center, 191 alignment: Alignment.center,
192 child: Text( 192 child: Text(
193 "用户姓名", 193 "用户姓名",
194 style: TextStyle( 194 style: TextStyle(
195 color: MyColours.color_353535, 195 color: MyColours.color_353535,
196 - fontSize: ScreenUtil().setSp(22)), 196 + fontSize: ScreenUtil().setSp(30)),
197 ), 197 ),
198 ), 198 ),
199 MyDivider( 199 MyDivider(
@@ -202,13 +202,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -202,13 +202,13 @@ class NoteBookPageState extends State<NoteBookPage> {
202 color: MyColours.color_ededed, 202 color: MyColours.color_ededed,
203 ), 203 ),
204 Container( 204 Container(
205 - width: ScreenUtil().setWidth(195), 205 + width: ScreenUtil().setWidth(159),
206 alignment: Alignment.center, 206 alignment: Alignment.center,
207 child: Text( 207 child: Text(
208 "时间", 208 "时间",
209 style: TextStyle( 209 style: TextStyle(
210 color: MyColours.color_353535, 210 color: MyColours.color_353535,
211 - fontSize: ScreenUtil().setSp(22)), 211 + fontSize: ScreenUtil().setSp(30)),
212 ), 212 ),
213 ), 213 ),
214 MyDivider( 214 MyDivider(
@@ -217,13 +217,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -217,13 +217,13 @@ class NoteBookPageState extends State<NoteBookPage> {
217 color: MyColours.color_ededed, 217 color: MyColours.color_ededed,
218 ), 218 ),
219 Container( 219 Container(
220 - width: ScreenUtil().setWidth(209), 220 + width: ScreenUtil().setWidth(184),
221 alignment: Alignment.center, 221 alignment: Alignment.center,
222 child: Text( 222 child: Text(
223 "操作", 223 "操作",
224 style: TextStyle( 224 style: TextStyle(
225 - color: MyColours.color_2bb5b7,  
226 - fontSize: ScreenUtil().setSp(22)), 225 + color: MyColours.color_353535,
  226 + fontSize: ScreenUtil().setSp(30)),
227 ), 227 ),
228 ), 228 ),
229 ], 229 ],
@@ -285,7 +285,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -285,7 +285,7 @@ class NoteBookPageState extends State<NoteBookPage> {
285 dateText, 285 dateText,
286 style: TextStyle( 286 style: TextStyle(
287 color: MyColours.color_2bb5b7, 287 color: MyColours.color_2bb5b7,
288 - fontSize: ScreenUtil().setSp(26)), 288 + fontSize: ScreenUtil().setSp(32)),
289 ), 289 ),
290 ), 290 ),
291 ), 291 ),
@@ -312,13 +312,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -312,13 +312,13 @@ class NoteBookPageState extends State<NoteBookPage> {
312 }, 312 },
313 child: Padding( 313 child: Padding(
314 padding: EdgeInsets.symmetric( 314 padding: EdgeInsets.symmetric(
315 - horizontal: ScreenUtil().setWidth(7)), 315 + horizontal: ScreenUtil().setWidth(10)),
316 child: CommonButton( 316 child: CommonButton(
317 content: "早市", 317 content: "早市",
318 state: currTimeIndex == 1 ? 1 : 0, 318 state: currTimeIndex == 1 ? 1 : 0,
319 - width: ScreenUtil().setWidth(85),  
320 - height: ScreenUtil().setHeight(47),  
321 - fontSize: ScreenUtil().setSp(26), 319 + width: ScreenUtil().setWidth(180),
  320 + height: ScreenUtil().setHeight(75),
  321 + fontSize: 32,
322 )), 322 )),
323 ), 323 ),
324 ), 324 ),
@@ -334,13 +334,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -334,13 +334,13 @@ class NoteBookPageState extends State<NoteBookPage> {
334 }, 334 },
335 child: Padding( 335 child: Padding(
336 padding: EdgeInsets.symmetric( 336 padding: EdgeInsets.symmetric(
337 - horizontal: ScreenUtil().setWidth(7)), 337 + horizontal: ScreenUtil().setWidth(10)),
338 child: CommonButton( 338 child: CommonButton(
339 content: "午市", 339 content: "午市",
340 state: currTimeIndex == 2 ? 1 : 0, 340 state: currTimeIndex == 2 ? 1 : 0,
341 - width: ScreenUtil().setWidth(85),  
342 - height: ScreenUtil().setHeight(47),  
343 - fontSize: ScreenUtil().setSp(26), 341 + width: ScreenUtil().setWidth(180),
  342 + height: ScreenUtil().setHeight(75),
  343 + fontSize: 32,
344 )), 344 )),
345 )), 345 )),
346 Offstage( 346 Offstage(
@@ -355,13 +355,13 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -355,13 +355,13 @@ class NoteBookPageState extends State<NoteBookPage> {
355 }, 355 },
356 child: Padding( 356 child: Padding(
357 padding: EdgeInsets.symmetric( 357 padding: EdgeInsets.symmetric(
358 - horizontal: ScreenUtil().setWidth(7)), 358 + horizontal: ScreenUtil().setWidth(10)),
359 child: CommonButton( 359 child: CommonButton(
360 content: "晚市", 360 content: "晚市",
361 state: currTimeIndex == 3 ? 1 : 0, 361 state: currTimeIndex == 3 ? 1 : 0,
362 - width: ScreenUtil().setWidth(85),  
363 - height: ScreenUtil().setHeight(47),  
364 - fontSize: ScreenUtil().setSp(26), 362 + width: ScreenUtil().setWidth(180),
  363 + height: ScreenUtil().setHeight(75),
  364 + fontSize: 32,
365 )), 365 )),
366 )), 366 )),
367 ], 367 ],
@@ -383,7 +383,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -383,7 +383,7 @@ class NoteBookPageState extends State<NoteBookPage> {
383 total, 383 total,
384 style: TextStyle( 384 style: TextStyle(
385 color: MyColours.color_131313, 385 color: MyColours.color_131313,
386 - fontSize: ScreenUtil().setSp(18)), 386 + fontSize: ScreenUtil().setSp(24)),
387 ), 387 ),
388 ); 388 );
389 }, 389 },
@@ -41,7 +41,7 @@ class DialogUtil { @@ -41,7 +41,7 @@ class DialogUtil {
41 mainAxisSize: MainAxisSize.min, 41 mainAxisSize: MainAxisSize.min,
42 children: <Widget>[ 42 children: <Widget>[
43 Container( 43 Container(
44 - height: ScreenUtil().setHeight(53), 44 + margin: EdgeInsets.only(top: ScreenUtil().setWidth(21),bottom: ScreenUtil().setWidth(12)),
45 width: double.infinity, 45 width: double.infinity,
46 child: Stack( 46 child: Stack(
47 alignment: Alignment.center, 47 alignment: Alignment.center,
@@ -50,10 +50,10 @@ class DialogUtil { @@ -50,10 +50,10 @@ class DialogUtil {
50 "您有一条新的消息", 50 "您有一条新的消息",
51 style: TextStyle( 51 style: TextStyle(
52 color: MyColours.color_ffffff, 52 color: MyColours.color_ffffff,
53 - fontSize: ScreenUtil().setSp(26)), 53 + fontSize: ScreenUtil().setSp(32)),
54 ), 54 ),
55 Positioned( 55 Positioned(
56 - right: ScreenUtil().setWidth(8), 56 + right: ScreenUtil().setWidth(23),
57 child: GestureDetector( 57 child: GestureDetector(
58 onTap: () { 58 onTap: () {
59 Navigator.of(dialogContext).pop(); 59 Navigator.of(dialogContext).pop();
@@ -92,7 +92,7 @@ class DialogUtil { @@ -92,7 +92,7 @@ class DialogUtil {
92 "在线预订", 92 "在线预订",
93 style: TextStyle( 93 style: TextStyle(
94 color: MyColours.color_353535, 94 color: MyColours.color_353535,
95 - fontSize: ScreenUtil().setSp(26)), 95 + fontSize: ScreenUtil().setSp(32)),
96 ), 96 ),
97 Spacer(), 97 Spacer(),
98 Text( 98 Text(
@@ -108,7 +108,7 @@ class DialogUtil { @@ -108,7 +108,7 @@ class DialogUtil {
108 "在线预订：${model.messages.length}个", 108 "在线预订：${model.messages.length}个",
109 style: TextStyle( 109 style: TextStyle(
110 color: MyColours.color_353535, 110 color: MyColours.color_353535,
111 - fontSize: ScreenUtil().setSp(26)), 111 + fontSize: ScreenUtil().setSp(32)),
112 ), 112 ),
113 Row( 113 Row(
114 crossAxisAlignment: CrossAxisAlignment.center, 114 crossAxisAlignment: CrossAxisAlignment.center,
@@ -117,7 +117,7 @@ class DialogUtil { @@ -117,7 +117,7 @@ class DialogUtil {
117 CommonButton( 117 CommonButton(
118 width: 160, 118 width: 160,
119 height: 48, 119 height: 48,
120 - fontSize: 26, 120 + fontSize: 32,
121 content: "立即处理", 121 content: "立即处理",
122 state: 1, 122 state: 1,
123 onPress: () { 123 onPress: () {
@@ -185,7 +185,7 @@ class DialogUtil { @@ -185,7 +185,7 @@ class DialogUtil {
185 }, 185 },
186 titleTextStyle: TextStyle( 186 titleTextStyle: TextStyle(
187 color: MyColours.color_ffffff, 187 color: MyColours.color_ffffff,
188 - fontSize: ScreenUtil().setSp(26)), 188 + fontSize: ScreenUtil().setSp(32)),
189 leftChevronIcon: 189 leftChevronIcon:
190 const Icon(Icons.chevron_left, color: Colors.white), 190 const Icon(Icons.chevron_left, color: Colors.white),
191 rightChevronIcon: 191 rightChevronIcon:
@@ -195,10 +195,10 @@ class DialogUtil { @@ -195,10 +195,10 @@ class DialogUtil {
195 contentPadding: const EdgeInsets.only(bottom: 4.0), 195 contentPadding: const EdgeInsets.only(bottom: 4.0),
196 weekdayStyle: TextStyle( 196 weekdayStyle: TextStyle(
197 color: MyColours.color_2bb5b7, 197 color: MyColours.color_2bb5b7,
198 - fontSize: ScreenUtil().setSp(26)), 198 + fontSize: ScreenUtil().setSp(32)),
199 weekendStyle: TextStyle( 199 weekendStyle: TextStyle(
200 color: MyColours.color_f49a5e, 200 color: MyColours.color_f49a5e,
201 - fontSize: ScreenUtil().setSp(26)), 201 + fontSize: ScreenUtil().setSp(32)),
202 selectedColor: MyColours.color_2bb5b7, 202 selectedColor: MyColours.color_2bb5b7,
203 outsideDaysVisible: false, 203 outsideDaysVisible: false,
204 ), 204 ),
@@ -213,7 +213,7 @@ class DialogUtil { @@ -213,7 +213,7 @@ class DialogUtil {
213 weekday, 213 weekday,
214 style: TextStyle( 214 style: TextStyle(
215 color: MyColours.color_97e9ea, 215 color: MyColours.color_97e9ea,
216 - fontSize: ScreenUtil().setSp(26)), 216 + fontSize: ScreenUtil().setSp(32)),
217 ), 217 ),
218 ); 218 );
219 }, 219 },
@@ -232,7 +232,7 @@ class DialogUtil { @@ -232,7 +232,7 @@ class DialogUtil {
232 .now() 232 .now()
233 .day ? '今' : date.day.toString(), 233 .day ? '今' : date.day.toString(),
234 style: TextStyle().copyWith( 234 style: TextStyle().copyWith(
235 - fontSize: ScreenUtil().setSp(26), 235 + fontSize: ScreenUtil().setSp(32),
236 color: MyColours.color_ffffff), 236 color: MyColours.color_ffffff),
237 ), 237 ),
238 ); 238 );
@@ -250,7 +250,7 @@ class DialogUtil { @@ -250,7 +250,7 @@ class DialogUtil {
250 child: Text( 250 child: Text(
251 '今', 251 '今',
252 style: TextStyle().copyWith( 252 style: TextStyle().copyWith(
253 - fontSize: ScreenUtil().setSp(26), 253 + fontSize: ScreenUtil().setSp(32),
254 color: MyColours.color_2bb5b7), 254 color: MyColours.color_2bb5b7),
255 ), 255 ),
256 ); 256 );
@@ -274,7 +274,7 @@ class DialogUtil { @@ -274,7 +274,7 @@ class DialogUtil {
274 ), 274 ),
275 Positioned( 275 Positioned(
276 right: ScreenUtil().setWidth(62), 276 right: ScreenUtil().setWidth(62),
277 - bottom: ScreenUtil().setHeight(7), 277 + bottom: ScreenUtil().setHeight(20),
278 child: Container( 278 child: Container(
279 child: GestureDetector( 279 child: GestureDetector(
280 onTap: () { 280 onTap: () {
@@ -284,15 +284,15 @@ class DialogUtil { @@ -284,15 +284,15 @@ class DialogUtil {
284 child: Container( 284 child: Container(
285 child: ClipOval( 285 child: ClipOval(
286 child: Container( 286 child: Container(
287 - width: ScreenUtil().setWidth(95),  
288 - height: ScreenUtil().setWidth(95), 287 + width: ScreenUtil().setWidth(100),
  288 + height: ScreenUtil().setWidth(100),
289 alignment: Alignment.center, 289 alignment: Alignment.center,
290 color: MyColours.color_2bb5b7, 290 color: MyColours.color_2bb5b7,
291 child: Text( 291 child: Text(
292 - "回到\n今天", 292 + "今天",
293 style: TextStyle( 293 style: TextStyle(
294 color: MyColours.color_ffffff, 294 color: MyColours.color_ffffff,
295 - fontSize: ScreenUtil().setSp(26)), 295 + fontSize: ScreenUtil().setSp(32)),
296 ), 296 ),
297 )), 297 )),
298 ), 298 ),
@@ -316,7 +316,7 @@ class DialogUtil { @@ -316,7 +316,7 @@ class DialogUtil {
316 Widget widget = Container( 316 Widget widget = Container(
317 width: double.infinity, 317 width: double.infinity,
318 height: ScreenUtil().setHeight(233), 318 height: ScreenUtil().setHeight(233),
319 - color: MyColours.color_dfdfdf, 319 + color: MyColours.color_f1f1f1,
320 child: Row( 320 child: Row(
321 children: <Widget>[ 321 children: <Widget>[
322 Expanded( 322 Expanded(
@@ -329,11 +329,10 @@ class DialogUtil { @@ -329,11 +329,10 @@ class DialogUtil {
329 mainAxisSize: MainAxisSize.min, 329 mainAxisSize: MainAxisSize.min,
330 children: <Widget>[ 330 children: <Widget>[
331 Image.asset( 331 Image.asset(
332 - "assets/icon_wechat.png", width: ScreenUtil().setWidth(126),  
333 - height: ScreenUtil().setWidth(126),),  
334 - VEmptyView(18), 332 + "assets/icon_wechat.png", width: ScreenUtil().setWidth(140),
  333 + height: ScreenUtil().setWidth(140),),
335 Text("微信", style: TextStyle(color: MyColours.color_353535, 334 Text("微信", style: TextStyle(color: MyColours.color_353535,
336 - fontSize: ScreenUtil().setSp(26)),) 335 + fontSize: ScreenUtil().setSp(32)),)
337 ], 336 ],
338 ), 337 ),
339 ), 338 ),
@@ -348,11 +347,10 @@ class DialogUtil { @@ -348,11 +347,10 @@ class DialogUtil {
348 mainAxisSize: MainAxisSize.min, 347 mainAxisSize: MainAxisSize.min,
349 children: <Widget>[ 348 children: <Widget>[
350 Image.asset( 349 Image.asset(
351 - "assets/icon_sms.png", width: ScreenUtil().setWidth(126),  
352 - height: ScreenUtil().setWidth(126),),  
353 - VEmptyView(18), 350 + "assets/icon_sms.png", width: ScreenUtil().setWidth(140),
  351 + height: ScreenUtil().setWidth(140),),
354 Text("短信", style: TextStyle(color: MyColours.color_353535, 352 Text("短信", style: TextStyle(color: MyColours.color_353535,
355 - fontSize: ScreenUtil().setSp(26)),) 353 + fontSize: ScreenUtil().setSp(32)),)
356 ], 354 ],
357 ), 355 ),
358 ), 356 ),
@@ -367,11 +365,10 @@ class DialogUtil { @@ -367,11 +365,10 @@ class DialogUtil {
367 mainAxisSize: MainAxisSize.min, 365 mainAxisSize: MainAxisSize.min,
368 children: <Widget>[ 366 children: <Widget>[
369 Image.asset( 367 Image.asset(
370 - "assets/icon_phone.png", width: ScreenUtil().setWidth(126),  
371 - height: ScreenUtil().setWidth(126),),  
372 - VEmptyView(18), 368 + "assets/icon_phone.png", width: ScreenUtil().setWidth(140),
  369 + height: ScreenUtil().setWidth(140),),
373 Text("电话", style: TextStyle(color: MyColours.color_353535, 370 Text("电话", style: TextStyle(color: MyColours.color_353535,
374 - fontSize: ScreenUtil().setSp(26)),) 371 + fontSize: ScreenUtil().setSp(32)),)
375 ], 372 ],
376 ), 373 ),
377 ), 374 ),
@@ -43,7 +43,10 @@ class MyAppBar extends StatelessWidget { @@ -43,7 +43,10 @@ class MyAppBar extends StatelessWidget {
43 title, 43 title,
44 style: TextStyle( 44 style: TextStyle(
45 color: fontColor, 45 color: fontColor,
46 - fontSize: ScreenUtil().setSp(28)), 46 + fontSize: ScreenUtil().setSp(34),
  47 + fontWeight: FontWeight.normal,
  48 + decoration: TextDecoration.none
  49 + ),
47 ), 50 ),
48 ) 51 )
49 ], 52 ],
@@ -22,11 +22,11 @@ class RowMultiText extends StatelessWidget{ @@ -22,11 +22,11 @@ class RowMultiText extends StatelessWidget{
22 children: <Widget>[ 22 children: <Widget>[
23 Positioned( 23 Positioned(
24 left: 0, 24 left: 0,
25 - child: Text(title,style: TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(22)),), 25 + child: Text(title,style: TextStyle(color: MyColours.color_828282,fontSize: ScreenUtil().setSp(30)),),
26 ), 26 ),
27 Positioned( 27 Positioned(
28 right: 0, 28 right: 0,
29 - child: Text(content,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(26)),), 29 + child: Text(content,style: TextStyle(color: MyColours.color_353535,fontSize: ScreenUtil().setSp(30)),),
30 ) 30 )
31 ], 31 ],
32 ), 32 ),
@@ -10,8 +10,10 @@ class TableItem extends StatefulWidget{ @@ -10,8 +10,10 @@ class TableItem extends StatefulWidget{
10 final t.Table table; 10 final t.Table table;
11 final bool canSelected;//是否能选中 11 final bool canSelected;//是否能选中
12 final ValueChanged onSelected; 12 final ValueChanged onSelected;
  13 +
  14 + final int height;//高度
13 15
14 - TableItem(this.table,{this.onSelected,this.canSelected=false}); 16 + TableItem(this.table,{this.onSelected,this.canSelected=false,this.height=183});
15 17
16 @override 18 @override
17 State<StatefulWidget> createState() { 19 State<StatefulWidget> createState() {
@@ -39,7 +41,7 @@ class TableItemState extends State<TableItem>{ @@ -39,7 +41,7 @@ class TableItemState extends State<TableItem>{
39 }, 41 },
40 child: Container( 42 child: Container(
41 width: ScreenUtil().setWidth(150), 43 width: ScreenUtil().setWidth(150),
42 - height: ScreenUtil().setHeight(183), 44 + height: ScreenUtil().setWidth(widget.height),
43 margin:EdgeInsets.all( ScreenUtil().setWidth(9)), 45 margin:EdgeInsets.all( ScreenUtil().setWidth(9)),
44 decoration: BoxDecoration( 46 decoration: BoxDecoration(
45 color: MyColours.color_a8e2e4, 47 color: MyColours.color_a8e2e4,
@@ -64,6 +66,7 @@ class TableItemState extends State<TableItem>{ @@ -64,6 +66,7 @@ class TableItemState extends State<TableItem>{
64 ), 66 ),
65 Container( 67 Container(
66 alignment: Alignment.centerLeft, 68 alignment: Alignment.centerLeft,
  69 + margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)),
67 child: Column( 70 child: Column(
68 mainAxisSize: MainAxisSize.min, 71 mainAxisSize: MainAxisSize.min,
69 crossAxisAlignment: CrossAxisAlignment.start, 72 crossAxisAlignment: CrossAxisAlignment.start,