xt / Flutter-ReserveApp · Commits

Go to a project

Commit 9907a8c2ef006c36003c73a128bc3679147b1bd7

Authored by “gaiyaguang”
1 parent eeaa715f
build: skipped

部分UI

Inline Side-by-side
Showing 22 changed files with 597 additions and 257 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
@@ -347,7 +347,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -347,7 +347,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
347 CommonButton( 347 CommonButton(
348 content: "安排包间", 348 content: "安排包间",
349 width: 669, 349 width: 669,
350 - height: 76, 350 + height: 84,
351 fontSize: 34, 351 fontSize: 34,
352 onPress: () async { 352 onPress: () async {
353 Map map = await NavigatorUtil 353 Map map = await NavigatorUtil
@@ -366,12 +366,12 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -366,12 +366,12 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
366 VEmptyView(20), 366 VEmptyView(20),
367 Container( 367 Container(
368 width: ScreenUtil().setWidth(669), 368 width: ScreenUtil().setWidth(669),
369 - height: ScreenUtil().setHeight(76), 369 + height: ScreenUtil().setHeight(84),
370 decoration: BoxDecoration( 370 decoration: BoxDecoration(
371 border: Border.all( 371 border: Border.all(
372 color: MyColours.color_199095), 372 color: MyColours.color_199095),
373 borderRadius: BorderRadius.circular( 373 borderRadius: BorderRadius.circular(
374 - ScreenUtil().setWidth(5)), 374 + ScreenUtil().setWidth(10)),
375 ), 375 ),
376 child: Row( 376 child: Row(
377 crossAxisAlignment: 377 crossAxisAlignment:
@@ -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,
@@ -773,6 +773,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -773,6 +773,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
773 height: 84, 773 height: 84,
774 fontSize: 34, 774 fontSize: 34,
775 content: "确定修改", 775 content: "确定修改",
  776 + fontWeight: FontWeight.bold,
776 state: 2, 777 state: 2,
777 onPress: () async { 778 onPress: () async {
778 String name = 779 String name =
@@ -33,7 +33,7 @@ class NotebookDetailPage extends StatefulWidget { @@ -33,7 +33,7 @@ class NotebookDetailPage extends StatefulWidget {
33 final String mid; 33 final String mid;
34 final bool fromNotify; 34 final bool fromNotify;
35 35
36 - NotebookDetailPage(this.rid, {this.fromNotify=false, this.mid}); 36 + NotebookDetailPage(this.rid, {this.fromNotify = false, this.mid});
37 37
38 @override 38 @override
39 State<StatefulWidget> createState() { 39 State<StatefulWidget> createState() {
@@ -89,16 +89,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -89,16 +89,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
89 } 89 }
90 90
91 //设置消息状态 91 //设置消息状态
92 - setMessageStatus(){  
93 - if(widget.mid==null||widget.mid.isEmpty)return; 92 + setMessageStatus() {
  93 + if (widget.mid == null || widget.mid.isEmpty) return;
94 bus.emit("remove_untreated_message", widget.mid); 94 bus.emit("remove_untreated_message", widget.mid);
95 Map<String, String> params = { 95 Map<String, String> params = {
96 "sid": Provider.of<UserModel>(context, listen: false).user.sellerid, 96 "sid": Provider.of<UserModel>(context, listen: false).user.sellerid,
97 "id": widget.mid, 97 "id": widget.mid,
98 "status": "is_handle" 98 "status": "is_handle"
99 }; 99 };
100 - MessageDialogModel messageDialogModel=Provider.of<MessageDialogModel>(context,listen: false);  
101 - messageDialogModel.setMessageStatus(context,params); 100 + MessageDialogModel messageDialogModel =
  101 + Provider.of<MessageDialogModel>(context, listen: false);
  102 + messageDialogModel.setMessageStatus(context, params);
102 } 103 }
103 104
104 @override 105 @override
@@ -114,7 +115,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -114,7 +115,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
114 setState(() { 115 setState(() {
115 cusmanText = detailEntity.cusman.isEmpty ? "请选择" : detailEntity.cusman; 116 cusmanText = detailEntity.cusman.isEmpty ? "请选择" : detailEntity.cusman;
116 }); 117 });
117 - if(detailEntity.status == "4"){ 118 + if (detailEntity.status == "4") {
118 setMessageStatus(); 119 setMessageStatus();
119 } 120 }
120 } 121 }
@@ -641,14 +642,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -641,14 +642,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
641 top: BorderSide( 642 top: BorderSide(
642 color: MyColours.color_dbe3e3, 643 color: MyColours.color_dbe3e3,
643 width: ScreenUtil().setWidth(1)))), 644 width: ScreenUtil().setWidth(1)))),
644 - padding: EdgeInsets.symmetric(  
645 - horizontal: ScreenUtil().setHeight(40)), 645 + padding: EdgeInsets.fromLTRB(
  646 + ScreenUtil().setHeight(40),
  647 + ScreenUtil().setHeight(40),
  648 + ScreenUtil().setHeight(40),
  649 + ScreenUtil().setHeight(0)),
646 margin: EdgeInsets.symmetric( 650 margin: EdgeInsets.symmetric(
647 vertical: ScreenUtil().setHeight(20)), 651 vertical: ScreenUtil().setHeight(20)),
648 child: CommonButton( 652 child: CommonButton(
649 content: "通知客户", 653 content: "通知客户",
650 width: 669, 654 width: 669,
651 - height: 80, 655 + height: 84,
652 fontSize: 34, 656 fontSize: 34,
653 onPress: () { 657 onPress: () {
654 DialogUtil.showShareDialog(context)?.then((value) { 658 DialogUtil.showShareDialog(context)?.then((value) {
@@ -687,7 +691,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -687,7 +691,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
687 : false, 691 : false,
688 child: Container( 692 child: Container(
689 width: double.infinity, 693 width: double.infinity,
690 - height: ScreenUtil().setWidth(80), 694 + height: ScreenUtil().setWidth(84),
691 margin: EdgeInsets.symmetric( 695 margin: EdgeInsets.symmetric(
692 horizontal: ScreenUtil().setHeight(40)), 696 horizontal: ScreenUtil().setHeight(40)),
693 decoration: BoxDecoration( 697 decoration: BoxDecoration(
@@ -695,29 +699,30 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -695,29 +699,30 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
695 color: MyColours.color_199095, 699 color: MyColours.color_199095,
696 width: ScreenUtil().setWidth(2)), 700 width: ScreenUtil().setWidth(2)),
697 borderRadius: 701 borderRadius:
698 - BorderRadius.circular(ScreenUtil().setWidth(5)), 702 + BorderRadius.circular(ScreenUtil().setWidth(10)),
699 ), 703 ),
700 // child: Text('fff'), 704 // child: Text('fff'),
701 child: Material( 705 child: Material(
  706 + color: Colors.transparent,
702 child: Row( 707 child: Row(
703 - children: [  
704 - Expanded(  
705 - child: _cancelAndChangeBtn(() {  
706 - print('点击变更预订');  
707 - NavigatorUtil.goNoteBookChangePage(  
708 - context, detailEntity, widget.rid);  
709 - }, '变更预订')),  
710 - MyDivider(  
711 - ScreenUtil().setWidth(2),  
712 - ScreenUtil().setWidth(50),  
713 - color: MyColours.color_199095,  
714 - ),  
715 - Expanded(  
716 - child: _cancelAndChangeBtn(() {  
717 - _showCancelWidget(context);  
718 - }, '取消预订')),  
719 - ],  
720 - )), 708 + children: [
  709 + Expanded(
  710 + child: _cancelAndChangeBtn(() {
  711 + print('点击变更预订');
  712 + NavigatorUtil.goNoteBookChangePage(
  713 + context, detailEntity, widget.rid);
  714 + }, '变更预订')),
  715 + MyDivider(
  716 + ScreenUtil().setWidth(2),
  717 + ScreenUtil().setWidth(50),
  718 + color: MyColours.color_199095,
  719 + ),
  720 + Expanded(
  721 + child: _cancelAndChangeBtn(() {
  722 + _showCancelWidget(context);
  723 + }, '取消预订')),
  724 + ],
  725 + )),
721 ), 726 ),
722 ), 727 ),
723 VEmptyView(ScreenUtil().setWidth(60)) 728 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 if (notifyParam != null && notifyParam.isNotEmpty) { 93 if (notifyParam != null && notifyParam.isNotEmpty) {
94 switch (notifyParam["messageType"]) { 94 switch (notifyParam["messageType"]) {
@@ -98,11 +98,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -98,11 +98,11 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
98 fromNotify: true); 98 fromNotify: true);
99 break; 99 break;
100 case "11": 100 case "11":
101 - NavigatorUtil.goNotebookDetailPage(context, notifyParam['rid'],mid:notifyParam['mid'],  
102 - fromNotify: true); 101 + NavigatorUtil.goNotebookDetailPage(context, notifyParam['rid'],
  102 + mid: notifyParam['mid'], fromNotify: true);
103 break; 103 break;
104 } 104 }
105 - }else{ 105 + } else {
106 getUntreatedMessage(); 106 getUntreatedMessage();
107 } 107 }
108 } 108 }
@@ -147,6 +147,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -147,6 +147,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
147 }, 147 },
148 xgPushDidSetBadge: (String msg) async { 148 xgPushDidSetBadge: (String msg) async {
149 print("flutter xgPushDidSetBadge: $msg"); 149 print("flutter xgPushDidSetBadge: $msg");
  150 +
150 /// 在此可设置应用角标 151 /// 在此可设置应用角标
151 XgFlutterPlugin().setAppBadge(0); 152 XgFlutterPlugin().setAppBadge(0);
152 }, 153 },
@@ -163,9 +164,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -163,9 +164,9 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
163 print("flutter xgPushDidClearAllIdentifiers: $msg"); 164 print("flutter xgPushDidClearAllIdentifiers: $msg");
164 }, 165 },
165 xgPushClickAction: (Map<String, dynamic> msg) async { 166 xgPushClickAction: (Map<String, dynamic> msg) async {
166 - if(Platform.isIOS&&msg!=null&&msg['custom']!=null){  
167 - Map custom=json.decode(msg['custom'].toString());  
168 - switch(custom["messageType"].toString()){ 167 + if (Platform.isIOS && msg != null && msg['custom'] != null) {
  168 + Map custom = json.decode(msg['custom'].toString());
  169 + switch (custom["messageType"].toString()) {
169 case "10": 170 case "10":
170 NavigatorUtil.goHandleOnlinePage( 171 NavigatorUtil.goHandleOnlinePage(
171 context, custom["rid"].toString(), custom['mid'].toString(), 172 context, custom["rid"].toString(), custom['mid'].toString(),
@@ -173,8 +174,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -173,8 +174,8 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
173 break; 174 break;
174 case "11": 175 case "11":
175 NavigatorUtil.goNotebookDetailPage( 176 NavigatorUtil.goNotebookDetailPage(
176 - context, custom['rid'].toString(),mid:custom['mid'].toString(),  
177 - fromNotify: true); 177 + context, custom['rid'].toString(),
  178 + mid: custom['mid'].toString(), fromNotify: true);
178 break; 179 break;
179 } 180 }
180 } 181 }
@@ -252,7 +253,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -252,7 +253,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
252 print('inactive'); 253 print('inactive');
253 break; 254 break;
254 case AppLifecycleState.paused: 255 case AppLifecycleState.paused:
255 - print('paused'); 256 + print('paused');
256 break; 257 break;
257 case AppLifecycleState.detached: 258 case AppLifecycleState.detached:
258 print('detached'); 259 print('detached');
@@ -286,7 +287,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -286,7 +287,7 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
286 // TODO: implement build 287 // TODO: implement build
287 return new Scaffold( 288 return new Scaffold(
288 bottomNavigationBar: BottomNavigationBar( 289 bottomNavigationBar: BottomNavigationBar(
289 - iconSize: ScreenUtil().setWidth(70), 290 + iconSize: ScreenUtil().setWidth(40),
290 unselectedFontSize: ScreenUtil().setSp(22), 291 unselectedFontSize: ScreenUtil().setSp(22),
291 selectedFontSize: ScreenUtil().setSp(22), 292 selectedFontSize: ScreenUtil().setSp(22),
292 backgroundColor: MyColours.color_ffffff, 293 backgroundColor: MyColours.color_ffffff,
@@ -294,13 +295,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -294,13 +295,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
294 BottomNavigationBarItem( 295 BottomNavigationBarItem(
295 icon: Image( 296 icon: Image(
296 image: AssetImage("assets/message_default.png"), 297 image: AssetImage("assets/message_default.png"),
297 - width: ScreenUtil().setWidth(70),  
298 - height: ScreenUtil().setWidth(70), 298 + width: ScreenUtil().setWidth(40),
  299 + height: ScreenUtil().setWidth(46),
299 ), 300 ),
300 activeIcon: Image( 301 activeIcon: Image(
301 image: AssetImage("assets/message_selected.png"), 302 image: AssetImage("assets/message_selected.png"),
302 - width: ScreenUtil().setWidth(70),  
303 - height: ScreenUtil().setWidth(70), 303 + width: ScreenUtil().setWidth(40),
  304 + height: ScreenUtil().setWidth(46),
304 ), 305 ),
305 title: Text( 306 title: Text(
306 "消息中心", 307 "消息中心",
@@ -312,16 +313,16 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -312,16 +313,16 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
312 BottomNavigationBarItem( 313 BottomNavigationBarItem(
313 icon: Image( 314 icon: Image(
314 image: AssetImage("assets/notebook_default.png"), 315 image: AssetImage("assets/notebook_default.png"),
315 - width: ScreenUtil().setWidth(70),  
316 - height: ScreenUtil().setWidth(70), 316 + width: ScreenUtil().setWidth(44),
  317 + height: ScreenUtil().setWidth(44),
317 ), 318 ),
318 activeIcon: Image( 319 activeIcon: Image(
319 image: AssetImage("assets/notebook_selected.png"), 320 image: AssetImage("assets/notebook_selected.png"),
320 - width: ScreenUtil().setWidth(70),  
321 - height: ScreenUtil().setWidth(70), 321 + width: ScreenUtil().setWidth(44),
  322 + height: ScreenUtil().setWidth(44),
322 ), 323 ),
323 title: Text( 324 title: Text(
324 - "预定本", 325 + "已预订",
325 style: TextStyle( 326 style: TextStyle(
326 color: _currIndex == 1 ? _activeColor : _defaultColor, 327 color: _currIndex == 1 ? _activeColor : _defaultColor,
327 fontSize: ScreenUtil().setSp(22)), 328 fontSize: ScreenUtil().setSp(22)),
@@ -330,13 +331,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -330,13 +331,13 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
330 BottomNavigationBarItem( 331 BottomNavigationBarItem(
331 icon: Image( 332 icon: Image(
332 image: AssetImage("assets/my_default.png"), 333 image: AssetImage("assets/my_default.png"),
333 - width: ScreenUtil().setWidth(70),  
334 - height: ScreenUtil().setWidth(70), 334 + width: ScreenUtil().setWidth(44),
  335 + height: ScreenUtil().setWidth(44),
335 ), 336 ),
336 activeIcon: Image( 337 activeIcon: Image(
337 image: AssetImage("assets/my_selected.png"), 338 image: AssetImage("assets/my_selected.png"),
338 - width: ScreenUtil().setWidth(70),  
339 - height: ScreenUtil().setWidth(70), 339 + width: ScreenUtil().setWidth(44),
  340 + height: ScreenUtil().setWidth(44),
340 ), 341 ),
341 title: Text( 342 title: Text(
342 "我的", 343 "我的",
@@ -354,14 +355,87 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver { @@ -354,14 +355,87 @@ class HomePageState extends State<HomePage> with WidgetsBindingObserver {
354 _currIndex = index; 355 _currIndex = index;
355 }); 356 });
356 if (_currIndex == 2) { 357 if (_currIndex == 2) {
357 - Utils.changeStatusColor(color: MyColours.color_2bb5b7); 358 + Utils.changeStatusColor(color: MyColours.color_199095);
358 } else { 359 } else {
359 Utils.changeStatusColor(color: MyColours.color_ffffff); 360 Utils.changeStatusColor(color: MyColours.color_ffffff);
360 } 361 }
361 } 362 }
362 }, 363 },
363 ), 364 ),
364 - body: SafeArea(child: pages[_currIndex]), 365 + // bottomNavigationBar: BottomAppBar(
  366 + // shape: CircularNotchedRectangle(),
  367 + // child: Container(
  368 + // height: ScreenUtil().setWidth(98),
  369 + // // padding: EdgeInsets.fromLTRB(0, 12, 0, 8),
  370 + // child: Row(
  371 + // mainAxisSize: MainAxisSize.max,
  372 + // mainAxisAlignment: MainAxisAlignment.spaceAround,
  373 + // crossAxisAlignment: CrossAxisAlignment.center,
  374 + // children: <Widget>[
  375 + // GestureDetector(
  376 + // onTap: () {
  377 + // // onTap(0);
  378 + // },
  379 + // child: Column(
  380 + // mainAxisSize: MainAxisSize.min,
  381 + // children: <Widget>[
  382 + // Image(
  383 + // image: AssetImage("assets/my_selected.png"),
  384 + // width: ScreenUtil().setWidth(44),
  385 + // height: ScreenUtil().setWidth(44),
  386 + // ),
  387 + // Text(
  388 + // "我的",
  389 + // style: TextStyle(
  390 + // color: _currIndex == 2
  391 + // ? _activeColor
  392 + // : _defaultColor,
  393 + // fontSize: ScreenUtil().setSp(22)),
  394 + // )
  395 + // ],
  396 + // )),
  397 + // GestureDetector(
  398 + // onTap: () {
  399 + // // onTap(1);
  400 + // },
  401 + // child: Column(
  402 + // mainAxisSize: MainAxisSize.min,
  403 + // children: <Widget>[
  404 + // Image(
  405 + // image: AssetImage("assets/my_selected.png"),
  406 + // width: ScreenUtil().setWidth(44),
  407 + // height: ScreenUtil().setWidth(44),
  408 + // ),
  409 + // Text(
  410 + // "我的",
  411 + // style: TextStyle(
  412 + // color: _currIndex == 2
  413 + // ? _activeColor
  414 + // : _defaultColor,
  415 + // fontSize: ScreenUtil().setSp(22)),
  416 + // )
  417 + // ],
  418 + // )),
  419 + // Column(
  420 + // mainAxisSize: MainAxisSize.min,
  421 + // children: <Widget>[
  422 + // Image(
  423 + // image: AssetImage("assets/my_selected.png"),
  424 + // width: ScreenUtil().setWidth(44),
  425 + // height: ScreenUtil().setWidth(44),
  426 + // ),
  427 + // Text(
  428 + // "我的",
  429 + // style: TextStyle(
  430 + // color:
  431 + // _currIndex == 2 ? _activeColor : _defaultColor,
  432 + // fontSize: ScreenUtil().setSp(22)),
  433 + // )
  434 + // ],
  435 + // )
  436 + // ])),
  437 + // ),
  438 + body: pages[_currIndex],
365 ); 439 );
366 } 440 }
367 441
@@ -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,10 @@ class MessageItem extends StatelessWidget { @@ -108,9 +108,10 @@ 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 + fontWeight: FontWeight.bold,
114 content:message.message_type=="10"?"立即处理":"立即查看", 115 content:message.message_type=="10"?"立即处理":"立即查看",
115 state: 1, 116 state: 1,
116 onPress: () { 117 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,30 +19,201 @@ class MyPage extends StatefulWidget{ @@ -19,30 +19,201 @@ 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 + title: Text(
  178 + '我的',
  179 + style: TextStyle(
  180 + color: MyColours.color_fefefe,
  181 + fontSize: ScreenUtil().setSp(34),
  182 + fontWeight: FontWeight.normal,
  183 + decoration: TextDecoration.none
  184 + ),
  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
47 return Container( 218 return Container(
48 width: double.infinity, 219 width: double.infinity,
@@ -50,90 +221,155 @@ class MyPageState extends State<MyPage>{ @@ -50,90 +221,155 @@ class MyPageState extends State<MyPage>{
50 color: MyColours.color_f5f5f5, 221 color: MyColours.color_f5f5f5,
51 child: Column( 222 child: Column(
52 children: <Widget>[ 223 children: <Widget>[
53 - MyAppBar("我的",showBack: false,backgroundColor: MyColours.color_2bb5b7,fontColor: MyColours.color_fefefe,), 224 + MyAppBar(
  225 + "我的",
  226 + showBack: false,
  227 + backgroundColor: MyColours.color_199095,
  228 + fontColor: MyColours.color_fefefe,
  229 + ),
54 Container( 230 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 - ), 231 + width: double.infinity,
  232 + height: ScreenUtil().setHeight(242),
  233 + alignment: Alignment.centerLeft,
  234 + padding: EdgeInsets.only(left: ScreenUtil().setWidth(40)),
  235 + color: MyColours.color_199095,
  236 + child: Consumer<UserModel>(
  237 + builder: (BuildContext context, UserModel model, Widget child) {
  238 + return Column(
  239 + crossAxisAlignment: CrossAxisAlignment.start,
  240 + children: <Widget>[
  241 + VEmptyView(38),
  242 + Text(
  243 + model.user.sellername,
  244 + style: TextStyle(
  245 + color: MyColours.color_ffffff,
  246 + fontSize: ScreenUtil().setSp(36)),
  247 + ),
  248 + VEmptyView(38),
  249 + Text(
  250 + model.user.account + " | " + model.user.role_name,
  251 + style: TextStyle(
  252 + color: MyColours.color_ffffff,
  253 + fontSize: ScreenUtil().setSp(30)),
  254 + ),
  255 + ],
  256 + );
  257 + },
  258 + )),
72 VEmptyView(44), 259 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), 260 + MyItem(
  261 + title: "联系客服",
  262 + content: "09:00~21:00",
  263 + callback: () {
  264 + Utils.goPhone("400-000-9690");
  265 + },
  266 + ),
  267 + MyDivider(
  268 + double.infinity,
  269 + ScreenUtil().setHeight(1),
  270 + color: MyColours.color_f3f3f3,
  271 + ),
  272 + MyItem(
  273 + title: "帮助与反馈",
  274 + content: "",
  275 + callback: () {
  276 + Utils.goHelp(context);
  277 + },
  278 + ),
  279 + MyDivider(double.infinity, ScreenUtil().setHeight(1),
  280 + color: MyColours.color_f3f3f3),
81 GestureDetector( 281 GestureDetector(
82 onTap: checkUpdate, 282 onTap: checkUpdate,
83 child: Container( 283 child: Container(
84 width: double.infinity, 284 width: double.infinity,
85 height: ScreenUtil().setHeight(122), 285 height: ScreenUtil().setHeight(122),
86 color: MyColours.color_ffffff, 286 color: MyColours.color_ffffff,
87 - padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)), 287 + padding:
  288 + EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(40)),
88 alignment: Alignment.center, 289 alignment: Alignment.center,
89 child: Row( 290 child: Row(
90 children: <Widget>[ 291 children: <Widget>[
91 - Text("版本更新",style: TextStyle(fontSize: ScreenUtil().setSp(30),color: MyColours.color_353535),), 292 + Text(
  293 + "版本更新",
  294 + style: TextStyle(
  295 + fontSize: ScreenUtil().setSp(30),
  296 + color: MyColours.color_353535),
  297 + ),
92 Spacer(), 298 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),), 299 + newVersion
  300 + ? Container(
  301 + width: ScreenUtil().setWidth(120),
  302 + height: ScreenUtil().setWidth(34),
  303 + decoration: BoxDecoration(
  304 + color: MyColours.color_E14553,
  305 + borderRadius: BorderRadius.all(
  306 + Radius.circular(ScreenUtil().setWidth(6))),
  307 + ),
  308 + child: Center(
  309 + child: Text(
  310 + "发现新版本",
  311 + style: TextStyle(
  312 + fontSize: ScreenUtil().setSp(24),
  313 + color: MyColours.color_ffffff),
  314 + ),
  315 + ),
  316 + )
  317 + : Text(
  318 + cur_version,
  319 + style: TextStyle(
  320 + fontSize: ScreenUtil().setSp(28),
  321 + color: MyColours.color_666666),
  322 + ),
105 HEmptyView(20), 323 HEmptyView(20),
106 - Image.asset("assets/arr_right_gray.png",width: ScreenUtil().setWidth(14),height: ScreenUtil().setWidth(22),) 324 + Image.asset(
  325 + "assets/arr_right_gray.png",
  326 + width: ScreenUtil().setWidth(14),
  327 + height: ScreenUtil().setWidth(22),
  328 + )
107 ], 329 ],
108 ), 330 ),
109 ), 331 ),
110 ), 332 ),
111 - MyDivider(double.infinity,ScreenUtil().setHeight(1),color: MyColours.color_f3f3f3,), 333 + MyDivider(
  334 + double.infinity,
  335 + ScreenUtil().setHeight(1),
  336 + color: MyColours.color_f3f3f3,
  337 + ),
112 VEmptyView(40), 338 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 - ], 339 + Consumer<UserModel>(
  340 + builder: (BuildContext context, UserModel model, Widget child) {
  341 + return GestureDetector(
  342 + onTap: () {
  343 + model.showLoginOutDialog(context);
  344 + },
  345 + child: Container(
  346 + height: ScreenUtil().setHeight(122),
  347 + color: MyColours.color_ffffff,
  348 + child: Center(
  349 + child: Row(
  350 + mainAxisSize: MainAxisSize.min,
  351 + crossAxisAlignment: CrossAxisAlignment.center,
  352 + children: <Widget>[
  353 + Image.asset(
  354 + "assets/icon_exist.png",
  355 + width: ScreenUtil().setWidth(30),
  356 + height: ScreenUtil().setWidth(30),
  357 + ),
  358 + HEmptyView(18),
  359 + Text("退出登录",
  360 + style: TextStyle(
  361 + color: MyColours.color_199095,
  362 + fontSize: ScreenUtil().setSp(34),
  363 + ))
  364 + ],
  365 + ),
130 ), 366 ),
131 ), 367 ),
132 - ),  
133 - );  
134 - },) 368 + );
  369 + },
  370 + )
135 ], 371 ],
136 ), 372 ),
137 ); 373 );
138 } 374 }
139 -}  
  375 +}
@@ -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 ),
@@ -65,8 +65,9 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -65,8 +65,9 @@ class NoteBookPageState extends State<NoteBookPage> {
65 _initTime() { 65 _initTime() {
66 dateTime = DateTime.now(); 66 dateTime = DateTime.now();
67 dateText = Utils.addZeroNumber(dateTime.month) + 67 dateText = Utils.addZeroNumber(dateTime.month) +
68 - "-" + 68 + "月" +
69 Utils.addZeroNumber(dateTime.day) + 69 Utils.addZeroNumber(dateTime.day) +
  70 + "日" +
70 " 今天"; 71 " 今天";
71 morning = 72 morning =
72 userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning; 73 userModel.user.morning.isEmpty ? "00:00-00:00" : userModel.user.morning;
@@ -193,7 +194,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -193,7 +194,7 @@ class NoteBookPageState extends State<NoteBookPage> {
193 "桌号", 194 "桌号",
194 style: TextStyle( 195 style: TextStyle(
195 color: MyColours.color_353535, 196 color: MyColours.color_353535,
196 - fontSize: ScreenUtil().setSp(30)), 197 + fontSize: ScreenUtil().setSp(28)),
197 ), 198 ),
198 ), 199 ),
199 MyDivider( 200 MyDivider(
@@ -208,7 +209,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -208,7 +209,7 @@ class NoteBookPageState extends State<NoteBookPage> {
208 "用户姓名", 209 "用户姓名",
209 style: TextStyle( 210 style: TextStyle(
210 color: MyColours.color_353535, 211 color: MyColours.color_353535,
211 - fontSize: ScreenUtil().setSp(30)), 212 + fontSize: ScreenUtil().setSp(28)),
212 ), 213 ),
213 ), 214 ),
214 MyDivider( 215 MyDivider(
@@ -223,7 +224,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -223,7 +224,7 @@ class NoteBookPageState extends State<NoteBookPage> {
223 "时间", 224 "时间",
224 style: TextStyle( 225 style: TextStyle(
225 color: MyColours.color_353535, 226 color: MyColours.color_353535,
226 - fontSize: ScreenUtil().setSp(30)), 227 + fontSize: ScreenUtil().setSp(28)),
227 ), 228 ),
228 ), 229 ),
229 MyDivider( 230 MyDivider(
@@ -238,7 +239,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -238,7 +239,7 @@ class NoteBookPageState extends State<NoteBookPage> {
238 "操作", 239 "操作",
239 style: TextStyle( 240 style: TextStyle(
240 color: MyColours.color_353535, 241 color: MyColours.color_353535,
241 - fontSize: ScreenUtil().setSp(30)), 242 + fontSize: ScreenUtil().setSp(28)),
242 ), 243 ),
243 ), 244 ),
244 ], 245 ],
@@ -251,8 +252,10 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -251,8 +252,10 @@ class NoteBookPageState extends State<NoteBookPage> {
251 if (Utils.isOneDay(day, dateTime)) return; //日期没变 252 if (Utils.isOneDay(day, dateTime)) return; //日期没变
252 setState(() { 253 setState(() {
253 DateTime dateNow = DateTime.now(); 254 DateTime dateNow = DateTime.now();
254 - dateText =  
255 - Utils.addZeroNumber(day.month) + "-" + Utils.addZeroNumber(day.day); 255 + dateText = Utils.addZeroNumber(day.month) +
  256 + "月" +
  257 + Utils.addZeroNumber(day.day) +
  258 + "日";
256 if (Utils.isOneDay(day, dateNow)) { 259 if (Utils.isOneDay(day, dateNow)) {
257 dateText += " 今天"; 260 dateText += " 今天";
258 } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) { 261 } else if (Utils.isOneDay(day, dateNow.add(Duration(days: 1)))) {
@@ -284,7 +287,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -284,7 +287,7 @@ class NoteBookPageState extends State<NoteBookPage> {
284 Container( 287 Container(
285 color: MyColours.color_ffffff, 288 color: MyColours.color_ffffff,
286 width: double.infinity, 289 width: double.infinity,
287 - padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(11)), 290 + padding: EdgeInsets.symmetric(vertical: ScreenUtil().setHeight(16)),
288 child: Row( 291 child: Row(
289 crossAxisAlignment: CrossAxisAlignment.center, 292 crossAxisAlignment: CrossAxisAlignment.center,
290 children: <Widget>[ 293 children: <Widget>[
@@ -299,84 +302,90 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -299,84 +302,90 @@ class NoteBookPageState extends State<NoteBookPage> {
299 } 302 }
300 }); 303 });
301 }, 304 },
302 - child: Text(  
303 - dateText,  
304 - style: TextStyle(  
305 - color: MyColours.color_2bb5b7,  
306 - fontSize: ScreenUtil().setSp(32)), 305 + child: Container(
  306 + child: Text(
  307 + dateText,
  308 + style: TextStyle(
  309 + color: MyColours.color_199095,
  310 + fontSize: ScreenUtil().setSp(34)),
  311 + ),
307 ), 312 ),
308 ), 313 ),
309 ), 314 ),
310 ), 315 ),
311 MyDivider( 316 MyDivider(
312 ScreenUtil().setWidth(2), 317 ScreenUtil().setWidth(2),
313 - ScreenUtil().setHeight(72),  
314 - color: MyColours.color_ededed, 318 + ScreenUtil().setHeight(68),
  319 + color: MyColours.color_E0E0E0,
315 ), 320 ),
316 Expanded( 321 Expanded(
317 - child: Row(  
318 - mainAxisAlignment: MainAxisAlignment.center,  
319 - crossAxisAlignment: CrossAxisAlignment.center,  
320 - children: <Widget>[  
321 - Offstage(  
322 - offstage: morning == "00:00-00:00" ? true : false,  
323 - child: Padding(  
324 - padding: EdgeInsets.symmetric(  
325 - horizontal: ScreenUtil().setWidth(10)),  
326 - child: CommonButton(  
327 - content: "早市",  
328 - state: currTimeIndex == 1 ? 1 : 0,  
329 - width: ScreenUtil().setWidth(180),  
330 - height: ScreenUtil().setHeight(100),  
331 - fontSize: 32,  
332 - onPress: () {  
333 - if (currTimeIndex == 1) return;  
334 - setState(() {  
335 - currTimeIndex = 1;  
336 - });  
337 - _getReserveList();  
338 - },  
339 - ))),  
340 - Offstage(  
341 - offstage: noon == "00:00-00:00" ? true : false,  
342 - child: Padding(  
343 - padding: EdgeInsets.symmetric(  
344 - horizontal: ScreenUtil().setWidth(10)), 322 + child: Padding(
  323 + padding: EdgeInsets.symmetric(
  324 + horizontal: ScreenUtil().setWidth(30)),
  325 + child: Row(
  326 + mainAxisAlignment: MainAxisAlignment.center,
  327 + crossAxisAlignment: CrossAxisAlignment.center,
  328 + children: <Widget>[
  329 + Offstage(
  330 + offstage: morning == "00:00-00:00" ? true : false,
  331 + child: Padding(
  332 + padding: EdgeInsets.only(
  333 + right: ScreenUtil().setWidth(18)),
  334 + child: CommonButton(
  335 + content: "早市",
  336 + state: currTimeIndex == 1 ? 1 : 0,
  337 + width: 92,
  338 + height: 48,
  339 + fontSize: 32,
  340 + onPress: () {
  341 + if (currTimeIndex == 1) return;
  342 + setState(() {
  343 + currTimeIndex = 1;
  344 + });
  345 + _getReserveList();
  346 + },
  347 + ))),
  348 + Offstage(
  349 + offstage: noon == "00:00-00:00" ? true : false,
  350 + child: Padding(
  351 + padding: EdgeInsets.only(
  352 + right: ScreenUtil().setWidth(18)),
  353 + child: CommonButton(
  354 + content: "午市",
  355 + state: currTimeIndex == 2 ? 1 : 0,
  356 + width: 92,
  357 + height: 48,
  358 + fontSize: 32,
  359 + onPress: () {
  360 + if (currTimeIndex == 2) return;
  361 + setState(() {
  362 + currTimeIndex = 2;
  363 + });
  364 + _getReserveList();
  365 + },
  366 + ))),
  367 + Offstage(
  368 + offstage: night == "00:00-00:00" ? true : false,
  369 + child: Container(
  370 + // padding: EdgeInsets.symmetric(
  371 + // horizontal: ScreenUtil().setWidth(10)),
345 child: CommonButton( 372 child: CommonButton(
346 - content: "午市",  
347 - state: currTimeIndex == 2 ? 1 : 0,  
348 - width: ScreenUtil().setWidth(180),  
349 - height: ScreenUtil().setHeight(100),  
350 - fontSize: 32,  
351 - onPress: () {  
352 - if (currTimeIndex == 2) return;  
353 - setState(() {  
354 - currTimeIndex = 2;  
355 - });  
356 - _getReserveList();  
357 - },  
358 - ))),  
359 - Offstage(  
360 - offstage: night == "00:00-00:00" ? true : false,  
361 - child: Padding(  
362 - padding: EdgeInsets.symmetric(  
363 - horizontal: ScreenUtil().setWidth(10)),  
364 - child: CommonButton(  
365 - content: "晚市",  
366 - state: currTimeIndex == 3 ? 1 : 0,  
367 - width: ScreenUtil().setWidth(180),  
368 - height: ScreenUtil().setHeight(100),  
369 - fontSize: 32,  
370 - onPress: () {  
371 - if (currTimeIndex == 3) return;  
372 - setState(() {  
373 - currTimeIndex = 3;  
374 - });  
375 - _getReserveList();  
376 - },  
377 - )),  
378 - ),  
379 - ], 373 + content: "晚市",
  374 + state: currTimeIndex == 3 ? 1 : 0,
  375 + width: 92,
  376 + height: 48,
  377 + fontSize: 32,
  378 + onPress: () {
  379 + if (currTimeIndex == 3) return;
  380 + setState(() {
  381 + currTimeIndex = 3;
  382 + });
  383 + _getReserveList();
  384 + },
  385 + )),
  386 + ),
  387 + ],
  388 + ),
380 ), 389 ),
381 ) 390 )
382 ], 391 ],
@@ -394,8 +403,8 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -394,8 +403,8 @@ class NoteBookPageState extends State<NoteBookPage> {
394 child: Text( 403 child: Text(
395 total, 404 total,
396 style: TextStyle( 405 style: TextStyle(
397 - color: MyColours.color_131313,  
398 - fontSize: ScreenUtil().setSp(24)), 406 + color: MyColours.color_353535,
  407 + fontSize: ScreenUtil().setSp(26)),
399 ), 408 ),
400 ); 409 );
401 }, 410 },
@@ -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 +}
@@ -260,7 +260,7 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -260,7 +260,7 @@ class SelectTablePageState extends State<SelectTablePage> {
260 child: CommonButton( 260 child: CommonButton(
261 content: "确定", 261 content: "确定",
262 width: 600, 262 width: 600,
263 - height: 76, 263 + height: 84,
264 fontSize: 34, 264 fontSize: 34,
265 state: 1, 265 state: 1,
266 onPress: () { 266 onPress: () {
@@ -43,4 +43,5 @@ class MyColours { @@ -43,4 +43,5 @@ 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);
46 } 47 }
@@ -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;
@@ -85,7 +87,9 @@ class CommonButton extends StatelessWidget { @@ -85,7 +87,9 @@ class CommonButton extends StatelessWidget {
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 ),