xt / Flutter-ReserveApp · Commits

Go to a project

Commit 9ffa252ce06b136fdbbe514c34a3c881e827e1ac

Authored by gaiyaguang
2 parents 23810e6e 5bd34801
build: skipped

根据商家配置显示联系客户

Inline Side-by-side
Showing 27 changed files with 925 additions and 451 deletions

1.2 KB | W: | H:

1.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.73 KB | W: | H:

1.93 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.58 KB | W: | H:

2.23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.92 KB | W: | H:

2.17 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.22 KB | W: | H:

2.65 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.81 KB | W: | H:

1.11 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

1.92 KB | W: | H:

1.21 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
1 -c8424a7225c7d158c8fb32a172a5bf4c  
  1 +7babc7873f8d177769b987ba4c6c2911
@@ -140,4 +140,4 @@ SPEC CHECKSUMS: @@ -140,4 +140,4 @@ SPEC CHECKSUMS:
140 140
141 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c 141 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
142 142
143 -COCOAPODS: 1.9.1 143 +COCOAPODS: 1.9.3
@@ -366,7 +366,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -366,7 +366,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
366 CommonButton( 366 CommonButton(
367 content: "安排包间", 367 content: "安排包间",
368 width: 669, 368 width: 669,
369 - height: 76, 369 + height: 84,
370 fontSize: 34, 370 fontSize: 34,
371 onPress: () async { 371 onPress: () async {
372 Map map = await NavigatorUtil 372 Map map = await NavigatorUtil
@@ -385,12 +385,12 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -385,12 +385,12 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
385 VEmptyView(20), 385 VEmptyView(20),
386 Container( 386 Container(
387 width: ScreenUtil().setWidth(669), 387 width: ScreenUtil().setWidth(669),
388 - height: ScreenUtil().setHeight(76), 388 + height: ScreenUtil().setWidth(84),
389 decoration: BoxDecoration( 389 decoration: BoxDecoration(
390 border: Border.all( 390 border: Border.all(
391 color: MyColours.color_199095), 391 color: MyColours.color_199095),
392 borderRadius: BorderRadius.circular( 392 borderRadius: BorderRadius.circular(
393 - ScreenUtil().setWidth(5)), 393 + ScreenUtil().setWidth(10)),
394 ), 394 ),
395 child: Row( 395 child: Row(
396 crossAxisAlignment: 396 crossAxisAlignment:
@@ -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().setWidth(185),
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) {
@@ -719,7 +719,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -719,7 +719,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
719 width: ScreenUtil().setWidth(2)), 719 width: ScreenUtil().setWidth(2)),
720 top: BorderSide( 720 top: BorderSide(
721 color: MyColours.color_6AB6B9, 721 color: MyColours.color_6AB6B9,
722 - width: ScreenUtil().setWidth(1)), 722 + width: ScreenUtil().setWidth(2)),
723 left: hasLeftBorder 723 left: hasLeftBorder
724 ? BorderSide( 724 ? BorderSide(
725 color: MyColours.color_6AB6B9, 725 color: MyColours.color_6AB6B9,
@@ -35,7 +35,7 @@ class NotebookDetailPage extends StatefulWidget { @@ -35,7 +35,7 @@ class NotebookDetailPage extends StatefulWidget {
35 final String mid; 35 final String mid;
36 final bool fromNotify; 36 final bool fromNotify;
37 37
38 - NotebookDetailPage(this.rid, {this.fromNotify=false, this.mid}); 38 + NotebookDetailPage(this.rid, {this.fromNotify = false, this.mid});
39 39
40 @override 40 @override
41 State<StatefulWidget> createState() { 41 State<StatefulWidget> createState() {
@@ -94,16 +94,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -94,16 +94,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
94 } 94 }
95 95
96 //设置消息状态 96 //设置消息状态
97 - setMessageStatus(){  
98 - if(widget.mid==null||widget.mid.isEmpty)return; 97 + setMessageStatus() {
  98 + if (widget.mid == null || widget.mid.isEmpty) return;
99 bus.emit("remove_untreated_message", widget.mid); 99 bus.emit("remove_untreated_message", widget.mid);
100 Map<String, String> params = { 100 Map<String, String> params = {
101 "sid": Provider.of<UserModel>(context, listen: false).user.sellerid, 101 "sid": Provider.of<UserModel>(context, listen: false).user.sellerid,
102 "id": widget.mid, 102 "id": widget.mid,
103 "status": "is_handle" 103 "status": "is_handle"
104 }; 104 };
105 - MessageDialogModel messageDialogModel=Provider.of<MessageDialogModel>(context,listen: false);  
106 - messageDialogModel.setMessageStatus(context,params); 105 + MessageDialogModel messageDialogModel =
  106 + Provider.of<MessageDialogModel>(context, listen: false);
  107 + messageDialogModel.setMessageStatus(context, params);
107 } 108 }
108 109
109 @override 110 @override
@@ -126,7 +127,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -126,7 +127,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
126 } 127 }
127 } 128 }
128 }); 129 });
129 - if(detailEntity.status == "4"){ 130 + if (detailEntity.status == "4") {
130 setMessageStatus(); 131 setMessageStatus();
131 } 132 }
132 } 133 }
@@ -653,14 +654,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -653,14 +654,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
653 top: BorderSide( 654 top: BorderSide(
654 color: MyColours.color_dbe3e3, 655 color: MyColours.color_dbe3e3,
655 width: ScreenUtil().setWidth(1)))), 656 width: ScreenUtil().setWidth(1)))),
656 - padding: EdgeInsets.symmetric(  
657 - horizontal: ScreenUtil().setHeight(40)), 657 + padding: EdgeInsets.fromLTRB(
  658 + ScreenUtil().setHeight(40),
  659 + ScreenUtil().setHeight(40),
  660 + ScreenUtil().setHeight(40),
  661 + ScreenUtil().setHeight(0)),
658 margin: EdgeInsets.symmetric( 662 margin: EdgeInsets.symmetric(
659 vertical: ScreenUtil().setHeight(20)), 663 vertical: ScreenUtil().setHeight(20)),
660 child: CommonButton( 664 child: CommonButton(
661 content: "通知客户", 665 content: "通知客户",
662 width: 669, 666 width: 669,
663 - height: 80, 667 + height: 84,
664 fontSize: 34, 668 fontSize: 34,
665 onPress: () { 669 onPress: () {
666 DialogUtil.showShareDialog(context)?.then((value) { 670 DialogUtil.showShareDialog(context)?.then((value) {
@@ -699,7 +703,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -699,7 +703,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
699 : false, 703 : false,
700 child: Container( 704 child: Container(
701 width: double.infinity, 705 width: double.infinity,
702 - height: ScreenUtil().setWidth(80), 706 + height: ScreenUtil().setWidth(84),
703 margin: EdgeInsets.symmetric( 707 margin: EdgeInsets.symmetric(
704 horizontal: ScreenUtil().setHeight(40)), 708 horizontal: ScreenUtil().setHeight(40)),
705 decoration: BoxDecoration( 709 decoration: BoxDecoration(
@@ -707,29 +711,30 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -707,29 +711,30 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
707 color: MyColours.color_199095, 711 color: MyColours.color_199095,
708 width: ScreenUtil().setWidth(2)), 712 width: ScreenUtil().setWidth(2)),
709 borderRadius: 713 borderRadius:
710 - BorderRadius.circular(ScreenUtil().setWidth(5)), 714 + BorderRadius.circular(ScreenUtil().setWidth(10)),
711 ), 715 ),
712 // child: Text('fff'), 716 // child: Text('fff'),
713 child: Material( 717 child: Material(
  718 + color: Colors.transparent,
714 child: Row( 719 child: Row(
715 - children: [  
716 - Expanded(  
717 - child: _cancelAndChangeBtn(() {  
718 - print('点击变更预订');  
719 - NavigatorUtil.goNoteBookChangePage(  
720 - context, detailEntity, widget.rid);  
721 - }, '变更预订')),  
722 - MyDivider(  
723 - ScreenUtil().setWidth(2),  
724 - ScreenUtil().setWidth(50),  
725 - color: MyColours.color_199095,  
726 - ),  
727 - Expanded(  
728 - child: _cancelAndChangeBtn(() {  
729 - _showCancelWidget(context);  
730 - }, '取消预订')),  
731 - ],  
732 - )), 720 + children: [
  721 + Expanded(
  722 + child: _cancelAndChangeBtn(() {
  723 + print('点击变更预订');
  724 + NavigatorUtil.goNoteBookChangePage(
  725 + context, detailEntity, widget.rid);
  726 + }, '变更预订')),
  727 + MyDivider(
  728 + ScreenUtil().setWidth(2),
  729 + ScreenUtil().setWidth(50),
  730 + color: MyColours.color_199095,
  731 + ),
  732 + Expanded(
  733 + child: _cancelAndChangeBtn(() {
  734 + _showCancelWidget(context);
  735 + }, '取消预订')),
  736 + ],
  737 + )),
733 ), 738 ),
734 ), 739 ),
735 VEmptyView(ScreenUtil().setWidth(60)) 740 VEmptyView(ScreenUtil().setWidth(60))
@@ -41,8 +41,8 @@ class HomePage extends StatefulWidget { @@ -41,8 +41,8 @@ class HomePage extends StatefulWidget {
41 class HomePageState extends State<HomePage> with WidgetsBindingObserver { 41 class HomePageState extends State<HomePage> with WidgetsBindingObserver {
42 List<Widget> pages = List<Widget>(); 42 List<Widget> pages = List<Widget>();
43 int _currIndex = 1; 43 int _currIndex = 1;
44 - Color _activeColor = MyColours.color_2bb5b7;  
45 - Color _defaultColor = MyColours.color_bfbfbf; 44 + Color _activeColor = MyColours.color_199095;
  45 + Color _defaultColor = MyColours.color_999999;
46 46
47 Timer timer; 47 Timer timer;
48 48
@@ -58,19 +58,19 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -58,19 +58,19 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
58 pages 58 pages
59 ..add(ChangeNotifierProvider<MessageModel>( 59 ..add(ChangeNotifierProvider<MessageModel>(
60 create: (_) => MessageModel(), 60 create: (_) => MessageModel(),
61 - child: MessagePage(), 61 + child: SafeArea(child: MessagePage()),
62 )) 62 ))
63 ..add(ChangeNotifierProvider<NoteBookModel>( 63 ..add(ChangeNotifierProvider<NoteBookModel>(
64 create: (_) => NoteBookModel(), 64 create: (_) => NoteBookModel(),
65 - child: NoteBookPage(), 65 + child: SafeArea(child: NoteBookPage()),
66 )) 66 ))
67 ..add(ChangeNotifierProvider<MyModel>( 67 ..add(ChangeNotifierProvider<MyModel>(
68 create: (_) => MyModel(), 68 create: (_) => MyModel(),
69 child: MyPage(), 69 child: MyPage(),
70 )); 70 ));
71 - WidgetsBinding.instance.addPostFrameCallback((_){ 71 + WidgetsBinding.instance.addPostFrameCallback((_) {
72 initPlatformState(); 72 initPlatformState();
73 - if(widget.initialIndex==0)return; 73 + if (widget.initialIndex == 0) return;
74 _getIntent(); 74 _getIntent();
75 Future.delayed(Duration(milliseconds: 30000), () { 75 Future.delayed(Duration(milliseconds: 30000), () {
76 ContactModel.getInstance().uploadLocalContact(context); 76 ContactModel.getInstance().uploadLocalContact(context);
@@ -86,9 +86,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -86,9 +86,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
86 //获取点击通知栏的自定义参数 86 //获取点击通知栏的自定义参数
87 _getIntent() async { 87 _getIntent() async {
88 Map param = await Tools().getIntent(); 88 Map param = await Tools().getIntent();
89 - Map notifyParam=param;  
90 - if(Platform.isIOS&&param!=null){  
91 - notifyParam=json.decode(param['custom'].toString()); 89 + Map notifyParam = param;
  90 + if (Platform.isIOS && param != null) {
  91 + notifyParam = json.decode(param['custom'].toString());
92 } 92 }
93 LogUtil.v(param.toString()); 93 LogUtil.v(param.toString());
94 if (notifyParam != null && notifyParam.isNotEmpty) { 94 if (notifyParam != null && notifyParam.isNotEmpty) {
@@ -99,11 +99,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -99,11 +99,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
99 fromNotify: true); 99 fromNotify: true);
100 break; 100 break;
101 case "11": 101 case "11":
102 - NavigatorUtil.goNotebookDetailPage(context, notifyParam['rid'],mid:notifyParam['mid'],  
103 - fromNotify: true); 102 + NavigatorUtil.goNotebookDetailPage(context, notifyParam['rid'],
  103 + mid: notifyParam['mid'], fromNotify: true);
104 break; 104 break;
105 } 105 }
106 - }else{ 106 + } else {
107 getUntreatedMessage(); 107 getUntreatedMessage();
108 } 108 }
109 } 109 }
@@ -148,6 +148,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -148,6 +148,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
148 }, 148 },
149 xgPushDidSetBadge: (String msg) async { 149 xgPushDidSetBadge: (String msg) async {
150 print("flutter xgPushDidSetBadge: $msg"); 150 print("flutter xgPushDidSetBadge: $msg");
  151 +
151 /// 在此可设置应用角标 152 /// 在此可设置应用角标
152 XgFlutterPlugin().setAppBadge(0); 153 XgFlutterPlugin().setAppBadge(0);
153 }, 154 },
@@ -164,9 +165,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -164,9 +165,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
164 print("flutter xgPushDidClearAllIdentifiers: $msg"); 165 print("flutter xgPushDidClearAllIdentifiers: $msg");
165 }, 166 },
166 xgPushClickAction: (Map<String, dynamic> msg) async { 167 xgPushClickAction: (Map<String, dynamic> msg) async {
167 - if(Platform.isIOS&&msg!=null&&msg['custom']!=null){  
168 - Map custom=json.decode(msg['custom'].toString());  
169 - switch(custom["messageType"].toString()){ 168 + if (Platform.isIOS && msg != null && msg['custom'] != null) {
  169 + Map custom = json.decode(msg['custom'].toString());
  170 + switch (custom["messageType"].toString()) {
170 case "10": 171 case "10":
171 NavigatorUtil.goHandleOnlinePage( 172 NavigatorUtil.goHandleOnlinePage(
172 context, custom["rid"].toString(), custom['mid'].toString(), 173 context, custom["rid"].toString(), custom['mid'].toString(),
@@ -174,8 +175,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -174,8 +175,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
174 break; 175 break;
175 case "11": 176 case "11":
176 NavigatorUtil.goNotebookDetailPage( 177 NavigatorUtil.goNotebookDetailPage(
177 - context, custom['rid'].toString(),mid:custom['mid'].toString(),  
178 - fromNotify: true); 178 + context, custom['rid'].toString(),
  179 + mid: custom['mid'].toString(), fromNotify: true);
179 break; 180 break;
180 } 181 }
181 } 182 }
@@ -253,7 +254,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -253,7 +254,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
253 print('inactive'); 254 print('inactive');
254 break; 255 break;
255 case AppLifecycleState.paused: 256 case AppLifecycleState.paused:
256 - print('paused'); 257 + print('paused');
257 break; 258 break;
258 case AppLifecycleState.detached: 259 case AppLifecycleState.detached:
259 print('detached'); 260 print('detached');
@@ -287,7 +288,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -287,7 +288,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
287 // TODO: implement build 288 // TODO: implement build
288 return new Scaffold( 289 return new Scaffold(
289 bottomNavigationBar: BottomNavigationBar( 290 bottomNavigationBar: BottomNavigationBar(
290 - iconSize: ScreenUtil().setWidth(70), 291 + iconSize: ScreenUtil().setWidth(48),
291 unselectedFontSize: ScreenUtil().setSp(22), 292 unselectedFontSize: ScreenUtil().setSp(22),
292 selectedFontSize: ScreenUtil().setSp(22), 293 selectedFontSize: ScreenUtil().setSp(22),
293 backgroundColor: MyColours.color_ffffff, 294 backgroundColor: MyColours.color_ffffff,
@@ -295,13 +296,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -295,13 +296,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
295 BottomNavigationBarItem( 296 BottomNavigationBarItem(
296 icon: Image( 297 icon: Image(
297 image: AssetImage("assets/message_default.png"), 298 image: AssetImage("assets/message_default.png"),
298 - width: ScreenUtil().setWidth(70),  
299 - height: ScreenUtil().setWidth(70), 299 + width: ScreenUtil().setWidth(48),
  300 + height: ScreenUtil().setWidth(48),
300 ), 301 ),
301 activeIcon: Image( 302 activeIcon: Image(
302 image: AssetImage("assets/message_selected.png"), 303 image: AssetImage("assets/message_selected.png"),
303 - width: ScreenUtil().setWidth(70),  
304 - height: ScreenUtil().setWidth(70), 304 + width: ScreenUtil().setWidth(48),
  305 + height: ScreenUtil().setWidth(48),
305 ), 306 ),
306 title: Text( 307 title: Text(
307 "消息中心", 308 "消息中心",
@@ -313,16 +314,16 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -313,16 +314,16 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
313 BottomNavigationBarItem( 314 BottomNavigationBarItem(
314 icon: Image( 315 icon: Image(
315 image: AssetImage("assets/notebook_default.png"), 316 image: AssetImage("assets/notebook_default.png"),
316 - width: ScreenUtil().setWidth(70),  
317 - height: ScreenUtil().setWidth(70), 317 + width: ScreenUtil().setWidth(48),
  318 + height: ScreenUtil().setWidth(48),
318 ), 319 ),
319 activeIcon: Image( 320 activeIcon: Image(
320 image: AssetImage("assets/notebook_selected.png"), 321 image: AssetImage("assets/notebook_selected.png"),
321 - width: ScreenUtil().setWidth(70),  
322 - height: ScreenUtil().setWidth(70), 322 + width: ScreenUtil().setWidth(48),
  323 + height: ScreenUtil().setWidth(48),
323 ), 324 ),
324 title: Text( 325 title: Text(
325 - "预定本", 326 + "已预订",
326 style: TextStyle( 327 style: TextStyle(
327 color: _currIndex == 1 ? _activeColor : _defaultColor, 328 color: _currIndex == 1 ? _activeColor : _defaultColor,
328 fontSize: ScreenUtil().setSp(22)), 329 fontSize: ScreenUtil().setSp(22)),
@@ -331,13 +332,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -331,13 +332,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
331 BottomNavigationBarItem( 332 BottomNavigationBarItem(
332 icon: Image( 333 icon: Image(
333 image: AssetImage("assets/my_default.png"), 334 image: AssetImage("assets/my_default.png"),
334 - width: ScreenUtil().setWidth(70),  
335 - height: ScreenUtil().setWidth(70), 335 + width: ScreenUtil().setWidth(48),
  336 + height: ScreenUtil().setWidth(48),
336 ), 337 ),
337 activeIcon: Image( 338 activeIcon: Image(
338 image: AssetImage("assets/my_selected.png"), 339 image: AssetImage("assets/my_selected.png"),
339 - width: ScreenUtil().setWidth(70),  
340 - height: ScreenUtil().setWidth(70), 340 + width: ScreenUtil().setWidth(48),
  341 + height: ScreenUtil().setWidth(48),
341 ), 342 ),
342 title: Text( 343 title: Text(
343 "我的", 344 "我的",
@@ -355,14 +356,87 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -355,14 +356,87 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
355 _currIndex = index; 356 _currIndex = index;
356 }); 357 });
357 if (_currIndex == 2) { 358 if (_currIndex == 2) {
358 - Utils.changeStatusColor(color: MyColours.color_2bb5b7); 359 + Utils.changeStatusColor(color: MyColours.color_199095);
359 } else { 360 } else {
360 Utils.changeStatusColor(color: MyColours.color_ffffff); 361 Utils.changeStatusColor(color: MyColours.color_ffffff);
361 } 362 }
362 } 363 }
363 }, 364 },
364 ), 365 ),
365 - body: SafeArea(child: pages[_currIndex]), 366 + // bottomNavigationBar: BottomAppBar(
  367 + // shape: CircularNotchedRectangle(),
  368 + // child: Container(
  369 + // height: ScreenUtil().setWidth(98),
  370 + // // padding: EdgeInsets.fromLTRB(0, 12, 0, 8),
  371 + // child: Row(
  372 + // mainAxisSize: MainAxisSize.max,
  373 + // mainAxisAlignment: MainAxisAlignment.spaceAround,
  374 + // crossAxisAlignment: CrossAxisAlignment.center,
  375 + // children: <Widget>[
  376 + // GestureDetector(
  377 + // onTap: () {
  378 + // // onTap(0);
  379 + // },
  380 + // child: Column(
  381 + // mainAxisSize: MainAxisSize.min,
  382 + // children: <Widget>[
  383 + // Image(
  384 + // image: AssetImage("assets/my_selected.png"),
  385 + // width: ScreenUtil().setWidth(44),
  386 + // height: ScreenUtil().setWidth(44),
  387 + // ),
  388 + // Text(
  389 + // "我的",
  390 + // style: TextStyle(
  391 + // color: _currIndex == 2
  392 + // ? _activeColor
  393 + // : _defaultColor,
  394 + // fontSize: ScreenUtil().setSp(22)),
  395 + // )
  396 + // ],
  397 + // )),
  398 + // GestureDetector(
  399 + // onTap: () {
  400 + // // onTap(1);
  401 + // },
  402 + // child: Column(
  403 + // mainAxisSize: MainAxisSize.min,
  404 + // children: <Widget>[
  405 + // Image(
  406 + // image: AssetImage("assets/my_selected.png"),
  407 + // width: ScreenUtil().setWidth(44),
  408 + // height: ScreenUtil().setWidth(44),
  409 + // ),
  410 + // Text(
  411 + // "我的",
  412 + // style: TextStyle(
  413 + // color: _currIndex == 2
  414 + // ? _activeColor
  415 + // : _defaultColor,
  416 + // fontSize: ScreenUtil().setSp(22)),
  417 + // )
  418 + // ],
  419 + // )),
  420 + // Column(
  421 + // mainAxisSize: MainAxisSize.min,
  422 + // children: <Widget>[
  423 + // Image(
  424 + // image: AssetImage("assets/my_selected.png"),
  425 + // width: ScreenUtil().setWidth(44),
  426 + // height: ScreenUtil().setWidth(44),
  427 + // ),
  428 + // Text(
  429 + // "我的",
  430 + // style: TextStyle(
  431 + // color:
  432 + // _currIndex == 2 ? _activeColor : _defaultColor,
  433 + // fontSize: ScreenUtil().setSp(22)),
  434 + // )
  435 + // ],
  436 + // )
  437 + // ])),
  438 + // ),
  439 + body: pages[_currIndex],
366 ); 440 );
367 } 441 }
368 442
@@ -37,11 +37,11 @@ class MessagePageState extends State<MessagePage>{ @@ -37,11 +37,11 @@ class MessagePageState extends State<MessagePage>{
37 Tab(text: "未处理",), 37 Tab(text: "未处理",),
38 Tab(text: "已处理",) 38 Tab(text: "已处理",)
39 ], 39 ],
40 - indicatorColor: MyColours.color_2bb5b7, 40 + indicatorColor: MyColours.color_199095,
41 indicatorSize: TabBarIndicatorSize.label, 41 indicatorSize: TabBarIndicatorSize.label,
42 indicatorWeight: ScreenUtil().setHeight(4.0), 42 indicatorWeight: ScreenUtil().setHeight(4.0),
43 - labelColor: MyColours.color_2bb5b7,  
44 - unselectedLabelColor: MyColours.color_353535, 43 + labelColor: MyColours.color_199095,
  44 + unselectedLabelColor: MyColours.color_999999,
45 labelStyle: TextStyle(fontSize: ScreenUtil().setSp(32),fontWeight: FontWeight.bold), 45 labelStyle: TextStyle(fontSize: ScreenUtil().setSp(32),fontWeight: FontWeight.bold),
46 ), 46 ),
47 ), 47 ),
@@ -61,4 +61,4 @@ class MessagePageState extends State<MessagePage>{ @@ -61,4 +61,4 @@ class MessagePageState extends State<MessagePage>{
61 ), 61 ),
62 ); 62 );
63 } 63 }
64 -}  
  64 +}
@@ -108,9 +108,9 @@ class MessageItem extends StatelessWidget { @@ -108,9 +108,9 @@ class MessageItem extends StatelessWidget {
108 child:Offstage( 108 child:Offstage(
109 offstage: isTreated?true:false, 109 offstage: isTreated?true:false,
110 child: CommonButton( 110 child: CommonButton(
111 - width: 160,  
112 - height: 48,  
113 - fontSize: 28, 111 + width: 152,
  112 + height: 50,
  113 + fontSize: 30,
114 content:message.message_type=="10"?"立即处理":"立即查看", 114 content:message.message_type=="10"?"立即处理":"立即查看",
115 state: 1, 115 state: 1,
116 onPress: () { 116 onPress: () {
@@ -11,7 +11,7 @@ import 'package:one_key/widgets/my_item.dart'; @@ -11,7 +11,7 @@ import 'package:one_key/widgets/my_item.dart';
11 import 'package:one_key/widgets/v_empty_view.dart'; 11 import 'package:one_key/widgets/v_empty_view.dart';
12 import 'package:provider/provider.dart'; 12 import 'package:provider/provider.dart';
13 13
14 -class MyPage extends StatefulWidget{ 14 +class MyPage extends StatefulWidget {
15 @override 15 @override
16 State<StatefulWidget> createState() { 16 State<StatefulWidget> createState() {
17 // TODO: implement createState 17 // TODO: implement createState
@@ -19,121 +19,359 @@ class MyPage extends StatefulWidget{ @@ -19,121 +19,359 @@ class MyPage extends StatefulWidget{
19 } 19 }
20 } 20 }
21 21
22 -class MyPageState extends State<MyPage>{  
23 -  
24 - String cur_version="";  
25 - bool newVersion=false; 22 +class MyPageState extends State<MyPage> {
  23 + String cur_version = "";
  24 + bool newVersion = false;
26 25
27 @override 26 @override
28 void initState() { 27 void initState() {
29 // TODO: implement initState 28 // TODO: implement initState
30 super.initState(); 29 super.initState();
31 - Utils.getCurrVersion().then((version){ 30 + Utils.getCurrVersion().then((version) {
32 setState(() { 31 setState(() {
33 - cur_version="v"+version; 32 + cur_version = "v" + version;
34 }); 33 });
35 }); 34 });
36 } 35 }
37 36
38 //检查版本更新 37 //检查版本更新
39 - checkUpdate(){  
40 - UpdateModel updateModel=new UpdateModel(); 38 + checkUpdate() {
  39 + UpdateModel updateModel = new UpdateModel();
41 updateModel.checkUpdate(context); 40 updateModel.checkUpdate(context);
42 } 41 }
43 42
44 @override 43 @override
45 Widget build(BuildContext context) { 44 Widget build(BuildContext context) {
  45 + return Stack(
  46 + children: <Widget>[
  47 + Padding(
  48 + padding: EdgeInsets.only(top: ScreenUtil().setHeight(242 + 121)),
  49 + child: Column(
  50 + children: <Widget>[
  51 + VEmptyView(44),
  52 + MyItem(
  53 + title: "联系客服",
  54 + content: "09:00~21:00",
  55 + callback: () {
  56 + Utils.goPhone("400-000-9690");
  57 + },
  58 + ),
  59 + MyDivider(
  60 + double.infinity,
  61 + ScreenUtil().setHeight(1),
  62 + color: MyColours.color_f3f3f3,
  63 + ),
  64 + MyItem(
  65 + title: "帮助与反馈",
  66 + content: "",
  67 + callback: () {
  68 + Utils.goHelp(context);
  69 + },
  70 + ),
  71 + MyDivider(double.infinity, ScreenUtil().setHeight(1),
  72 + color: MyColours.color_f3f3f3),
  73 + GestureDetector(
  74 + onTap: checkUpdate,
  75 + child: Container(
  76 + width: double.infinity,
  77 + height: ScreenUtil().setHeight(122),
  78 + color: MyColours.color_ffffff,
  79 + padding: EdgeInsets.symmetric(
  80 + horizontal: ScreenUtil().setWidth(40)),
  81 + alignment: Alignment.center,
  82 + child: Row(
  83 + children: <Widget>[
  84 + Text(
  85 + "版本更新",
  86 + style: TextStyle(
  87 + fontSize: ScreenUtil().setSp(30),
  88 + color: MyColours.color_353535),
  89 + ),
  90 + Spacer(),
  91 + newVersion
  92 + ? Container(
  93 + width: ScreenUtil().setWidth(120),
  94 + height: ScreenUtil().setWidth(34),
  95 + decoration: BoxDecoration(
  96 + color: MyColours.color_E14553,
  97 + borderRadius: BorderRadius.all(
  98 + Radius.circular(
  99 + ScreenUtil().setWidth(6))),
  100 + ),
  101 + child: Center(
  102 + child: Text(
  103 + "发现新版本",
  104 + style: TextStyle(
  105 + fontSize: ScreenUtil().setSp(24),
  106 + color: MyColours.color_ffffff),
  107 + ),
  108 + ),
  109 + )
  110 + : Text(
  111 + cur_version,
  112 + style: TextStyle(
  113 + fontSize: ScreenUtil().setSp(28),
  114 + color: MyColours.color_666666),
  115 + ),
  116 + HEmptyView(20),
  117 + Image.asset(
  118 + "assets/arr_right_gray.png",
  119 + width: ScreenUtil().setWidth(14),
  120 + height: ScreenUtil().setWidth(22),
  121 + )
  122 + ],
  123 + ),
  124 + ),
  125 + ),
  126 + MyDivider(
  127 + double.infinity,
  128 + ScreenUtil().setHeight(1),
  129 + color: MyColours.color_f3f3f3,
  130 + ),
  131 + VEmptyView(40),
  132 + Consumer<UserModel>(
  133 + builder:
  134 + (BuildContext context, UserModel model, Widget child) {
  135 + return GestureDetector(
  136 + onTap: () {
  137 + model.showLoginOutDialog(context);
  138 + },
  139 + child: Container(
  140 + height: ScreenUtil().setHeight(122),
  141 + color: MyColours.color_ffffff,
  142 + child: Center(
  143 + child: Row(
  144 + mainAxisSize: MainAxisSize.min,
  145 + crossAxisAlignment: CrossAxisAlignment.center,
  146 + children: <Widget>[
  147 + Image.asset(
  148 + "assets/icon_exist.png",
  149 + width: ScreenUtil().setWidth(30),
  150 + height: ScreenUtil().setWidth(30),
  151 + ),
  152 + HEmptyView(18),
  153 + Text("退出登录",
  154 + style: TextStyle(
  155 + color: MyColours.color_199095,
  156 + fontSize: ScreenUtil().setSp(34),
  157 + ))
  158 + ],
  159 + ),
  160 + ),
  161 + ),
  162 + );
  163 + },
  164 + )
  165 + ],
  166 + )),
  167 + Container(
  168 + width: double.infinity,
  169 + height: ScreenUtil().setHeight(242 + 121),
  170 + alignment: Alignment.centerLeft,
  171 + color: MyColours.color_199095,
  172 + child: Scaffold(
  173 + backgroundColor: Colors.transparent, //把scaffold的背景色改成透明
  174 + appBar: AppBar(
  175 + backgroundColor: Colors.transparent, //把appbar的背景色改成透明
  176 + elevation: 0, //appbar的阴影
  177 + centerTitle: true, // 标题居中
  178 + title: Text(
  179 + '我的',
  180 + style: TextStyle(
  181 + color: MyColours.color_fefefe,
  182 + fontSize: ScreenUtil().setSp(34),
  183 + fontWeight: FontWeight.normal,
  184 + decoration: TextDecoration.none),
  185 + )),
  186 + body: Consumer<UserModel>(
  187 + builder:
  188 + (BuildContext context, UserModel model, Widget child) {
  189 + return Padding(
  190 + padding:
  191 + EdgeInsets.only(left: ScreenUtil().setWidth(40)),
  192 + child: Column(
  193 + crossAxisAlignment: CrossAxisAlignment.start,
  194 + children: <Widget>[
  195 + VEmptyView(38),
  196 + Text(
  197 + model.user.sellername,
  198 + style: TextStyle(
  199 + color: MyColours.color_ffffff,
  200 + fontSize: ScreenUtil().setSp(36)),
  201 + ),
  202 + VEmptyView(38),
  203 + Text(
  204 + model.user.account +
  205 + " | " +
  206 + model.user.role_name,
  207 + style: TextStyle(
  208 + color: MyColours.color_ffffff,
  209 + fontSize: ScreenUtil().setSp(30)),
  210 + ),
  211 + ],
  212 + ));
  213 + },
  214 + )))
  215 + ],
  216 + );
46 // TODO: implement build 217 // TODO: implement build
  218 + /* 原来的
47 return Container( 219 return Container(
48 width: double.infinity, 220 width: double.infinity,
49 height: double.infinity, 221 height: double.infinity,
50 color: MyColours.color_f5f5f5, 222 color: MyColours.color_f5f5f5,
51 child: Column( 223 child: Column(
52 children: <Widget>[ 224 children: <Widget>[
53 - MyAppBar("我的",showBack: false,backgroundColor: MyColours.color_2bb5b7,fontColor: MyColours.color_fefefe,), 225 + MyAppBar(
  226 + "我的",
  227 + showBack: false,
  228 + backgroundColor: MyColours.color_199095,
  229 + fontColor: MyColours.color_fefefe,
  230 + ),
54 Container( 231 Container(
55 - width: double.infinity,  
56 - height: ScreenUtil().setHeight(242),  
57 - alignment: Alignment.centerLeft,  
58 - padding: EdgeInsets.only(left: ScreenUtil().setWidth(40)),  
59 - color: MyColours.color_2bb5b7,  
60 - child: Consumer<UserModel>(builder: (BuildContext context,UserModel model,Widget child){  
61 - return Column(  
62 - crossAxisAlignment: CrossAxisAlignment.start,  
63 - children: <Widget>[  
64 - VEmptyView(38),  
65 - Text(model.user.sellername,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(36)),),  
66 - VEmptyView(38),  
67 - Text(model.user.account+" | "+model.user.role_name,style: TextStyle(color: MyColours.color_ffffff,fontSize: ScreenUtil().setSp(30)),),  
68 - ],  
69 - );  
70 - },)  
71 - ), 232 + width: double.infinity,
  233 + height: ScreenUtil().setHeight(242),
  234 + alignment: Alignment.centerLeft,
  235 + padding: EdgeInsets.only(left: ScreenUtil().setWidth(40)),
  236 + color: MyColours.color_199095,
  237 + child: Consumer<UserModel>(
  238 + builder: (BuildContext context, UserModel model, Widget child) {
  239 + return Column(
  240 + crossAxisAlignment: CrossAxisAlignment.start,
  241 + children: <Widget>[
  242 + VEmptyView(38),
  243 + Text(
  244 + model.user.sellername,
  245 + style: TextStyle(
  246 + color: MyColours.color_ffffff,
  247 + fontSize: ScreenUtil().setSp(36)),
  248 + ),
  249 + VEmptyView(38),
  250 + Text(
  251 + model.user.account + " | " + model.user.role_name,
  252 + style: TextStyle(
  253 + color: MyColours.color_ffffff,
  254 + fontSize: ScreenUtil().setSp(30)),
  255 + ),
  256 + ],
  257 + );
  258 + },
  259 + )),
72 VEmptyView(44), 260 VEmptyView(44),
73 - MyItem(title:"联系客服",content:"09:00~21:00",callback: (){  
74 - Utils.goPhone("400-000-9690");  
75 - },),  
76 - MyDivider(double.infinity,ScreenUtil().setHeight(1),color: MyColours.color_f3f3f3,),  
77 - MyItem(title:"帮助与反馈",content:"",callback: (){  
78 - Utils.goHelp(context);  
79 - },),  
80 - MyDivider(double.infinity,ScreenUtil().setHeight(1),color: MyColours.color_f3f3f3), 261 + MyItem(
  262 + title: "联系客服",
  263 + content: "09:00~21:00",
  264 + callback: () {
  265 + Utils.goPhone("400-000-9690");
  266 + },
  267 + ),
  268 + MyDivider(
  269 + double.infinity,
  270 + ScreenUtil().setHeight(1),
  271 + color: MyColours.color_f3f3f3,
  272 + ),
  273 + MyItem(
  274 + title: "帮助与反馈",
  275 + content: "",
  276 + callback: () {
  277 + Utils.goHelp(context);
  278 + },
  279 + ),
  280 + MyDivider(double.infinity, ScreenUtil().setHeight(1),
  281 + color: MyColours.color_f3f3f3),
81 GestureDetector( 282 GestureDetector(
82 onTap: checkUpdate, 283 onTap: checkUpdate,
83 child: Container( 284 child: Container(
84 width: double.infinity, 285 width: double.infinity,
85 height: ScreenUtil().setHeight(122), 286 height: ScreenUtil().setHeight(122),
86 color: MyColours.color_ffffff, 287 color: MyColours.color_ffffff,
87 - padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)), 288 + padding:
  289 + EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)),
88 alignment: Alignment.center, 290 alignment: Alignment.center,
89 child: Row( 291 child: Row(
90 children: <Widget>[ 292 children: <Widget>[
91 - Text("版本更新",style: TextStyle(fontSize: ScreenUtil().setSp(30),color: MyColours.color_353535),), 293 + Text(
  294 + "版本更新",
  295 + style: TextStyle(
  296 + fontSize: ScreenUtil().setSp(30),
  297 + color: MyColours.color_353535),
  298 + ),
92 Spacer(), 299 Spacer(),
93 - newVersion?Container(  
94 - width: ScreenUtil().setWidth(120),  
95 - height: ScreenUtil().setWidth(34),  
96 - decoration: BoxDecoration(  
97 - color: MyColours.color_E14553,  
98 - borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(6))),  
99 - ),  
100 - child: Center(  
101 - child: Text("发现新版本",style: TextStyle(fontSize: ScreenUtil().setSp(24),color: MyColours.color_ffffff),),  
102 - ),  
103 - ):  
104 - Text(cur_version,style: TextStyle(fontSize: ScreenUtil().setSp(28),color: MyColours.color_666666),), 300 + newVersion
  301 + ? Container(
  302 + width: ScreenUtil().setWidth(120),
  303 + height: ScreenUtil().setWidth(34),
  304 + decoration: BoxDecoration(
  305 + color: MyColours.color_E14553,
  306 + borderRadius: BorderRadius.all(
  307 + Radius.circular(ScreenUtil().setWidth(6))),
  308 + ),
  309 + child: Center(
  310 + child: Text(
  311 + "发现新版本",
  312 + style: TextStyle(
  313 + fontSize: ScreenUtil().setSp(24),
  314 + color: MyColours.color_ffffff),
  315 + ),
  316 + ),
  317 + )
  318 + : Text(
  319 + cur_version,
  320 + style: TextStyle(
  321 + fontSize: ScreenUtil().setSp(28),
  322 + color: MyColours.color_666666),
  323 + ),
105 HEmptyView(20), 324 HEmptyView(20),
106 - Image.asset("assets/arr_right_gray.png",width: ScreenUtil().setWidth(14),height: ScreenUtil().setWidth(22),) 325 + Image.asset(
  326 + "assets/arr_right_gray.png",
  327 + width: ScreenUtil().setWidth(14),
  328 + height: ScreenUtil().setWidth(22),
  329 + )
107 ], 330 ],
108 ), 331 ),
109 ), 332 ),
110 ), 333 ),
111 - MyDivider(double.infinity,ScreenUtil().setHeight(1),color: MyColours.color_f3f3f3,), 334 + MyDivider(
  335 + double.infinity,
  336 + ScreenUtil().setHeight(1),
  337 + color: MyColours.color_f3f3f3,
  338 + ),
112 VEmptyView(40), 339 VEmptyView(40),
113 - Consumer<UserModel>(builder: (BuildContext context,UserModel model,Widget child){  
114 - return GestureDetector(  
115 - onTap: (){  
116 - model.showLoginOutDialog(context);  
117 - },  
118 - child: Container(  
119 - height: ScreenUtil().setHeight(122),  
120 - color: MyColours.color_ffffff,  
121 - child: Center(  
122 - child: Row(  
123 - mainAxisSize: MainAxisSize.min,  
124 - crossAxisAlignment: CrossAxisAlignment.center,  
125 - children: <Widget>[  
126 - Image.asset("assets/icon_exist.png",width: ScreenUtil().setWidth(30),height: ScreenUtil().setWidth(30),),  
127 - HEmptyView(18),  
128 - Text("退出登录",style: TextStyle(color: MyColours.color_2bb5b7,fontSize: ScreenUtil().setSp(34),))  
129 - ], 340 + Consumer<UserModel>(
  341 + builder: (BuildContext context, UserModel model, Widget child) {
  342 + return GestureDetector(
  343 + onTap: () {
  344 + model.showLoginOutDialog(context);
  345 + },
  346 + child: Container(
  347 + height: ScreenUtil().setHeight(122),
  348 + color: MyColours.color_ffffff,
  349 + child: Center(
  350 + child: Row(
  351 + mainAxisSize: MainAxisSize.min,
  352 + crossAxisAlignment: CrossAxisAlignment.center,
  353 + children: <Widget>[
  354 + Image.asset(
  355 + "assets/icon_exist.png",
  356 + width: ScreenUtil().setWidth(30),
  357 + height: ScreenUtil().setWidth(30),
  358 + ),
  359 + HEmptyView(18),
  360 + Text("退出登录",
  361 + style: TextStyle(
  362 + color: MyColours.color_199095,
  363 + fontSize: ScreenUtil().setSp(34),
  364 + ))
  365 + ],
  366 + ),
130 ), 367 ),
131 ), 368 ),
132 - ),  
133 - );  
134 - },) 369 + );
  370 + },
  371 + )
135 ], 372 ],
136 ), 373 ),
137 ); 374 );
  375 + */
138 } 376 }
139 -}  
  377 +}
@@ -44,7 +44,7 @@ class NotebookItemState extends State<NoteBookItem> { @@ -44,7 +44,7 @@ class NotebookItemState extends State<NoteBookItem> {
44 44
45 return Container( 45 return Container(
46 width: double.infinity, 46 width: double.infinity,
47 - height: ScreenUtil().setHeight(110), 47 + height: ScreenUtil().setWidth(120),
48 color: (widget.index % 2 == 0) 48 color: (widget.index % 2 == 0)
49 ? MyColours.color_f7fdfd 49 ? MyColours.color_f7fdfd
50 : MyColours.color_ffffff, 50 : MyColours.color_ffffff,
@@ -61,9 +61,11 @@ class NotebookItemState extends State<NoteBookItem> { @@ -61,9 +61,11 @@ class NotebookItemState extends State<NoteBookItem> {
61 width: ScreenUtil().setWidth(171), 61 width: ScreenUtil().setWidth(171),
62 alignment: Alignment.center, 62 alignment: Alignment.center,
63 child: Text( 63 child: Text(
64 - notebook.tableinfoStr, 64 + notebook.tableinfoStr?.trim(),
65 style: TextStyle( 65 style: TextStyle(
66 - color: textColor, fontSize: ScreenUtil().setSp(28)), 66 + color: textColor,
  67 + // fontWeight: FontWeight.bold,
  68 + fontSize: ScreenUtil().setSp(30)),
67 ), 69 ),
68 ), 70 ),
69 MyDivider( 71 MyDivider(
@@ -80,13 +82,17 @@ class NotebookItemState extends State<NoteBookItem> { @@ -80,13 +82,17 @@ class NotebookItemState extends State<NoteBookItem> {
80 Text( 82 Text(
81 notebook.rnameStr, 83 notebook.rnameStr,
82 style: TextStyle( 84 style: TextStyle(
83 - color: textColor, fontSize: ScreenUtil().setSp(28)), 85 + color: textColor,
  86 + // fontWeight: FontWeight.bold,
  87 + fontSize: ScreenUtil().setSp(30)),
84 ), 88 ),
85 VEmptyView(10), 89 VEmptyView(10),
86 Text( 90 Text(
87 notebook.phoneStr, 91 notebook.phoneStr,
88 style: TextStyle( 92 style: TextStyle(
89 - color: textColor, fontSize: ScreenUtil().setSp(22)), 93 + color: textColor,
  94 + // fontWeight: FontWeight.bold,
  95 + fontSize: ScreenUtil().setSp(26)),
90 ) 96 )
91 ], 97 ],
92 ), 98 ),
@@ -102,7 +108,9 @@ class NotebookItemState extends State<NoteBookItem> { @@ -102,7 +108,9 @@ class NotebookItemState extends State<NoteBookItem> {
102 child: Text( 108 child: Text(
103 notebook.ddateStr, 109 notebook.ddateStr,
104 style: TextStyle( 110 style: TextStyle(
105 - color: textColor, fontSize: ScreenUtil().setSp(28)), 111 + color: textColor,
  112 + // fontWeight: FontWeight.bold,
  113 + fontSize: ScreenUtil().setSp(30)),
106 ), 114 ),
107 ), 115 ),
108 ], 116 ],
@@ -126,7 +134,8 @@ class NotebookItemState extends State<NoteBookItem> { @@ -126,7 +134,8 @@ class NotebookItemState extends State<NoteBookItem> {
126 notebook.status == "6") 134 notebook.status == "6")
127 ? MyColours.color_bfbfbf 135 ? MyColours.color_bfbfbf
128 : MyColours.color_2bb5b7, 136 : MyColours.color_2bb5b7,
129 - fontSize: ScreenUtil().setSp(28)), 137 + // fontWeight: FontWeight.bold,
  138 + fontSize: ScreenUtil().setSp(30)),
130 ), 139 ),
131 ), 140 ),
132 ), 141 ),
@@ -67,8 +67,9 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -67,8 +67,9 @@ class NoteBookPageState extends State<NoteBookPage> {
67 _initTime() { 67 _initTime() {
68 dateTime = DateTime.now(); 68 dateTime = DateTime.now();
69 dateText = Utils.addZeroNumber(dateTime.month) + 69 dateText = Utils.addZeroNumber(dateTime.month) +
70 - "-" + 70 + "月" +
71 Utils.addZeroNumber(dateTime.day) + 71 Utils.addZeroNumber(dateTime.day) +
  72 + "日" +
72 " 今天"; 73 " 今天";
73 morning = 74 morning =
74 userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning; 75 userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning;
@@ -195,7 +196,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -195,7 +196,7 @@ class NoteBookPageState extends State<NoteBookPage> {
195 "桌号", 196 "桌号",
196 style: TextStyle( 197 style: TextStyle(
197 color: MyColours.color_353535, 198 color: MyColours.color_353535,
198 - fontSize: ScreenUtil().setSp(30)), 199 + fontSize: ScreenUtil().setSp(28)),
199 ), 200 ),
200 ), 201 ),
201 MyDivider( 202 MyDivider(
@@ -210,7 +211,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -210,7 +211,7 @@ class NoteBookPageState extends State<NoteBookPage> {
210 "用户姓名", 211 "用户姓名",
211 style: TextStyle( 212 style: TextStyle(
212 color: MyColours.color_353535, 213 color: MyColours.color_353535,
213 - fontSize: ScreenUtil().setSp(30)), 214 + fontSize: ScreenUtil().setSp(28)),
214 ), 215 ),
215 ), 216 ),
216 MyDivider( 217 MyDivider(
@@ -225,7 +226,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -225,7 +226,7 @@ class NoteBookPageState extends State<NoteBookPage> {
225 "时间", 226 "时间",
226 style: TextStyle( 227 style: TextStyle(
227 color: MyColours.color_353535, 228 color: MyColours.color_353535,
228 - fontSize: ScreenUtil().setSp(30)), 229 + fontSize: ScreenUtil().setSp(28)),
229 ), 230 ),
230 ), 231 ),
231 MyDivider( 232 MyDivider(
@@ -240,7 +241,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -240,7 +241,7 @@ class NoteBookPageState extends State<NoteBookPage> {
240 "操作", 241 "操作",
241 style: TextStyle( 242 style: TextStyle(
242 color: MyColours.color_353535, 243 color: MyColours.color_353535,
243 - fontSize: ScreenUtil().setSp(30)), 244 + fontSize: ScreenUtil().setSp(28)),
244 ), 245 ),
245 ), 246 ),
246 ], 247 ],
@@ -253,8 +254,10 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -253,8 +254,10 @@ class NoteBookPageState extends State<NoteBookPage> {
253 if (Utils.isOneDay(day, dateTime)) return; //日期没变 254 if (Utils.isOneDay(day, dateTime)) return; //日期没变
254 setState(() { 255 setState(() {
255 DateTime dateNow = DateTime.now(); 256 DateTime dateNow = DateTime.now();
256 - dateText =  
257 - Utils.addZeroNumber(day.month) + "-" + Utils.addZeroNumber(day.day); 257 + dateText = Utils.addZeroNumber(day.month) +
  258 + "月" +
  259 + Utils.addZeroNumber(day.day) +
  260 + "日";
258 if (Utils.isOneDay(day, dateNow)) { 261 if (Utils.isOneDay(day, dateNow)) {
259 dateText += " 今天"; 262 dateText += " 今天";
260 } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) { 263 } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
@@ -286,7 +289,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -286,7 +289,7 @@ class NoteBookPageState extends State<NoteBookPage> {
286 Container( 289 Container(
287 color: MyColours.color_ffffff, 290 color: MyColours.color_ffffff,
288 width: double.infinity, 291 width: double.infinity,
289 - padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(11)), 292 + padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(16)),
290 child: Row( 293 child: Row(
291 crossAxisAlignment: CrossAxisAlignment.center, 294 crossAxisAlignment: CrossAxisAlignment.center,
292 children: <Widget>[ 295 children: <Widget>[
@@ -301,84 +304,90 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -301,84 +304,90 @@ class NoteBookPageState extends State<NoteBookPage> {
301 } 304 }
302 }); 305 });
303 }, 306 },
304 - child: Text(  
305 - dateText,  
306 - style: TextStyle(  
307 - color: MyColours.color_2bb5b7,  
308 - fontSize: ScreenUtil().setSp(32)), 307 + child: Container(
  308 + child: Text(
  309 + dateText,
  310 + style: TextStyle(
  311 + color: MyColours.color_199095,
  312 + fontSize: ScreenUtil().setSp(34)),
  313 + ),
309 ), 314 ),
310 ), 315 ),
311 ), 316 ),
312 ), 317 ),
313 MyDivider( 318 MyDivider(
314 ScreenUtil().setWidth(2), 319 ScreenUtil().setWidth(2),
315 - ScreenUtil().setHeight(72),  
316 - color: MyColours.color_ededed, 320 + ScreenUtil().setHeight(68),
  321 + color: MyColours.color_E0E0E0,
317 ), 322 ),
318 Expanded( 323 Expanded(
319 - child: Row(  
320 - mainAxisAlignment: MainAxisAlignment.center,  
321 - crossAxisAlignment: CrossAxisAlignment.center,  
322 - children: <Widget>[  
323 - Offstage(  
324 - offstage: morning == "00:00-00:00" ? true : false,  
325 - child: Padding(  
326 - padding: EdgeInsets.symmetric(  
327 - horizontal: ScreenUtil().setWidth(10)),  
328 - child: CommonButton(  
329 - content: "早市",  
330 - state: currTimeIndex == 1 ? 1 : 0,  
331 - width: ScreenUtil().setWidth(180),  
332 - height: ScreenUtil().setHeight(100),  
333 - fontSize: 32,  
334 - onPress: () {  
335 - if (currTimeIndex == 1) return;  
336 - setState(() {  
337 - currTimeIndex = 1;  
338 - });  
339 - _getReserveList();  
340 - },  
341 - ))),  
342 - Offstage(  
343 - offstage: noon == "00:00-00:00" ? true : false,  
344 - child: Padding(  
345 - padding: EdgeInsets.symmetric(  
346 - horizontal: ScreenUtil().setWidth(10)), 324 + child: Padding(
  325 + padding: EdgeInsets.symmetric(
  326 + horizontal: ScreenUtil().setWidth(30)),
  327 + child: Row(
  328 + mainAxisAlignment: MainAxisAlignment.center,
  329 + crossAxisAlignment: CrossAxisAlignment.center,
  330 + children: <Widget>[
  331 + Offstage(
  332 + offstage: morning == "00:00-00:00" ? true : false,
  333 + child: Padding(
  334 + padding: EdgeInsets.only(
  335 + right: ScreenUtil().setWidth(18)),
  336 + child: CommonButton(
  337 + content: "早市",
  338 + state: currTimeIndex == 1 ? 1 : 0,
  339 + width: 92,
  340 + height: 48,
  341 + fontSize: 32,
  342 + onPress: () {
  343 + if (currTimeIndex == 1) return;
  344 + setState(() {
  345 + currTimeIndex = 1;
  346 + });
  347 + _getReserveList();
  348 + },
  349 + ))),
  350 + Offstage(
  351 + offstage: noon == "00:00-00:00" ? true : false,
  352 + child: Padding(
  353 + padding: EdgeInsets.only(
  354 + right: ScreenUtil().setWidth(18)),
  355 + child: CommonButton(
  356 + content: "午市",
  357 + state: currTimeIndex == 2 ? 1 : 0,
  358 + width: 92,
  359 + height: 48,
  360 + fontSize: 32,
  361 + onPress: () {
  362 + if (currTimeIndex == 2) return;
  363 + setState(() {
  364 + currTimeIndex = 2;
  365 + });
  366 + _getReserveList();
  367 + },
  368 + ))),
  369 + Offstage(
  370 + offstage: night == "00:00-00:00" ? true : false,
  371 + child: Container(
  372 + // padding: EdgeInsets.symmetric(
  373 + // horizontal: ScreenUtil().setWidth(10)),
347 child: CommonButton( 374 child: CommonButton(
348 - content: "午市",  
349 - state: currTimeIndex == 2 ? 1 : 0,  
350 - width: ScreenUtil().setWidth(180),  
351 - height: ScreenUtil().setHeight(100),  
352 - fontSize: 32,  
353 - onPress: () {  
354 - if (currTimeIndex == 2) return;  
355 - setState(() {  
356 - currTimeIndex = 2;  
357 - });  
358 - _getReserveList();  
359 - },  
360 - ))),  
361 - Offstage(  
362 - offstage: night == "00:00-00:00" ? true : false,  
363 - child: Padding(  
364 - padding: EdgeInsets.symmetric(  
365 - horizontal: ScreenUtil().setWidth(10)),  
366 - child: CommonButton(  
367 - content: "晚市",  
368 - state: currTimeIndex == 3 ? 1 : 0,  
369 - width: ScreenUtil().setWidth(180),  
370 - height: ScreenUtil().setHeight(100),  
371 - fontSize: 32,  
372 - onPress: () {  
373 - if (currTimeIndex == 3) return;  
374 - setState(() {  
375 - currTimeIndex = 3;  
376 - });  
377 - _getReserveList();  
378 - },  
379 - )),  
380 - ),  
381 - ], 375 + content: "晚市",
  376 + state: currTimeIndex == 3 ? 1 : 0,
  377 + width: 92,
  378 + height: 48,
  379 + fontSize: 32,
  380 + onPress: () {
  381 + if (currTimeIndex == 3) return;
  382 + setState(() {
  383 + currTimeIndex = 3;
  384 + });
  385 + _getReserveList();
  386 + },
  387 + )),
  388 + ),
  389 + ],
  390 + ),
382 ), 391 ),
383 ) 392 )
384 ], 393 ],
@@ -396,8 +405,8 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -396,8 +405,8 @@ class NoteBookPageState extends State<NoteBookPage> {
396 child: Text( 405 child: Text(
397 total, 406 total,
398 style: TextStyle( 407 style: TextStyle(
399 - color: MyColours.color_131313,  
400 - fontSize: ScreenUtil().setSp(24)), 408 + color: MyColours.color_353535,
  409 + fontSize: ScreenUtil().setSp(26)),
401 ), 410 ),
402 ); 411 );
403 }, 412 },
@@ -98,7 +98,7 @@ class SmsPageState extends State<SmsPage>{ @@ -98,7 +98,7 @@ class SmsPageState extends State<SmsPage>{
98 children: <Widget>[ 98 children: <Widget>[
99 CommonButton( 99 CommonButton(
100 width: 672, 100 width: 672,
101 - height: 76, 101 + height: 84,
102 fontSize: 34, 102 fontSize: 34,
103 content: "直接发送", 103 content: "直接发送",
104 state: 1, 104 state: 1,
@@ -109,7 +109,7 @@ class SmsPageState extends State<SmsPage>{ @@ -109,7 +109,7 @@ class SmsPageState extends State<SmsPage>{
109 VEmptyView(20), 109 VEmptyView(20),
110 CommonButton( 110 CommonButton(
111 width: 672, 111 width: 672,
112 - height: 76, 112 + height: 84,
113 fontSize: 34, 113 fontSize: 34,
114 content: "复制短信", 114 content: "复制短信",
115 state: 0, 115 state: 0,
@@ -127,4 +127,4 @@ class SmsPageState extends State<SmsPage>{ @@ -127,4 +127,4 @@ class SmsPageState extends State<SmsPage>{
127 ); 127 );
128 } 128 }
129 129
130 -}  
  130 +}
@@ -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: 76,  
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 );
@@ -43,4 +43,7 @@ class MyColours { @@ -43,4 +43,7 @@ class MyColours {
43 static const Color color_F1F0F4 = Color(0xffF1F0F4); 43 static const Color color_F1F0F4 = Color(0xffF1F0F4);
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);
  47 + static const Color color_E95750 = Color(0xffE95750);
  48 + static const Color color_A9E3E6 = Color(0xffA9E3E6);
46 } 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) {
@@ -89,18 +89,18 @@ class Utils { @@ -89,18 +89,18 @@ class Utils {
89 89
90 //获取当前构建版本号 90 //获取当前构建版本号
91 static Future<int> getCurrBuildNum() async { 91 static Future<int> getCurrBuildNum() async {
92 - PackageInfo packageInfo=await PackageInfo.fromPlatform(); 92 + PackageInfo packageInfo = await PackageInfo.fromPlatform();
93 return int.parse(packageInfo.buildNumber); 93 return int.parse(packageInfo.buildNumber);
94 } 94 }
95 95
96 //获取唯一标识 96 //获取唯一标识
97 static Future<String> getUUID() async { 97 static Future<String> getUUID() async {
98 - DeviceInfoPlugin deviceInfoPlugin=DeviceInfoPlugin();  
99 - if(Platform.isAndroid){  
100 - AndroidDeviceInfo androidDeviceInfo=await deviceInfoPlugin.androidInfo; 98 + DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
  99 + if (Platform.isAndroid) {
  100 + AndroidDeviceInfo androidDeviceInfo = await deviceInfoPlugin.androidInfo;
101 return androidDeviceInfo.androidId; 101 return androidDeviceInfo.androidId;
102 - }else{  
103 - IosDeviceInfo iosDeviceInfo=await deviceInfoPlugin.iosInfo; 102 + } else {
  103 + IosDeviceInfo iosDeviceInfo = await deviceInfoPlugin.iosInfo;
104 return iosDeviceInfo.identifierForVendor; 104 return iosDeviceInfo.identifierForVendor;
105 } 105 }
106 } 106 }
@@ -9,15 +9,16 @@ class CommonButton extends StatelessWidget { @@ -9,15 +9,16 @@ class CommonButton extends StatelessWidget {
9 final double height; 9 final double height;
10 final double fontSize; 10 final double fontSize;
11 final int state; //-1 不可用 0 默认 1 选中 11 final int state; //-1 不可用 0 默认 1 选中
  12 + final FontWeight fontWeight;
12 13
13 - CommonButton({  
14 - @required this.onPress,  
15 - @required this.content,  
16 - this.state = 0,  
17 - this.width = 250,  
18 - this.height = 50,  
19 - this.fontSize = 18,  
20 - }); 14 + CommonButton(
  15 + {@required this.onPress,
  16 + @required this.content,
  17 + this.state = 0,
  18 + this.width = 250,
  19 + this.height = 50,
  20 + this.fontSize = 18,
  21 + this.fontWeight = FontWeight.normal});
21 22
22 @override 23 @override
23 Widget build(BuildContext context) { 24 Widget build(BuildContext context) {
@@ -27,7 +28,7 @@ class CommonButton extends StatelessWidget { @@ -27,7 +28,7 @@ class CommonButton extends StatelessWidget {
27 case -1: 28 case -1:
28 boxDecoration = BoxDecoration( 29 boxDecoration = BoxDecoration(
29 color: MyColours.color_d8d8d8, 30 color: MyColours.color_d8d8d8,
30 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(5)), 31 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
31 ); 32 );
32 fontColor = MyColours.color_ffffff; 33 fontColor = MyColours.color_ffffff;
33 break; 34 break;
@@ -35,38 +36,39 @@ class CommonButton extends StatelessWidget { @@ -35,38 +36,39 @@ class CommonButton extends StatelessWidget {
35 boxDecoration = BoxDecoration( 36 boxDecoration = BoxDecoration(
36 border: Border.all( 37 border: Border.all(
37 color: MyColours.color_199095, width: ScreenUtil().setWidth(2)), 38 color: MyColours.color_199095, width: ScreenUtil().setWidth(2)),
38 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(5)), 39 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
39 ); 40 );
40 fontColor = MyColours.color_199095; 41 fontColor = MyColours.color_199095;
41 break; 42 break;
42 case 1: 43 case 1:
43 boxDecoration = BoxDecoration( 44 boxDecoration = BoxDecoration(
44 - gradient: LinearGradient(  
45 - colors: [Color(0xff199095), Color(0xff36C3C7)],  
46 - begin: Alignment.topCenter,  
47 - end: Alignment.bottomCenter),  
48 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(5)), 45 + color: MyColours.color_199095,
  46 + // gradient: LinearGradient(
  47 + // colors: [Color(0xff199095), Color(0xff36C3C7)],
  48 + // begin: Alignment.topCenter,
  49 + // end: Alignment.bottomCenter),
  50 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
49 ); 51 );
50 fontColor = MyColours.color_fefefe; 52 fontColor = MyColours.color_fefefe;
51 break; 53 break;
52 case 2: 54 case 2:
53 boxDecoration = BoxDecoration( 55 boxDecoration = BoxDecoration(
54 color: MyColours.color_199095, 56 color: MyColours.color_199095,
55 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(5)), 57 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
56 ); 58 );
57 fontColor = MyColours.color_fefefe; 59 fontColor = MyColours.color_fefefe;
58 break; 60 break;
59 case -2: 61 case -2:
60 boxDecoration = BoxDecoration( 62 boxDecoration = BoxDecoration(
61 color: MyColours.color_74BBBE, 63 color: MyColours.color_74BBBE,
62 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(5)), 64 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
63 ); 65 );
64 fontColor = MyColours.color_fefefe; 66 fontColor = MyColours.color_fefefe;
65 break; 67 break;
66 default: 68 default:
67 boxDecoration = BoxDecoration( 69 boxDecoration = BoxDecoration(
68 border: Border.all(color: MyColours.color_199095), 70 border: Border.all(color: MyColours.color_199095),
69 - borderRadius: BorderRadius.circular(ScreenUtil().setWidth(5)), 71 + borderRadius: BorderRadius.circular(ScreenUtil().setWidth(10)),
70 ); 72 );
71 fontColor = MyColours.color_fefefe; 73 fontColor = MyColours.color_fefefe;
72 break; 74 break;
@@ -78,14 +80,16 @@ class CommonButton extends StatelessWidget { @@ -78,14 +80,16 @@ class CommonButton extends StatelessWidget {
78 onTap: onPress, 80 onTap: onPress,
79 child: Container( 81 child: Container(
80 width: ScreenUtil().setWidth(width), 82 width: ScreenUtil().setWidth(width),
81 - height: ScreenUtil().setHeight(height), 83 + height: ScreenUtil().setWidth(height),
82 decoration: boxDecoration, 84 decoration: boxDecoration,
83 child: Align( 85 child: Align(
84 alignment: Alignment.center, 86 alignment: Alignment.center,
85 child: Text( 87 child: Text(
86 content, 88 content,
87 style: TextStyle( 89 style: TextStyle(
88 - color: fontColor, fontSize: ScreenUtil().setSp(fontSize)), 90 + color: fontColor,
  91 + fontWeight: fontWeight,
  92 + fontSize: ScreenUtil().setSp(fontSize)),
89 ), 93 ),
90 ), 94 ),
91 ), 95 ),
@@ -5,15 +5,15 @@ import 'package:one_key/res/colors.dart'; @@ -5,15 +5,15 @@ import 'package:one_key/res/colors.dart';
5 import 'package:one_key/models/table.dart' as t; 5 import 'package:one_key/models/table.dart' as t;
6 import 'package:one_key/widgets/v_empty_view.dart'; 6 import 'package:one_key/widgets/v_empty_view.dart';
7 7
8 -class NeedItem extends StatefulWidget{  
9 - 8 +class NeedItem extends StatefulWidget {
10 final t.Table table; 9 final t.Table table;
11 - final bool canSelected;//是否能选中 10 + final bool canSelected; //是否能选中
12 final ValueChanged onSelected; 11 final ValueChanged onSelected;
13 12
14 - final int height;//高度 13 + final int height; //高度
15 14
16 - NeedItem(this.table,{this.onSelected,this.canSelected=false,this.height=183}); 15 + NeedItem(this.table,
  16 + {this.onSelected, this.canSelected = false, this.height = 183});
17 17
18 @override 18 @override
19 State<StatefulWidget> createState() { 19 State<StatefulWidget> createState() {
@@ -22,19 +22,18 @@ class NeedItem extends StatefulWidget{ @@ -22,19 +22,18 @@ class NeedItem extends StatefulWidget{
22 } 22 }
23 } 23 }
24 24
25 -class NeedItemState extends State<NeedItem>{  
26 - 25 +class NeedItemState extends State<NeedItem> {
27 @override 26 @override
28 Widget build(BuildContext context) { 27 Widget build(BuildContext context) {
29 // TODO: implement build 28 // TODO: implement build
30 29
31 - t.Table table=widget.table; 30 + t.Table table = widget.table;
32 31
33 return GestureDetector( 32 return GestureDetector(
34 - onTap: (){  
35 - if(widget.canSelected&&table.signStr.isEmpty){ 33 + onTap: () {
  34 + if (widget.canSelected && table.signStr.isEmpty) {
36 setState(() { 35 setState(() {
37 - table.selected=!(table.selected??false); 36 + table.selected = !(table.selected ?? false);
38 }); 37 });
39 widget.onSelected(table); 38 widget.onSelected(table);
40 } 39 }
@@ -42,44 +41,68 @@ class NeedItemState extends State<NeedItem>{ @@ -42,44 +41,68 @@ class NeedItemState extends State<NeedItem>{
42 child: Stack( 41 child: Stack(
43 children: <Widget>[ 42 children: <Widget>[
44 Container( 43 Container(
45 - width: ScreenUtil().setWidth(190),  
46 - height: ScreenUtil().setWidth(widget.height),  
47 - alignment: Alignment.center,  
48 - margin:EdgeInsets.all( ScreenUtil().setWidth(9)),  
49 - decoration: BoxDecoration(  
50 - color: MyColours.color_a8e2e4,  
51 - borderRadius: BorderRadius.all(Radius.circular(ScreenUtil().setWidth(8)))  
52 - ),  
53 - child:Column(  
54 - mainAxisSize: MainAxisSize.min,  
55 - crossAxisAlignment: CrossAxisAlignment.center,  
56 - children: <Widget>[  
57 - Text(table.name,style: TextStyle(color: MyColours.color_131313,fontSize: ScreenUtil().setSp(30),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,),  
58 - Offstage(  
59 - offstage: table.maxText.isEmpty?true:false,  
60 - child: Column(  
61 - mainAxisSize: MainAxisSize.min,  
62 - children: <Widget>[  
63 - VEmptyView(5),  
64 - Text(table.maxText,style: TextStyle(color: MyColours.color_777777,fontSize: ScreenUtil().setSp(26),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,),  
65 - ], 44 + width: ScreenUtil().setWidth(190),
  45 + height: ScreenUtil().setWidth(widget.height),
  46 + alignment: Alignment.center,
  47 + margin: EdgeInsets.all(ScreenUtil().setWidth(9)),
  48 + decoration: BoxDecoration(
  49 + color: MyColours.color_a8e2e4,
  50 + borderRadius: BorderRadius.all(
  51 + Radius.circular(ScreenUtil().setWidth(8)))),
  52 + child: Column(
  53 + mainAxisSize: MainAxisSize.min,
  54 + crossAxisAlignment: CrossAxisAlignment.center,
  55 + children: <Widget>[
  56 + Text(
  57 + table.name,
  58 + style: TextStyle(
  59 + color: MyColours.color_131313,
  60 + fontSize: ScreenUtil().setSp(30),
  61 + decoration: TextDecoration.none,
  62 + fontWeight: FontWeight.normal),
  63 + overflow: TextOverflow.ellipsis,
66 ), 64 ),
67 - ),  
68 - Offstage(  
69 - offstage: table.lowStr.isEmpty?true:false,  
70 - child: Column(  
71 - mainAxisSize: MainAxisSize.min,  
72 - children: <Widget>[  
73 - VEmptyView(5),  
74 - Text(table.lowStr,style: TextStyle(color: MyColours.color_2bb5b7,fontSize: ScreenUtil().setSp(24),decoration: TextDecoration.none,fontWeight: FontWeight.normal),overflow: TextOverflow.ellipsis,)  
75 - ], 65 + Offstage(
  66 + offstage: table.maxText.isEmpty ? true : false,
  67 + child: Column(
  68 + mainAxisSize: MainAxisSize.min,
  69 + children: <Widget>[
  70 + VEmptyView(5),
  71 + Text(
  72 + table.maxText,
  73 + style: TextStyle(
  74 + color: MyColours.color_777777,
  75 + fontSize: ScreenUtil().setSp(26),
  76 + decoration: TextDecoration.none,
  77 + fontWeight: FontWeight.normal),
  78 + overflow: TextOverflow.ellipsis,
  79 + ),
  80 + ],
  81 + ),
76 ), 82 ),
77 - )  
78 - ],  
79 - )  
80 - ), 83 + Offstage(
  84 + offstage: table.lowStr.isEmpty ? true : false,
  85 + child: Column(
  86 + mainAxisSize: MainAxisSize.min,
  87 + children: <Widget>[
  88 + VEmptyView(5),
  89 + Text(
  90 + table.lowStr,
  91 + textAlign: TextAlign.center,
  92 + style: TextStyle(
  93 + color: MyColours.color_2bb5b7,
  94 + fontSize: ScreenUtil().setSp(24),
  95 + decoration: TextDecoration.none,
  96 + fontWeight: FontWeight.normal),
  97 + overflow: TextOverflow.ellipsis,
  98 + )
  99 + ],
  100 + ),
  101 + )
  102 + ],
  103 + )),
81 ], 104 ],
82 ), 105 ),
83 ); 106 );
84 } 107 }
85 -}  
  108 +}
@@ -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 = 185,
20 this.isRegionName = false}); 20 this.isRegionName = false});
21 21
22 @override 22 @override
@@ -45,9 +45,9 @@ class NewTableItemState extends State<NewTableItem> { @@ -45,9 +45,9 @@ 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(
52 color: MyColours.color_a8e2e4, 52 color: MyColours.color_a8e2e4,
53 borderRadius: BorderRadius.all( 53 borderRadius: BorderRadius.all(
@@ -82,23 +82,49 @@ class NewTableItemState extends State<NewTableItem> { @@ -82,23 +82,49 @@ 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(20)),
  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),  
92 - Text(  
93 - table.name,  
94 - style: TextStyle(  
95 - color: MyColours.color_131313,  
96 - fontSize: ScreenUtil().setSp(30),  
97 - decoration: TextDecoration.none,  
98 - fontWeight: FontWeight.normal),  
99 - overflow: TextOverflow.ellipsis,  
100 - ),  
101 - VEmptyView(5), 94 + VEmptyView(38),
  95 + Container(
  96 + alignment: Alignment.center,
  97 + child: Transform.translate(
  98 + offset:
  99 + Offset(0, 1 / 2), //1为 StrutStyle 的 leading的值
  100 + child: Text(
  101 + table.name,
  102 + maxLines: 2,
  103 + style: TextStyle(
  104 + color: MyColours.color_353535,
  105 + fontSize: ScreenUtil().setSp(28),
  106 + decoration: TextDecoration.none,
  107 + fontWeight: FontWeight.normal),
  108 + overflow: TextOverflow.ellipsis,
  109 + strutStyle: StrutStyle(
  110 + forceStrutHeight: true,
  111 + height: 1,
  112 + leading: 0.2),
  113 + ),
  114 + )
  115 +
  116 + ),
  117 + // Text(
  118 + // table.name,
  119 + // maxLines: 2,
  120 + // style: TextStyle(
  121 + // color: MyColours.color_353535,
  122 + // fontSize: ScreenUtil().setSp(28),
  123 + // decoration: TextDecoration.none,
  124 + // fontWeight: FontWeight.normal),
  125 + // overflow: TextOverflow.ellipsis,
  126 + // ),
  127 + VEmptyView(6),
102 Text( 128 Text(
103 (table.reserver == null || table.reserver.isEmpty) 129 (table.reserver == null || table.reserver.isEmpty)
104 ? '${table.tablePnum}人' 130 ? '${table.tablePnum}人'
@@ -106,14 +132,14 @@ class NewTableItemState extends State<NewTableItem> { @@ -106,14 +132,14 @@ class NewTableItemState extends State<NewTableItem> {
106 style: TextStyle( 132 style: TextStyle(
107 color: (table.reserver == null || 133 color: (table.reserver == null ||
108 table.reserver.isEmpty) 134 table.reserver.isEmpty)
109 - ? MyColours.color_777777 135 + ? MyColours.color_353535
110 : MyColours.color_2bb5b7, 136 : MyColours.color_2bb5b7,
111 fontSize: ScreenUtil().setSp(26), 137 fontSize: ScreenUtil().setSp(26),
112 decoration: TextDecoration.none, 138 decoration: TextDecoration.none,
113 fontWeight: FontWeight.normal), 139 fontWeight: FontWeight.normal),
114 overflow: TextOverflow.ellipsis, 140 overflow: TextOverflow.ellipsis,
115 ), 141 ),
116 - VEmptyView(5), 142 + VEmptyView(6),
117 Text( 143 Text(
118 table.lowStr, 144 table.lowStr,
119 style: TextStyle( 145 style: TextStyle(
@@ -144,6 +170,7 @@ class NewTableItemState extends State<NewTableItem> { @@ -144,6 +170,7 @@ class NewTableItemState extends State<NewTableItem> {
144 ScreenUtil().setWidth(8)))), 170 ScreenUtil().setWidth(8)))),
145 child: Text( 171 child: Text(
146 table.regionName, 172 table.regionName,
  173 + maxLines: 2,
147 style: TextStyle( 174 style: TextStyle(
148 color: MyColours.color_ffffff, 175 color: MyColours.color_ffffff,
149 fontSize: ScreenUtil().setSp(24), 176 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 = 185,
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,70 @@ class TableItemState extends State<TableItem> { @@ -114,38 +116,70 @@ 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(20)),
  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),  
124 - Text(  
125 - table.name,  
126 - style: TextStyle(  
127 - color: MyColours.color_131313,  
128 - fontSize: ScreenUtil().setSp(30),  
129 - decoration: TextDecoration.none,  
130 - fontWeight: FontWeight.normal),  
131 - overflow: TextOverflow.ellipsis,  
132 - ),  
133 - VEmptyView(5), 128 + VEmptyView(38),
  129 + Container(
  130 + alignment: Alignment.center,
  131 + child: Transform.translate(
  132 + offset:
  133 + Offset(0, 1 / 2), //1为 StrutStyle 的 leading的值
  134 + child: Text(
  135 + table.name,
  136 + maxLines: 2,
  137 + style: TextStyle(
  138 + color: table.signStr == '已停用'
  139 + ? MyColours.color_999999
  140 + : MyColours.color_353535,
  141 + fontSize: ScreenUtil().setSp(28),
  142 + decoration: TextDecoration.none,
  143 + fontWeight: FontWeight.normal),
  144 + overflow: TextOverflow.ellipsis,
  145 + strutStyle: StrutStyle(
  146 + forceStrutHeight: true,
  147 + height: 1,
  148 + leading: 0.2),
  149 + ),
  150 + )
  151 + // Text(
  152 + // table.name,
  153 + // // textAlign: TextAlign.center,
  154 + // maxLines: 2,
  155 + // style: TextStyle(
  156 + // color: table.signStr == '已停用'
  157 + // ? MyColours.color_999999
  158 + // : MyColours.color_353535,
  159 + // fontSize: ScreenUtil().setSp(28),
  160 + // decoration: TextDecoration.none,
  161 + // fontWeight: FontWeight.normal),
  162 + // overflow: TextOverflow.ellipsis,
  163 + // ),
  164 + ),
  165 + VEmptyView(6),
134 Text( 166 Text(
135 (table.reserver == null || table.reserver.isEmpty) 167 (table.reserver == null || table.reserver.isEmpty)
136 ? table.tableNum 168 ? table.tableNum
137 : table.reserver, 169 : table.reserver,
138 style: TextStyle( 170 style: TextStyle(
139 - color: (table.reserver == null ||  
140 - table.reserver.isEmpty)  
141 - ? MyColours.color_777777  
142 - : MyColours.color_2bb5b7, 171 + color: table.signStr == '已停用'
  172 + ? MyColours.color_999999
  173 + : (table.reserver == null ||
  174 + table.reserver.isEmpty)
  175 + ? MyColours.color_353535
  176 + : MyColours.color_2bb5b7,
143 fontSize: ScreenUtil().setSp(26), 177 fontSize: ScreenUtil().setSp(26),
144 decoration: TextDecoration.none, 178 decoration: TextDecoration.none,
145 fontWeight: FontWeight.normal), 179 fontWeight: FontWeight.normal),
146 overflow: TextOverflow.ellipsis, 180 overflow: TextOverflow.ellipsis,
147 ), 181 ),
148 - VEmptyView(5), 182 + VEmptyView(6),
149 Text( 183 Text(
150 table.lowStr, 184 table.lowStr,
151 style: TextStyle( 185 style: TextStyle(
@@ -165,11 +199,13 @@ class TableItemState extends State<TableItem> { @@ -165,11 +199,13 @@ class TableItemState extends State<TableItem> {
165 child: table.signStr.isEmpty 199 child: table.signStr.isEmpty
166 ? Container() 200 ? Container()
167 : Container( 201 : Container(
168 - width: ScreenUtil().setWidth(150),  
169 - height: ScreenUtil().setHeight(40), 202 + width: ScreenUtil().setWidth(160),
  203 + height: ScreenUtil().setHeight(36),
170 alignment: Alignment.center, 204 alignment: Alignment.center,
171 decoration: BoxDecoration( 205 decoration: BoxDecoration(
172 - color: MyColours.color_89c0b7, 206 + color: table.signStr == '已停用'
  207 + ? MyColours.color_777777
  208 + : MyColours.color_E95750,
173 borderRadius: BorderRadius.only( 209 borderRadius: BorderRadius.only(
174 bottomLeft: 210 bottomLeft:
175 Radius.circular(ScreenUtil().setWidth(8)), 211 Radius.circular(ScreenUtil().setWidth(8)),