xt / Flutter-ReserveApp · Commits

Go to a project

Commit ea4333ccb4beec42936ce9948239d3eb6211a3b3

Authored by “gaiyaguang”
1 parent 9907a8c2
build: skipped

ui

Inline Side-by-side
Showing 9 changed files with 220 additions and 153 deletions
@@ -400,7 +400,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -400,7 +400,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
400 child: Container( 400 child: Container(
401 // color: Colors.red, 401 // color: Colors.red,
402 // height: ScreenUtil().setHeight(178), 402 // height: ScreenUtil().setHeight(178),
403 - height: ScreenUtil().setHeight(170), 403 + height: ScreenUtil().setHeight(180),
404 child: ListView.builder( 404 child: ListView.builder(
405 physics: const NeverScrollableScrollPhysics(), 405 physics: const NeverScrollableScrollPhysics(),
406 itemBuilder: (BuildContext contxt, int index) { 406 itemBuilder: (BuildContext contxt, int index) {
@@ -287,7 +287,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -287,7 +287,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
287 // TODO: implement build 287 // TODO: implement build
288 return new Scaffold( 288 return new Scaffold(
289 bottomNavigationBar: BottomNavigationBar( 289 bottomNavigationBar: BottomNavigationBar(
290 - iconSize: ScreenUtil().setWidth(40), 290 + iconSize: ScreenUtil().setWidth(48),
291 unselectedFontSize: ScreenUtil().setSp(22), 291 unselectedFontSize: ScreenUtil().setSp(22),
292 selectedFontSize: ScreenUtil().setSp(22), 292 selectedFontSize: ScreenUtil().setSp(22),
293 backgroundColor: MyColours.color_ffffff, 293 backgroundColor: MyColours.color_ffffff,
@@ -295,13 +295,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -295,13 +295,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
295 BottomNavigationBarItem( 295 BottomNavigationBarItem(
296 icon: Image( 296 icon: Image(
297 image: AssetImage("assets/message_default.png"), 297 image: AssetImage("assets/message_default.png"),
298 - width: ScreenUtil().setWidth(40),  
299 - height: ScreenUtil().setWidth(46), 298 + width: ScreenUtil().setWidth(48),
  299 + height: ScreenUtil().setWidth(48),
300 ), 300 ),
301 activeIcon: Image( 301 activeIcon: Image(
302 image: AssetImage("assets/message_selected.png"), 302 image: AssetImage("assets/message_selected.png"),
303 - width: ScreenUtil().setWidth(40),  
304 - height: ScreenUtil().setWidth(46), 303 + width: ScreenUtil().setWidth(48),
  304 + height: ScreenUtil().setWidth(48),
305 ), 305 ),
306 title: Text( 306 title: Text(
307 "消息中心", 307 "消息中心",
@@ -313,13 +313,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -313,13 +313,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
313 BottomNavigationBarItem( 313 BottomNavigationBarItem(
314 icon: Image( 314 icon: Image(
315 image: AssetImage("assets/notebook_default.png"), 315 image: AssetImage("assets/notebook_default.png"),
316 - width: ScreenUtil().setWidth(44),  
317 - height: ScreenUtil().setWidth(44), 316 + width: ScreenUtil().setWidth(48),
  317 + height: ScreenUtil().setWidth(48),
318 ), 318 ),
319 activeIcon: Image( 319 activeIcon: Image(
320 image: AssetImage("assets/notebook_selected.png"), 320 image: AssetImage("assets/notebook_selected.png"),
321 - width: ScreenUtil().setWidth(44),  
322 - height: ScreenUtil().setWidth(44), 321 + width: ScreenUtil().setWidth(48),
  322 + height: ScreenUtil().setWidth(48),
323 ), 323 ),
324 title: Text( 324 title: Text(
325 "已预订", 325 "已预订",
@@ -331,13 +331,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -331,13 +331,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
331 BottomNavigationBarItem( 331 BottomNavigationBarItem(
332 icon: Image( 332 icon: Image(
333 image: AssetImage("assets/my_default.png"), 333 image: AssetImage("assets/my_default.png"),
334 - width: ScreenUtil().setWidth(44),  
335 - height: ScreenUtil().setWidth(44), 334 + width: ScreenUtil().setWidth(48),
  335 + height: ScreenUtil().setWidth(48),
336 ), 336 ),
337 activeIcon: Image( 337 activeIcon: Image(
338 image: AssetImage("assets/my_selected.png"), 338 image: AssetImage("assets/my_selected.png"),
339 - width: ScreenUtil().setWidth(44),  
340 - height: ScreenUtil().setWidth(44), 339 + width: ScreenUtil().setWidth(48),
  340 + height: ScreenUtil().setWidth(48),
341 ), 341 ),
342 title: Text( 342 title: Text(
343 "我的", 343 "我的",
@@ -45,7 +45,7 @@ class MyPageState extends State<MyPage> { @@ -45,7 +45,7 @@ class MyPageState extends State<MyPage> {
45 return Stack( 45 return Stack(
46 children: <Widget>[ 46 children: <Widget>[
47 Padding( 47 Padding(
48 - padding: EdgeInsets.only(top: ScreenUtil().setHeight(242+121)), 48 + padding: EdgeInsets.only(top: ScreenUtil().setHeight(242 + 121)),
49 child: Column( 49 child: Column(
50 children: <Widget>[ 50 children: <Widget>[
51 VEmptyView(44), 51 VEmptyView(44),
@@ -166,7 +166,7 @@ class MyPageState extends State<MyPage> { @@ -166,7 +166,7 @@ class MyPageState extends State<MyPage> {
166 )), 166 )),
167 Container( 167 Container(
168 width: double.infinity, 168 width: double.infinity,
169 - height: ScreenUtil().setHeight(242+121), 169 + height: ScreenUtil().setHeight(242 + 121),
170 alignment: Alignment.centerLeft, 170 alignment: Alignment.centerLeft,
171 color: MyColours.color_199095, 171 color: MyColours.color_199095,
172 child: Scaffold( 172 child: Scaffold(
@@ -174,14 +174,14 @@ class MyPageState extends State<MyPage> { @@ -174,14 +174,14 @@ class MyPageState extends State<MyPage> {
174 appBar: AppBar( 174 appBar: AppBar(
175 backgroundColor: Colors.transparent, //把appbar的背景色改成透明 175 backgroundColor: Colors.transparent, //把appbar的背景色改成透明
176 elevation: 0, //appbar的阴影 176 elevation: 0, //appbar的阴影
  177 + centerTitle: true, // 标题居中
177 title: Text( 178 title: Text(
178 '我的', 179 '我的',
179 - style: TextStyle(  
180 - color: MyColours.color_fefefe,  
181 - fontSize: ScreenUtil().setSp(34),  
182 - fontWeight: FontWeight.normal,  
183 - decoration: TextDecoration.none  
184 - ), 180 + style: TextStyle(
  181 + color: MyColours.color_fefefe,
  182 + fontSize: ScreenUtil().setSp(34),
  183 + fontWeight: FontWeight.normal,
  184 + decoration: TextDecoration.none),
185 )), 185 )),
186 body: Consumer<UserModel>( 186 body: Consumer<UserModel>(
187 builder: 187 builder:
@@ -215,6 +215,7 @@ class MyPageState extends State<MyPage> { @@ -215,6 +215,7 @@ class MyPageState extends State<MyPage> {
215 ], 215 ],
216 ); 216 );
217 // TODO: implement build 217 // TODO: implement build
  218 + /* 原来的
218 return Container( 219 return Container(
219 width: double.infinity, 220 width: double.infinity,
220 height: double.infinity, 221 height: double.infinity,
@@ -371,5 +372,6 @@ class MyPageState extends State<MyPage> { @@ -371,5 +372,6 @@ class MyPageState extends State<MyPage> {
371 ], 372 ],
372 ), 373 ),
373 ); 374 );
  375 + */
374 } 376 }
375 } 377 }
@@ -194,7 +194,7 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -194,7 +194,7 @@ class SelectTablePageState extends State<SelectTablePage> {
194 child: Row( 194 child: Row(
195 children: <Widget>[ 195 children: <Widget>[
196 Container( 196 Container(
197 - width: ScreenUtil().setWidth(189), 197 + width: ScreenUtil().setWidth(170),
198 height: double.infinity, 198 height: double.infinity,
199 color: MyColours.color_f1f1f1, 199 color: MyColours.color_f1f1f1,
200 child: ListView.builder( 200 child: ListView.builder(
@@ -212,87 +212,102 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -212,87 +212,102 @@ class SelectTablePageState extends State<SelectTablePage> {
212 ), 212 ),
213 Expanded( 213 Expanded(
214 child: Padding( 214 child: Padding(
215 - padding: EdgeInsets.symmetric(  
216 - vertical: ScreenUtil().setHeight(10),  
217 - horizontal: ScreenUtil().setWidth(9)),  
218 - child: GridView.builder(  
219 - gridDelegate:  
220 - SliverGridDelegateWithFixedCrossAxisCount(  
221 - crossAxisCount: 3, childAspectRatio: 0.8),  
222 - itemBuilder: (context, index) {  
223 - return TableItem(  
224 - areaTableMap[currentArea][index],  
225 - onSelected: (table) {  
226 - if ((table as t.Table).selected) {  
227 - selectTables.add(table);  
228 - widget.tableList  
229 - .add(tableToTableList(table));  
230 - } else {  
231 - widget.tableList  
232 - .removeWhere((t) => t.id == table.id);  
233 - selectTables  
234 - .removeWhere((t) => t.id == table.id);  
235 - }  
236 - },  
237 - canSelected: true,  
238 - canChoose: widget.canChoose,  
239 - tableMap: tableMap,  
240 - rid: widget.rid);  
241 - },  
242 - itemCount: areaTableMap[currentArea].length,  
243 - ),  
244 - ), 215 + padding: EdgeInsets.symmetric(
  216 + vertical: ScreenUtil().setHeight(10),
  217 + horizontal: ScreenUtil().setWidth(9)),
  218 + child: Column(
  219 + children: [
  220 + Expanded(
  221 + child: GridView.builder(
  222 + gridDelegate:
  223 + SliverGridDelegateWithFixedCrossAxisCount(
  224 + crossAxisCount: 3,
  225 + childAspectRatio: 8 / 9),
  226 + itemBuilder: (context, index) {
  227 + return TableItem(
  228 + areaTableMap[currentArea][index],
  229 + onSelected: (table) {
  230 + if ((table as t.Table).selected) {
  231 + selectTables.add(table);
  232 + widget.tableList
  233 + .add(tableToTableList(table));
  234 + } else {
  235 + widget.tableList.removeWhere(
  236 + (t) => t.id == table.id);
  237 + selectTables.removeWhere(
  238 + (t) => t.id == table.id);
  239 + }
  240 + },
  241 + canSelected: true,
  242 + canChoose: widget.canChoose,
  243 + tableMap: tableMap,
  244 + rid: widget.rid);
  245 + },
  246 + itemCount: areaTableMap[currentArea].length,
  247 + )),
  248 + Container(
  249 + width: double.infinity,
  250 + height: ScreenUtil().setHeight(84),
  251 + margin: EdgeInsets.only(
  252 + bottom: ScreenUtil().setWidth(50)),
  253 + padding: EdgeInsets.symmetric(
  254 + horizontal:
  255 + ScreenUtil().setWidth(31)),
  256 + alignment: Alignment.center,
  257 + color: MyColours.color_ffffff,
  258 + child: CommonButton(
  259 + content: "确定",
  260 + width: 500,
  261 + height: 84,
  262 + fontSize: 34,
  263 + state: 1,
  264 + onPress: () {
  265 + if (widget.canChoose) {
  266 + // if (widget.tableList.length > 0) {
  267 + String tid = "";
  268 + for (TableList table
  269 + in widget.tableList) {
  270 + tid += table.id + ",";
  271 + }
  272 + if (widget.tableList.length > 0) {
  273 + tid = tid.substring(
  274 + 0, tid.length - 1);
  275 + }
  276 +
  277 + Map temp = {
  278 + 'object': widget.tableList,
  279 + 'tid': tid
  280 + };
  281 + Navigator.of(context).pop(temp);
  282 + // }
  283 + } else {
  284 + if (selectTables.length > 0) {
  285 + String tid = "";
  286 + for (t.Table table
  287 + in selectTables) {
  288 + tid += table.id + ",";
  289 + }
  290 + if (selectTables.length > 0) {
  291 + tid = tid.substring(
  292 + 0, tid.length - 1);
  293 + }
  294 +
  295 + Map temp = {
  296 + 'object': widget.tableList,
  297 + 'tid': tid
  298 + };
  299 + Navigator.of(context).pop(temp);
  300 + }
  301 + }
  302 + },
  303 + )),
  304 + ],
  305 + )),
245 ) 306 )
246 ], 307 ],
247 ), 308 ),
248 ), 309 ),
249 ), 310 ),
250 - Container(  
251 - width: double.infinity,  
252 - height: ScreenUtil().setHeight(100),  
253 - alignment: Alignment.center,  
254 - decoration: BoxDecoration(  
255 - color: MyColours.color_ffffff,  
256 - border: Border(  
257 - top: BorderSide(  
258 - color: MyColours.color_bfbfbf,  
259 - width: ScreenUtil().setHeight(1)))),  
260 - child: CommonButton(  
261 - content: "确定",  
262 - width: 600,  
263 - height: 84,  
264 - fontSize: 34,  
265 - state: 1,  
266 - onPress: () {  
267 - if (widget.canChoose) {  
268 - // if (widget.tableList.length > 0) {  
269 - String tid = "";  
270 - for (TableList table in widget.tableList) {  
271 - tid += table.id + ",";  
272 - }  
273 - if (widget.tableList.length > 0) {  
274 - tid = tid.substring(0, tid.length - 1);  
275 - }  
276 -  
277 - Map temp = {'object': widget.tableList, 'tid': tid};  
278 - Navigator.of(context).pop(temp);  
279 - // }  
280 - } else {  
281 - if (selectTables.length > 0) {  
282 - String tid = "";  
283 - for (t.Table table in selectTables) {  
284 - tid += table.id + ",";  
285 - }  
286 - if (selectTables.length > 0) {  
287 - tid = tid.substring(0, tid.length - 1);  
288 - }  
289 -  
290 - Map temp = {'object': widget.tableList, 'tid': tid};  
291 - Navigator.of(context).pop(temp);  
292 - }  
293 - }  
294 - },  
295 - ))  
296 ], 311 ],
297 ), 312 ),
298 ); 313 );
@@ -44,4 +44,6 @@ class MyColours { @@ -44,4 +44,6 @@ class MyColours {
44 static const Color color_6AB6B9 = Color(0xff6AB6B9); 44 static const Color color_6AB6B9 = Color(0xff6AB6B9);
45 static const Color color_74BBBE = Color(0xff74BBBE); 45 static const Color color_74BBBE = Color(0xff74BBBE);
46 static const Color color_E0E0E0 = Color(0xffE0E0E0); 46 static const Color color_E0E0E0 = Color(0xffE0E0E0);
  47 + static const Color color_E95750 = Color(0xffE95750);
  48 + static const Color color_A9E3E6 = Color(0xffA9E3E6);
47 } 49 }
@@ -3,6 +3,7 @@ import 'dart:convert'; @@ -3,6 +3,7 @@ import 'dart:convert';
3 import 'package:flutter/material.dart'; 3 import 'package:flutter/material.dart';
4 import 'package:flutter_picker/flutter_picker.dart'; 4 import 'package:flutter_picker/flutter_picker.dart';
5 import 'package:flutter_screenutil/flutter_screenutil.dart'; 5 import 'package:flutter_screenutil/flutter_screenutil.dart';
  6 +import 'package:one_key/constant/constant.dart';
6 import 'package:one_key/pages/message/message_dialog_item.dart'; 7 import 'package:one_key/pages/message/message_dialog_item.dart';
7 import 'package:one_key/provider/message_dialog_model.dart'; 8 import 'package:one_key/provider/message_dialog_model.dart';
8 import 'package:one_key/res/colors.dart'; 9 import 'package:one_key/res/colors.dart';
@@ -224,7 +225,8 @@ class DialogUtil { @@ -224,7 +225,8 @@ class DialogUtil {
224 color: Colors.white), 225 color: Colors.white),
225 ), 226 ),
226 calendarStyle: CalendarStyle( 227 calendarStyle: CalendarStyle(
227 - contentPadding: const EdgeInsets.only(bottom: 4.0), 228 + contentPadding:
  229 + EdgeInsets.only(bottom: ScreenUtil().setWidth(8)),
228 weekdayStyle: TextStyle( 230 weekdayStyle: TextStyle(
229 color: MyColours.color_2bb5b7, 231 color: MyColours.color_2bb5b7,
230 fontSize: ScreenUtil().setSp(32)), 232 fontSize: ScreenUtil().setSp(32)),
@@ -239,7 +241,8 @@ class DialogUtil { @@ -239,7 +241,8 @@ class DialogUtil {
239 return Container( 241 return Container(
240 color: MyColours.color_2bb5b7, 242 color: MyColours.color_2bb5b7,
241 alignment: Alignment.center, 243 alignment: Alignment.center,
242 - margin: EdgeInsets.only(bottom: 20), 244 + margin: EdgeInsets.only(
  245 + bottom: ScreenUtil().setWidth(40)),
243 padding: EdgeInsets.symmetric( 246 padding: EdgeInsets.symmetric(
244 vertical: ScreenUtil().setHeight(25)), 247 vertical: ScreenUtil().setHeight(25)),
245 child: Text( 248 child: Text(
@@ -252,15 +255,22 @@ class DialogUtil { @@ -252,15 +255,22 @@ class DialogUtil {
252 }, 255 },
253 dayBuilder: (context, date, _) { 256 dayBuilder: (context, date, _) {
254 return Container( 257 return Container(
255 - height: 100, 258 + height: ScreenUtil().setWidth(200),
256 decoration: BoxDecoration( 259 decoration: BoxDecoration(
257 shape: BoxShape.circle, 260 shape: BoxShape.circle,
258 // color: Colors.blue, 261 // color: Colors.blue,
259 ), 262 ),
260 alignment: Alignment.center, 263 alignment: Alignment.center,
261 - margin: const EdgeInsets.fromLTRB(6, 6, 6, 16),  
262 - padding: const EdgeInsets.only(  
263 - bottom: 4.0, left: 8.0, right: 8.0, top: 4.0), 264 + margin: EdgeInsets.fromLTRB(
  265 + ScreenUtil().setWidth(12),
  266 + ScreenUtil().setWidth(12),
  267 + ScreenUtil().setWidth(12),
  268 + ScreenUtil().setWidth(32)),
  269 + padding: EdgeInsets.only(
  270 + bottom: ScreenUtil().setWidth(8),
  271 + left: ScreenUtil().setWidth(16),
  272 + right: ScreenUtil().setWidth(16),
  273 + top: ScreenUtil().setWidth(8)),
264 child: Text( 274 child: Text(
265 // "${_parseDateDay(date)}", 275 // "${_parseDateDay(date)}",
266 '${date.day}', 276 '${date.day}',
@@ -276,9 +286,16 @@ class DialogUtil { @@ -276,9 +286,16 @@ class DialogUtil {
276 shape: BoxShape.circle, 286 shape: BoxShape.circle,
277 color: MyColours.color_2bb5b7), 287 color: MyColours.color_2bb5b7),
278 alignment: Alignment.center, 288 alignment: Alignment.center,
279 - margin: const EdgeInsets.fromLTRB(6, 6, 6, 16),  
280 - padding: const EdgeInsets.only(  
281 - bottom: 4.0, left: 8.0, right: 8.0, top: 4.0), 289 + margin: EdgeInsets.fromLTRB(
  290 + ScreenUtil().setWidth(12),
  291 + ScreenUtil().setWidth(12),
  292 + ScreenUtil().setWidth(12),
  293 + ScreenUtil().setWidth(32)),
  294 + padding: EdgeInsets.only(
  295 + bottom: ScreenUtil().setWidth(8),
  296 + left: ScreenUtil().setWidth(16),
  297 + right: ScreenUtil().setWidth(16),
  298 + top: ScreenUtil().setWidth(8)),
282 child: Text( 299 child: Text(
283 // "${_parseDateDay(date)}", 300 // "${_parseDateDay(date)}",
284 '${date.day}', 301 '${date.day}',
@@ -293,11 +310,19 @@ class DialogUtil { @@ -293,11 +310,19 @@ class DialogUtil {
293 decoration: BoxDecoration( 310 decoration: BoxDecoration(
294 shape: BoxShape.circle, 311 shape: BoxShape.circle,
295 border: Border.all( 312 border: Border.all(
296 - color: MyColours.color_2bb5b7, width: 1)), 313 + color: MyColours.color_2bb5b7,
  314 + width: ScreenUtil().setWidth(2))),
297 alignment: Alignment.center, 315 alignment: Alignment.center,
298 - margin: const EdgeInsets.fromLTRB(6, 6, 6, 16),  
299 - padding: const EdgeInsets.only(  
300 - bottom: 4.0, left: 8.0, right: 8.0, top: 4.0), 316 + margin: EdgeInsets.fromLTRB(
  317 + ScreenUtil().setWidth(12),
  318 + ScreenUtil().setWidth(12),
  319 + ScreenUtil().setWidth(12),
  320 + ScreenUtil().setWidth(32)),
  321 + padding: EdgeInsets.only(
  322 + bottom: ScreenUtil().setWidth(8),
  323 + left: ScreenUtil().setWidth(16),
  324 + right: ScreenUtil().setWidth(16),
  325 + top: ScreenUtil().setWidth(8)),
301 child: Text( 326 child: Text(
302 // '今', 327 // '今',
303 '${date.day}', 328 '${date.day}',
@@ -325,7 +350,7 @@ class DialogUtil { @@ -325,7 +350,7 @@ class DialogUtil {
325 Positioned( 350 Positioned(
326 right: ScreenUtil().setWidth(27), 351 right: ScreenUtil().setWidth(27),
327 bottom: 0, 352 bottom: 0,
328 - top: 5, 353 + top: ScreenUtil().setWidth(30),
329 child: buildMarker(date)), 354 child: buildMarker(date)),
330 // Align( 355 // Align(
331 // alignment: Alignment.bottomCenter, 356 // alignment: Alignment.bottomCenter,
@@ -398,8 +423,9 @@ class DialogUtil { @@ -398,8 +423,9 @@ class DialogUtil {
398 // decoration: 423 // decoration:
399 // BoxDecoration(shape: BoxShape.circle, color: MyColours.color_2bb5b7), 424 // BoxDecoration(shape: BoxShape.circle, color: MyColours.color_2bb5b7),
400 alignment: Alignment.bottomCenter, 425 alignment: Alignment.bottomCenter,
401 - margin: const EdgeInsets.fromLTRB(6, 6, 6, 0),  
402 - padding: const EdgeInsets.only(top: 10.0), 426 + margin: EdgeInsets.fromLTRB(ScreenUtil().setWidth(12),
  427 + ScreenUtil().setWidth(12), ScreenUtil().setWidth(12), 0),
  428 + padding: EdgeInsets.only(top: ScreenUtil().setWidth(34)),
403 child: Text( 429 child: Text(
404 "${_parseDateDay(date)}", 430 "${_parseDateDay(date)}",
405 style: TextStyle().copyWith( 431 style: TextStyle().copyWith(
@@ -505,11 +531,16 @@ class DialogUtil { @@ -505,11 +531,16 @@ class DialogUtil {
505 adapter: PickerDataAdapter<String>(pickerdata: data), 531 adapter: PickerDataAdapter<String>(pickerdata: data),
506 hideHeader: false, 532 hideHeader: false,
507 cancelText: "取消", 533 cancelText: "取消",
508 - cancelTextStyle: TextStyle(color: MyColours.color_828282, fontSize: 20), 534 + cancelTextStyle: TextStyle(
  535 + color: MyColours.color_828282, fontSize: ScreenUtil().setSp(36)),
509 confirmText: "确定", 536 confirmText: "确定",
510 - confirmTextStyle:  
511 - TextStyle(color: MyColours.color_2bb5b7, fontSize: 20),  
512 - selectedTextStyle: TextStyle(color: Colors.blue), 537 + itemExtent: ScreenUtil().setWidth(80),
  538 + confirmTextStyle: TextStyle(
  539 + color: MyColours.color_2bb5b7, fontSize: ScreenUtil().setSp(36)),
  540 + selectedTextStyle: TextStyle(
  541 + color: MyColours.color_199095, fontSize: ScreenUtil().setSp(32)),
  542 + textStyle: TextStyle(
  543 + color: MyColours.color_353535, fontSize: ScreenUtil().setSp(32)),
513 onConfirm: (Picker picker, List value) { 544 onConfirm: (Picker picker, List value) {
514 print(value.toString()); 545 print(value.toString());
515 if (valueChanged != null) { 546 if (valueChanged != null) {
@@ -84,18 +84,18 @@ class Utils { @@ -84,18 +84,18 @@ class Utils {
84 84
85 //获取当前构建版本号 85 //获取当前构建版本号
86 static Future<int> getCurrBuildNum() async { 86 static Future<int> getCurrBuildNum() async {
87 - PackageInfo packageInfo=await PackageInfo.fromPlatform(); 87 + PackageInfo packageInfo = await PackageInfo.fromPlatform();
88 return int.parse(packageInfo.buildNumber); 88 return int.parse(packageInfo.buildNumber);
89 } 89 }
90 90
91 //获取唯一标识 91 //获取唯一标识
92 static Future<String> getUUID() async { 92 static Future<String> getUUID() async {
93 - DeviceInfoPlugin deviceInfoPlugin=DeviceInfoPlugin();  
94 - if(Platform.isAndroid){  
95 - AndroidDeviceInfo androidDeviceInfo=await deviceInfoPlugin.androidInfo; 93 + DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
  94 + if (Platform.isAndroid) {
  95 + AndroidDeviceInfo androidDeviceInfo = await deviceInfoPlugin.androidInfo;
96 return androidDeviceInfo.androidId; 96 return androidDeviceInfo.androidId;
97 - }else{  
98 - IosDeviceInfo iosDeviceInfo=await deviceInfoPlugin.iosInfo; 97 + } else {
  98 + IosDeviceInfo iosDeviceInfo = await deviceInfoPlugin.iosInfo;
99 return iosDeviceInfo.identifierForVendor; 99 return iosDeviceInfo.identifierForVendor;
100 } 100 }
101 } 101 }
@@ -16,7 +16,7 @@ class NewTableItem extends StatefulWidget { @@ -16,7 +16,7 @@ class NewTableItem extends StatefulWidget {
16 NewTableItem(this.table, 16 NewTableItem(this.table,
17 {this.onSelected, 17 {this.onSelected,
18 this.canSelected = false, 18 this.canSelected = false,
19 - this.height = 183, 19 + this.height = 180,
20 this.isRegionName = false}); 20 this.isRegionName = false});
21 21
22 @override 22 @override
@@ -45,7 +45,7 @@ class NewTableItemState extends State<NewTableItem> { @@ -45,7 +45,7 @@ class NewTableItemState extends State<NewTableItem> {
45 child: Stack( 45 child: Stack(
46 children: <Widget>[ 46 children: <Widget>[
47 Container( 47 Container(
48 - width: ScreenUtil().setWidth(150), 48 + width: ScreenUtil().setWidth(160),
49 height: ScreenUtil().setWidth(widget.height), 49 height: ScreenUtil().setWidth(widget.height),
50 margin: EdgeInsets.only(left:ScreenUtil().setWidth(40)), 50 margin: EdgeInsets.only(left:ScreenUtil().setWidth(40)),
51 decoration: BoxDecoration( 51 decoration: BoxDecoration(
@@ -82,23 +82,27 @@ class NewTableItemState extends State<NewTableItem> { @@ -82,23 +82,27 @@ class NewTableItemState extends State<NewTableItem> {
82 ), 82 ),
83 ), 83 ),
84 Container( 84 Container(
85 - alignment: Alignment.centerLeft,  
86 - margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)), 85 + alignment: Alignment.center,
  86 + padding: EdgeInsets.symmetric(
  87 + horizontal: ScreenUtil().setWidth(24)),
  88 + // margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)),
87 child: Column( 89 child: Column(
88 mainAxisSize: MainAxisSize.min, 90 mainAxisSize: MainAxisSize.min,
89 - crossAxisAlignment: CrossAxisAlignment.start, 91 + crossAxisAlignment: CrossAxisAlignment.center,
  92 + mainAxisAlignment: MainAxisAlignment.center,
90 children: <Widget>[ 93 children: <Widget>[
91 - VEmptyView(20), 94 + VEmptyView(38),
92 Text( 95 Text(
93 table.name, 96 table.name,
  97 + maxLines: 2,
94 style: TextStyle( 98 style: TextStyle(
95 - color: MyColours.color_131313,  
96 - fontSize: ScreenUtil().setSp(30), 99 + color: MyColours.color_353535,
  100 + fontSize: ScreenUtil().setSp(28),
97 decoration: TextDecoration.none, 101 decoration: TextDecoration.none,
98 fontWeight: FontWeight.normal), 102 fontWeight: FontWeight.normal),
99 overflow: TextOverflow.ellipsis, 103 overflow: TextOverflow.ellipsis,
100 ), 104 ),
101 - VEmptyView(5), 105 + VEmptyView(12),
102 Text( 106 Text(
103 (table.reserver == null || table.reserver.isEmpty) 107 (table.reserver == null || table.reserver.isEmpty)
104 ? '${table.tablePnum}人' 108 ? '${table.tablePnum}人'
@@ -106,7 +110,7 @@ class NewTableItemState extends State<NewTableItem> { @@ -106,7 +110,7 @@ class NewTableItemState extends State<NewTableItem> {
106 style: TextStyle( 110 style: TextStyle(
107 color: (table.reserver == null || 111 color: (table.reserver == null ||
108 table.reserver.isEmpty) 112 table.reserver.isEmpty)
109 - ? MyColours.color_777777 113 + ? MyColours.color_353535
110 : MyColours.color_2bb5b7, 114 : MyColours.color_2bb5b7,
111 fontSize: ScreenUtil().setSp(26), 115 fontSize: ScreenUtil().setSp(26),
112 decoration: TextDecoration.none, 116 decoration: TextDecoration.none,
@@ -144,6 +148,7 @@ class NewTableItemState extends State<NewTableItem> { @@ -144,6 +148,7 @@ class NewTableItemState extends State<NewTableItem> {
144 ScreenUtil().setWidth(8)))), 148 ScreenUtil().setWidth(8)))),
145 child: Text( 149 child: Text(
146 table.regionName, 150 table.regionName,
  151 + maxLines: 2,
147 style: TextStyle( 152 style: TextStyle(
148 color: MyColours.color_ffffff, 153 color: MyColours.color_ffffff,
149 fontSize: ScreenUtil().setSp(24), 154 fontSize: ScreenUtil().setSp(24),
@@ -19,7 +19,7 @@ class TableItem extends StatefulWidget { @@ -19,7 +19,7 @@ class TableItem extends StatefulWidget {
19 TableItem(this.table, 19 TableItem(this.table,
20 {this.onSelected, 20 {this.onSelected,
21 this.canSelected = false, 21 this.canSelected = false,
22 - this.height = 183, 22 + this.height = 180,
23 this.canChoose = false, 23 this.canChoose = false,
24 this.rid, 24 this.rid,
25 this.tableMap}); 25 this.tableMap});
@@ -77,11 +77,13 @@ class TableItemState extends State<TableItem> { @@ -77,11 +77,13 @@ class TableItemState extends State<TableItem> {
77 child: Stack( 77 child: Stack(
78 children: <Widget>[ 78 children: <Widget>[
79 Container( 79 Container(
80 - width: ScreenUtil().setWidth(150), 80 + width: ScreenUtil().setWidth(160),
81 height: ScreenUtil().setWidth(widget.height), 81 height: ScreenUtil().setWidth(widget.height),
82 margin: EdgeInsets.all(ScreenUtil().setWidth(9)), 82 margin: EdgeInsets.all(ScreenUtil().setWidth(9)),
83 decoration: BoxDecoration( 83 decoration: BoxDecoration(
84 - color: MyColours.color_a8e2e4, 84 + color: table.signStr == '已停用'
  85 + ? MyColours.color_E0E0E0
  86 + : MyColours.color_A9E3E6,
85 borderRadius: BorderRadius.all( 87 borderRadius: BorderRadius.all(
86 Radius.circular(ScreenUtil().setWidth(8)))), 88 Radius.circular(ScreenUtil().setWidth(8)))),
87 child: Stack( 89 child: Stack(
@@ -114,38 +116,46 @@ class TableItemState extends State<TableItem> { @@ -114,38 +116,46 @@ class TableItemState extends State<TableItem> {
114 ), 116 ),
115 ), 117 ),
116 Container( 118 Container(
117 - alignment: Alignment.centerLeft,  
118 - margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)), 119 + alignment: Alignment.center,
  120 + padding: EdgeInsets.symmetric(
  121 + horizontal: ScreenUtil().setWidth(24)),
  122 + // margin: EdgeInsets.only(left: ScreenUtil().setWidth(20)),
119 child: Column( 123 child: Column(
120 mainAxisSize: MainAxisSize.min, 124 mainAxisSize: MainAxisSize.min,
121 - crossAxisAlignment: CrossAxisAlignment.start, 125 + crossAxisAlignment: CrossAxisAlignment.center,
  126 + mainAxisAlignment: MainAxisAlignment.center,
122 children: <Widget>[ 127 children: <Widget>[
123 - VEmptyView(20), 128 + VEmptyView(38),
124 Text( 129 Text(
125 table.name, 130 table.name,
  131 + maxLines: 2,
126 style: TextStyle( 132 style: TextStyle(
127 - color: MyColours.color_131313,  
128 - fontSize: ScreenUtil().setSp(30), 133 + color: table.signStr == '已停用'
  134 + ? MyColours.color_999999
  135 + : MyColours.color_353535,
  136 + fontSize: ScreenUtil().setSp(28),
129 decoration: TextDecoration.none, 137 decoration: TextDecoration.none,
130 fontWeight: FontWeight.normal), 138 fontWeight: FontWeight.normal),
131 overflow: TextOverflow.ellipsis, 139 overflow: TextOverflow.ellipsis,
132 ), 140 ),
133 - VEmptyView(5), 141 + VEmptyView(12),
134 Text( 142 Text(
135 (table.reserver == null || table.reserver.isEmpty) 143 (table.reserver == null || table.reserver.isEmpty)
136 ? table.tableNum 144 ? table.tableNum
137 : table.reserver, 145 : table.reserver,
138 style: TextStyle( 146 style: TextStyle(
139 - color: (table.reserver == null ||  
140 - table.reserver.isEmpty)  
141 - ? MyColours.color_777777  
142 - : MyColours.color_2bb5b7, 147 + color: table.signStr == '已停用'
  148 + ? MyColours.color_999999
  149 + : (table.reserver == null ||
  150 + table.reserver.isEmpty)
  151 + ? MyColours.color_353535
  152 + : MyColours.color_2bb5b7,
143 fontSize: ScreenUtil().setSp(26), 153 fontSize: ScreenUtil().setSp(26),
144 decoration: TextDecoration.none, 154 decoration: TextDecoration.none,
145 fontWeight: FontWeight.normal), 155 fontWeight: FontWeight.normal),
146 overflow: TextOverflow.ellipsis, 156 overflow: TextOverflow.ellipsis,
147 ), 157 ),
148 - VEmptyView(5), 158 + VEmptyView(6),
149 Text( 159 Text(
150 table.lowStr, 160 table.lowStr,
151 style: TextStyle( 161 style: TextStyle(
@@ -165,11 +175,13 @@ class TableItemState extends State<TableItem> { @@ -165,11 +175,13 @@ class TableItemState extends State<TableItem> {
165 child: table.signStr.isEmpty 175 child: table.signStr.isEmpty
166 ? Container() 176 ? Container()
167 : Container( 177 : Container(
168 - width: ScreenUtil().setWidth(150),  
169 - height: ScreenUtil().setHeight(40), 178 + width: ScreenUtil().setWidth(160),
  179 + height: ScreenUtil().setHeight(36),
170 alignment: Alignment.center, 180 alignment: Alignment.center,
171 decoration: BoxDecoration( 181 decoration: BoxDecoration(
172 - color: MyColours.color_89c0b7, 182 + color: table.signStr == '已停用'
  183 + ? MyColours.color_777777
  184 + : MyColours.color_E95750,
173 borderRadius: BorderRadius.only( 185 borderRadius: BorderRadius.only(
174 bottomLeft: 186 bottomLeft:
175 Radius.circular(ScreenUtil().setWidth(8)), 187 Radius.circular(ScreenUtil().setWidth(8)),