xt / Flutter-ReserveApp · Commits

Go to a project

Commit 47c73f25747789a186a68db76c1c7b86485ee7d7

Authored by “gaiyaguang”
2 parents ebd42b62 702104e2
build: skipped

Merge branch 'v1.5+' of http://123.56.79.57/xt/Flutter-ReserveApp into v1.5+

Inline Side-by-side
Showing 13 changed files with 198 additions and 43 deletions
1 -7babc7873f8d177769b987ba4c6c2911  
  1 +<<<<<<< HEAD
  2 +c71e777004aab201609920eac28801f9
  3 +=======
  4 +7babc7873f8d177769b987ba4c6c2911
  5 +>>>>>>> 4ecf950986f1856303c83ccacadc2b15efeb20ac
@@ -152,4 +152,4 @@ SPEC CHECKSUMS: @@ -152,4 +152,4 @@ SPEC CHECKSUMS:
152 152
153 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa 153 PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa
154 154
155 -COCOAPODS: 1.9.3 155 +COCOAPODS: 1.9.1
@@ -409,7 +409,11 @@ @@ -409,7 +409,11 @@
409 CODE_SIGN_IDENTITY = "iPhone Developer"; 409 CODE_SIGN_IDENTITY = "iPhone Developer";
410 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 410 "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
411 CODE_SIGN_STYLE = Automatic; 411 CODE_SIGN_STYLE = Automatic;
  412 +<<<<<<< HEAD
  413 + CURRENT_PROJECT_VERSION = 145;
  414 +=======
412 CURRENT_PROJECT_VERSION = 146; 415 CURRENT_PROJECT_VERSION = 146;
  416 +>>>>>>> 4ecf950986f1856303c83ccacadc2b15efeb20ac
413 DEVELOPMENT_TEAM = 8J59HM8B82; 417 DEVELOPMENT_TEAM = 8J59HM8B82;
414 ENABLE_BITCODE = NO; 418 ENABLE_BITCODE = NO;
415 FRAMEWORK_SEARCH_PATHS = ( 419 FRAMEWORK_SEARCH_PATHS = (
@@ -422,7 +426,11 @@ @@ -422,7 +426,11 @@
422 "$(inherited)", 426 "$(inherited)",
423 "$(PROJECT_DIR)/Flutter", 427 "$(PROJECT_DIR)/Flutter",
424 ); 428 );
  429 +<<<<<<< HEAD
  430 + MARKETING_VERSION = 1.4.5;
  431 +=======
425 MARKETING_VERSION = 1.4.6; 432 MARKETING_VERSION = 1.4.6;
  433 +>>>>>>> 4ecf950986f1856303c83ccacadc2b15efeb20ac
426 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 434 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
427 PRODUCT_NAME = "一键订"; 435 PRODUCT_NAME = "一键订";
428 PROVISIONING_PROFILE_SPECIFIER = ""; 436 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -551,7 +559,11 @@ @@ -551,7 +559,11 @@
551 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 559 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
552 CODE_SIGN_IDENTITY = "iPhone Developer"; 560 CODE_SIGN_IDENTITY = "iPhone Developer";
553 CODE_SIGN_STYLE = Automatic; 561 CODE_SIGN_STYLE = Automatic;
  562 +<<<<<<< HEAD
  563 + CURRENT_PROJECT_VERSION = 145;
  564 +=======
554 CURRENT_PROJECT_VERSION = 146; 565 CURRENT_PROJECT_VERSION = 146;
  566 +>>>>>>> 4ecf950986f1856303c83ccacadc2b15efeb20ac
555 DEVELOPMENT_TEAM = 8J59HM8B82; 567 DEVELOPMENT_TEAM = 8J59HM8B82;
556 ENABLE_BITCODE = NO; 568 ENABLE_BITCODE = NO;
557 FRAMEWORK_SEARCH_PATHS = ( 569 FRAMEWORK_SEARCH_PATHS = (
@@ -564,7 +576,11 @@ @@ -564,7 +576,11 @@
564 "$(inherited)", 576 "$(inherited)",
565 "$(PROJECT_DIR)/Flutter", 577 "$(PROJECT_DIR)/Flutter",
566 ); 578 );
  579 +<<<<<<< HEAD
  580 + MARKETING_VERSION = 1.4.5;
  581 +=======
567 MARKETING_VERSION = 1.4.6; 582 MARKETING_VERSION = 1.4.6;
  583 +>>>>>>> 4ecf950986f1856303c83ccacadc2b15efeb20ac
568 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 584 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
569 PRODUCT_NAME = "一键订"; 585 PRODUCT_NAME = "一键订";
570 PROVISIONING_PROFILE_SPECIFIER = ""; 586 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -584,7 +600,11 @@ @@ -584,7 +600,11 @@
584 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; 600 CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
585 CODE_SIGN_IDENTITY = "iPhone Developer"; 601 CODE_SIGN_IDENTITY = "iPhone Developer";
586 CODE_SIGN_STYLE = Automatic; 602 CODE_SIGN_STYLE = Automatic;
  603 +<<<<<<< HEAD
  604 + CURRENT_PROJECT_VERSION = 145;
  605 +=======
587 CURRENT_PROJECT_VERSION = 146; 606 CURRENT_PROJECT_VERSION = 146;
  607 +>>>>>>> 4ecf950986f1856303c83ccacadc2b15efeb20ac
588 DEVELOPMENT_TEAM = 8J59HM8B82; 608 DEVELOPMENT_TEAM = 8J59HM8B82;
589 ENABLE_BITCODE = NO; 609 ENABLE_BITCODE = NO;
590 FRAMEWORK_SEARCH_PATHS = ( 610 FRAMEWORK_SEARCH_PATHS = (
@@ -597,7 +617,11 @@ @@ -597,7 +617,11 @@
597 "$(inherited)", 617 "$(inherited)",
598 "$(PROJECT_DIR)/Flutter", 618 "$(PROJECT_DIR)/Flutter",
599 ); 619 );
  620 +<<<<<<< HEAD
  621 + MARKETING_VERSION = 1.4.5;
  622 +=======
600 MARKETING_VERSION = 1.4.6; 623 MARKETING_VERSION = 1.4.6;
  624 +>>>>>>> 4ecf950986f1856303c83ccacadc2b15efeb20ac
601 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine; 625 PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
602 PRODUCT_NAME = "一键订"; 626 PRODUCT_NAME = "一键订";
603 PROVISIONING_PROFILE_SPECIFIER = ""; 627 PROVISIONING_PROFILE_SPECIFIER = "";
@@ -34,7 +34,7 @@ Future<void> main() async { @@ -34,7 +34,7 @@ Future<void> main() async {
34 Routes.configureRoutes(router); 34 Routes.configureRoutes(router);
35 App.router = router; 35 App.router = router;
36 App.setupLocator(); 36 App.setupLocator();
37 - LogUtil.init(isDebug: false, tag: 'ONE_KEY'); 37 + LogUtil.init(isDebug: true, tag: 'ONE_KEY');
38 Provider.debugCheckInvalidValueType = null; 38 Provider.debugCheckInvalidValueType = null;
39 await initializeDateFormatting(); 39 await initializeDateFormatting();
40 SystemChrome.setPreferredOrientations( 40 SystemChrome.setPreferredOrientations(
@@ -115,7 +115,7 @@ class NotebookDetail { @@ -115,7 +115,7 @@ class NotebookDetail {
115 String get ddateMd { 115 String get ddateMd {
116 DateTime dateTime = 116 DateTime dateTime =
117 DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000); 117 DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000);
118 - String md = Utils.addZeroNumber(dateTime.month) + 118 + String md ="${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
119 "月" + 119 "月" +
120 Utils.addZeroNumber(dateTime.day) + 120 Utils.addZeroNumber(dateTime.day) +
121 "日"; 121 "日";
@@ -57,6 +57,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -57,6 +57,7 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
57 57
58 bool isRefused = false; //是否已拒绝 58 bool isRefused = false; //是否已拒绝
59 bool isPause = false; //是否暂停预订 59 bool isPause = false; //是否暂停预订
  60 + bool isSelf=false;//订单是否自己处理
60 StateSetter refuseDialogState; //决绝弹框setState 61 StateSetter refuseDialogState; //决绝弹框setState
61 62
62 @override 63 @override
@@ -91,7 +92,11 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -91,7 +92,11 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
91 } 92 }
92 } 93 }
93 }); 94 });
94 - if (detailEntity.status != "0" && !isPause) { 95 + if(detailEntity.status=="6"){//已拒绝不跳转
  96 + if(refuseDialogState!=null){
  97 + refuseDialogState((){});
  98 + }
  99 + }else if (detailEntity.status != "0") {//已拒绝
95 //已处理 100 //已处理
96 Future.delayed(Duration(milliseconds: 200), () { 101 Future.delayed(Duration(milliseconds: 200), () {
97 NavigatorUtil.goNotebookDetailPage(context, detailEntity.id, 102 NavigatorUtil.goNotebookDetailPage(context, detailEntity.id,
@@ -183,7 +188,6 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -183,7 +188,6 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
183 VEmptyView(20), 188 VEmptyView(20),
184 GestureDetector( 189 GestureDetector(
185 onTap: () { 190 onTap: () {
186 - Navigator.of(context).pop();  
187 setReserveStatus("6"); 191 setReserveStatus("6");
188 }, 192 },
189 child: Container( 193 child: Container(
@@ -304,6 +308,9 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -304,6 +308,9 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
304 ], 308 ],
305 ), 309 ),
306 ); 310 );
  311 + if(detailEntity.status=="6"&&isSelf==false){//订单已被拒绝
  312 + Navigator.of(context).pop();
  313 + }
307 return container; 314 return container;
308 }, 315 },
309 ); 316 );
@@ -342,20 +349,21 @@ class HandleOnlinePageState extends State<HandleOnlinePage> { @@ -342,20 +349,21 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
342 "cause": json.encode(causeMap) 349 "cause": json.encode(causeMap)
343 }; 350 };
344 if (status == "6") { 351 if (status == "6") {
345 - isPause = true; 352 + isPause = (ac=="1"?true:false);
346 params['ac'] = ac; //0=直接拒绝 1=拒绝并暂停预订 353 params['ac'] = ac; //0=直接拒绝 1=拒绝并暂停预订
347 } 354 }
348 bool success = await detailModel.setReserveStatus(context, params, 355 bool success = await detailModel.setReserveStatus(context, params,
349 - ifPush: (isPause ? false : true), showLoading: true); 356 + ifPush: (status=="6" ? false : true), showLoading: true);
350 if (success != null && success) { 357 if (success != null && success) {
351 bus.emit("refresh_book_list"); 358 bus.emit("refresh_book_list");
352 if (status == "6") { 359 if (status == "6") {
353 isRefused = true; 360 isRefused = true;
354 - }  
355 - if (isPause) { 361 + isSelf=true;
356 _getOrderListData(); 362 _getOrderListData();
357 - refuseDialogState(() {});  
358 } 363 }
  364 + }else{
  365 + isSelf=false;
  366 + _getOrderListData();
359 } 367 }
360 } 368 }
361 369
@@ -114,7 +114,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -114,7 +114,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
114 mainAxisAlignment: MainAxisAlignment.spaceBetween, 114 mainAxisAlignment: MainAxisAlignment.spaceBetween,
115 children: _notebookDetailChangeModel.dateList.map((value) { 115 children: _notebookDetailChangeModel.dateList.map((value) {
116 return CustomButton( 116 return CustomButton(
117 - dateText: value['title'], 117 + dateText: value['title'].toString().length<=5?value['title'].toString():value['title'].toString().substring(5),
118 fontSize: value['fontSize'], 118 fontSize: value['fontSize'],
119 dayText: value['dayText'], 119 dayText: value['dayText'],
120 isImage: value['isImage'], 120 isImage: value['isImage'],
  1 +import 'package:common_utils/common_utils.dart';
1 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
2 import 'package:flutter_screenutil/flutter_screenutil.dart'; 3 import 'package:flutter_screenutil/flutter_screenutil.dart';
3 import 'package:one_key/models/message.dart'; 4 import 'package:one_key/models/message.dart';
  5 +import 'package:one_key/pages/detail/handle_online_page.dart';
  6 +import 'package:one_key/pages/home/home_page.dart';
4 import 'package:one_key/provider/message_dialog_model.dart'; 7 import 'package:one_key/provider/message_dialog_model.dart';
5 import 'package:one_key/provider/user_model.dart'; 8 import 'package:one_key/provider/user_model.dart';
6 import 'package:one_key/res/colors.dart'; 9 import 'package:one_key/res/colors.dart';
@@ -10,6 +13,8 @@ import 'package:one_key/widgets/h_empty_view.dart'; @@ -10,6 +13,8 @@ import 'package:one_key/widgets/h_empty_view.dart';
10 import 'package:one_key/widgets/v_empty_view.dart'; 13 import 'package:one_key/widgets/v_empty_view.dart';
11 import 'package:provider/provider.dart'; 14 import 'package:provider/provider.dart';
12 15
  16 +import '../../app.dart';
  17 +
13 class MessageDialogItem extends StatelessWidget { 18 class MessageDialogItem extends StatelessWidget {
14 19
15 final Message message; 20 final Message message;
@@ -20,7 +20,6 @@ import 'package:one_key/widgets/page_exception.dart'; @@ -20,7 +20,6 @@ import 'package:one_key/widgets/page_exception.dart';
20 import 'package:provider/provider.dart'; 20 import 'package:provider/provider.dart';
21 21
22 class NoteBookPage extends StatefulWidget { 22 class NoteBookPage extends StatefulWidget {
23 -  
24 @override 23 @override
25 State<StatefulWidget> createState() { 24 State<StatefulWidget> createState() {
26 // TODO: implement createState 25 // TODO: implement createState
@@ -41,6 +40,8 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -41,6 +40,8 @@ class NoteBookPageState extends State<NoteBookPage> {
41 40
42 UserModel userModel; 41 UserModel userModel;
43 42
  43 + int tabIndex = 0; //当前选中的tab 标签
  44 +
44 @override 45 @override
45 void initState() { 46 void initState() {
46 // TODO: implement initState 47 // TODO: implement initState
@@ -68,7 +69,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -68,7 +69,7 @@ class NoteBookPageState extends State<NoteBookPage> {
68 //初始化时间 69 //初始化时间
69 _initTime() { 70 _initTime() {
70 dateTime = DateTime.now(); 71 dateTime = DateTime.now();
71 - dateText = Utils.addZeroNumber(dateTime.month) + 72 + dateText = "${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
72 "月" + 73 "月" +
73 Utils.addZeroNumber(dateTime.day) + 74 Utils.addZeroNumber(dateTime.day) +
74 "日" + 75 "日" +
@@ -141,6 +142,9 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -141,6 +142,9 @@ class NoteBookPageState extends State<NoteBookPage> {
141 "keywords": "", 142 "keywords": "",
142 "sort": "1" 143 "sort": "1"
143 }; 144 };
  145 + if(tabIndex==1){
  146 + params["account"]=userModel.user.account;
  147 + }
144 model.getReserveList(context, params); 148 model.getReserveList(context, params);
145 } 149 }
146 150
@@ -180,6 +184,9 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -180,6 +184,9 @@ class NoteBookPageState extends State<NoteBookPage> {
180 ? "0" + dateTime.day.toString() 184 ? "0" + dateTime.day.toString()
181 : dateTime.day.toString()) 185 : dateTime.day.toString())
182 }; 186 };
  187 + if(tabIndex==1){
  188 + params["account"]=userModel.user.account;
  189 + }
183 model.getReserveCountDay(context, params); 190 model.getReserveCountDay(context, params);
184 } 191 }
185 192
@@ -256,7 +263,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -256,7 +263,7 @@ class NoteBookPageState extends State<NoteBookPage> {
256 if (Utils.isOneDay(day, dateTime)) return; //日期没变 263 if (Utils.isOneDay(day, dateTime)) return; //日期没变
257 setState(() { 264 setState(() {
258 DateTime dateNow = DateTime.now(); 265 DateTime dateNow = DateTime.now();
259 - dateText = Utils.addZeroNumber(day.month) + 266 + dateText = "${day.year}年 "+Utils.addZeroNumber(day.month) +
260 "月" + 267 "月" +
261 Utils.addZeroNumber(day.day) + 268 Utils.addZeroNumber(day.day) +
262 "日"; 269 "日";
@@ -275,6 +282,122 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -275,6 +282,122 @@ class NoteBookPageState extends State<NoteBookPage> {
275 _reserveCountDay(); 282 _reserveCountDay();
276 } 283 }
277 284
  285 + Widget _buildTabbar() {
  286 + Container container = Container(
  287 + color: MyColours.color_ffffff,
  288 + width: double.infinity,
  289 + padding: EdgeInsets.only(left: ScreenUtil().setWidth(20),top: ScreenUtil().setWidth(20)),
  290 + child: Row(
  291 + mainAxisSize: MainAxisSize.min,
  292 + children: <Widget>[
  293 + Container(
  294 + padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
  295 + child: GestureDetector(
  296 + onTap: () {
  297 + if(tabIndex==0)return;
  298 + setState(() {
  299 + tabIndex = 0;
  300 + _getReserveList();
  301 + _reserveCountDay();
  302 + });
  303 + },
  304 + child: Column(
  305 + mainAxisAlignment: MainAxisAlignment.center,
  306 + children: <Widget>[
  307 + Text(
  308 + "全部预订",
  309 + style: TextStyle(
  310 + color: tabIndex == 0
  311 + ? MyColours.color_353535
  312 + : MyColours.color_999999,
  313 + fontSize: tabIndex == 0
  314 + ? ScreenUtil().setSp(36)
  315 + : ScreenUtil().setSp(28),
  316 + fontWeight: tabIndex == 0
  317 + ? FontWeight.bold
  318 + : FontWeight.normal),
  319 + ),
  320 + Align(
  321 + alignment: Alignment.bottomCenter,
  322 + child: Container(
  323 + height: ScreenUtil().setWidth(6),
  324 + width: ScreenUtil().setWidth(60),
  325 + margin:
  326 + EdgeInsets.only(top: ScreenUtil().setWidth(8)),
  327 + decoration: tabIndex == 0
  328 + ? BoxDecoration(color: MyColours.color_199095,borderRadius: BorderRadius.circular(
  329 + ScreenUtil()
  330 + .setWidth(
  331 + 6)))
  332 + : BoxDecoration(
  333 + color: MyColours.color_ffffff,
  334 + borderRadius: BorderRadius.circular(
  335 + ScreenUtil()
  336 + .setWidth(
  337 + 6))
  338 + ),
  339 + ),
  340 + ),
  341 + ],
  342 + )),
  343 + ),
  344 + Container(
  345 + padding: EdgeInsets.symmetric(horizontal: ScreenUtil().setWidth(20)),
  346 + child: GestureDetector(
  347 + onTap: () {
  348 + if(tabIndex==1)return;
  349 + setState(() {
  350 + tabIndex = 1;
  351 + _getReserveList();
  352 + _reserveCountDay();
  353 + });
  354 + },
  355 + child: Column(
  356 + mainAxisAlignment: MainAxisAlignment.center,
  357 + children: <Widget>[
  358 + Text(
  359 + "我录入的",
  360 + style: TextStyle(
  361 + color: tabIndex == 1
  362 + ? MyColours.color_353535
  363 + : MyColours.color_999999,
  364 + fontSize: tabIndex == 1
  365 + ? ScreenUtil().setSp(36)
  366 + : ScreenUtil().setSp(28),
  367 + fontWeight: tabIndex == 1
  368 + ? FontWeight.bold
  369 + : FontWeight.normal),
  370 + ),
  371 + Align(
  372 + alignment: Alignment.bottomCenter,
  373 + child: Container(
  374 + height: ScreenUtil().setWidth(6),
  375 + width: ScreenUtil().setWidth(60),
  376 + margin:
  377 + EdgeInsets.only(top: ScreenUtil().setWidth(8)),
  378 + decoration: tabIndex == 1
  379 + ? BoxDecoration(color: MyColours.color_199095,borderRadius: BorderRadius.circular(
  380 + ScreenUtil()
  381 + .setWidth(
  382 + 6)))
  383 + : BoxDecoration(
  384 + color: MyColours.color_ffffff,
  385 + borderRadius: BorderRadius.circular(
  386 + ScreenUtil()
  387 + .setWidth(
  388 + 6))
  389 + ),
  390 + ),
  391 + ),
  392 + ],
  393 + )),
  394 + ),
  395 + ],
  396 + ),
  397 + );
  398 + return container;
  399 + }
  400 +
278 @override 401 @override
279 Widget build(BuildContext context) { 402 Widget build(BuildContext context) {
280 // TODO: implement build 403 // TODO: implement build
@@ -284,10 +407,7 @@ class NoteBookPageState extends State<NoteBookPage> { @@ -284,10 +407,7 @@ class NoteBookPageState extends State<NoteBookPage> {
284 color: MyColours.color_f5f5f5, 407 color: MyColours.color_f5f5f5,
285 child: Column( 408 child: Column(
286 children: <Widget>[ 409 children: <Widget>[
287 - MyAppBar(  
288 - "已预订",  
289 - showBack: false,  
290 - ), 410 + _buildTabbar(),
291 Container( 411 Container(
292 color: MyColours.color_ffffff, 412 color: MyColours.color_ffffff,
293 width: double.infinity, 413 width: double.infinity,
@@ -77,11 +77,11 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -77,11 +77,11 @@ class NotebookDetailChangeModel with ChangeNotifier {
77 ddateStr = DateUtil.formatDate(createTime, format: DateFormats.h_m); 77 ddateStr = DateUtil.formatDate(createTime, format: DateFormats.h_m);
78 String dateTimeSelect = DateUtil.formatDateMs( 78 String dateTimeSelect = DateUtil.formatDateMs(
79 createTime.millisecondsSinceEpoch, 79 createTime.millisecondsSinceEpoch,
80 - format: 'MM-dd'); 80 + format: 'yyyy-MM-dd');
81 //今天 81 //今天
82 DateTime dateTime = DateTime.now(); 82 DateTime dateTime = DateTime.now();
83 int dateTimeMill = dateTime.millisecondsSinceEpoch; 83 int dateTimeMill = dateTime.millisecondsSinceEpoch;
84 - String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'MM-dd'); 84 + String dateText = DateUtil.formatDateMs(dateTimeMill, format: 'yyyy-MM-dd');
85 dateList.add({ 85 dateList.add({
86 'title': dateText, 86 'title': dateText,
87 'select': dateTimeSelect == dateText ? true : false, 87 'select': dateTimeSelect == dateText ? true : false,
@@ -92,7 +92,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -92,7 +92,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
92 //明天 92 //明天
93 int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000; 93 int tomorrowMill = dateTimeMill + 24 * 60 * 60 * 1000;
94 String dateTextTomorrow = 94 String dateTextTomorrow =
95 - DateUtil.formatDateMs(tomorrowMill, format: 'MM-dd'); 95 + DateUtil.formatDateMs(tomorrowMill, format: 'yyyy-MM-dd');
96 dateList.add({ 96 dateList.add({
97 'title': dateTextTomorrow, 97 'title': dateTextTomorrow,
98 'select': dateTimeSelect == dateTextTomorrow ? true : false, 98 'select': dateTimeSelect == dateTextTomorrow ? true : false,
@@ -316,16 +316,14 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -316,16 +316,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
316 //初始化早市午市晚市选中时间 316 //初始化早市午市晚市选中时间
317 initHourAndMinuteSelect() { 317 initHourAndMinuteSelect() {
318 int timeMillsNow = DateTime.now().millisecondsSinceEpoch; 318 int timeMillsNow = DateTime.now().millisecondsSinceEpoch;
319 - //当前选中 月 日string  
320 - String mdStr = ''; 319 + //当前选中 年-月-日
  320 + String ymyStr="";
321 //今天 明天 其他天 321 //今天 明天 其他天
322 for (var item in dateList) { 322 for (var item in dateList) {
323 if (item['select'] == true) { 323 if (item['select'] == true) {
324 - mdStr = item['title']; 324 + ymyStr = item['title'];
325 } 325 }
326 } 326 }
327 - String timeNowYear = DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
328 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
329 String timeStr = ymyStr + ' 00:00:00'; 327 String timeStr = ymyStr + ' 00:00:00';
330 LogUtil.v(timeStr); 328 LogUtil.v(timeStr);
331 DateTime dateTime = DateUtil.getDateTime(timeStr); //当前年月日 329 DateTime dateTime = DateUtil.getDateTime(timeStr); //当前年月日
@@ -589,16 +587,14 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -589,16 +587,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
589 sex = item['code']; 587 sex = item['code'];
590 } 588 }
591 } 589 }
592 - //当前选中 月 日string  
593 - String mdStr = ''; 590 + //当前选中 年-月-日string
  591 + String ymyStr="";
594 //今天 明天 其他天 592 //今天 明天 其他天
595 for (var item in dateList) { 593 for (var item in dateList) {
596 if (item['select'] == true) { 594 if (item['select'] == true) {
597 - mdStr = item['title']; 595 + ymyStr = item['title'];
598 } 596 }
599 } 597 }
600 - String timeNowYear = DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
601 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
602 String timeStr = ymyStr + ' ' + ddateStr + ':00'; 598 String timeStr = ymyStr + ' ' + ddateStr + ':00';
603 // int start = DateUtil.getDateMsByTimeStr(timeStr); 599 // int start = DateUtil.getDateMsByTimeStr(timeStr);
604 600
@@ -708,16 +704,14 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -708,16 +704,14 @@ class NotebookDetailChangeModel with ChangeNotifier {
708 sex = item['code']; 704 sex = item['code'];
709 } 705 }
710 } 706 }
711 - //当前选中 月 日string  
712 - String mdStr = ''; 707 + //当前选中 年-月-日string
  708 + String ymyStr="";
713 //今天 明天 其他天 709 //今天 明天 其他天
714 for (var item in dateList) { 710 for (var item in dateList) {
715 if (item['select'] == true) { 711 if (item['select'] == true) {
716 - mdStr = item['title']; 712 + ymyStr = item['title'];
717 } 713 }
718 } 714 }
719 - String timeNowYear = DateUtil.formatDate(DateTime.now(), format: 'yyyy');  
720 - String ymyStr = timeNowYear + '-' + mdStr; //年月日  
721 String timeStr = ymyStr + ' ' + ddateStr + ':00'; 715 String timeStr = ymyStr + ' ' + ddateStr + ':00';
722 // int start = DateUtil.getDateMsByTimeStr(timeStr); 716 // int start = DateUtil.getDateMsByTimeStr(timeStr);
723 717
@@ -105,15 +105,15 @@ class NotebookDetailModel extends ChangeNotifier { @@ -105,15 +105,15 @@ class NotebookDetailModel extends ChangeNotifier {
105 .catchError((error) { 105 .catchError((error) {
106 print(error.toString()); 106 print(error.toString());
107 }); 107 });
108 - if (baseResp == null) return false;  
109 - if (baseResp.code == Constant.status_success) { 108 + if (baseResp == null)return false;
  109 + if (baseResp.code == Constant.status_success&&baseResp.data!=null) {
110 if (ifPush) { 110 if (ifPush) {
111 NavigatorUtil.goNotebookDetailPage(context, params["rid"], 111 NavigatorUtil.goNotebookDetailPage(context, params["rid"],
112 replace: true); 112 replace: true);
113 } 113 }
114 return true; 114 return true;
115 } else { 115 } else {
116 - Utils.showToast(baseResp.msg); 116 + Utils.showToast("订单已被处理");
117 return false; 117 return false;
118 } 118 }
119 } 119 }
@@ -51,7 +51,7 @@ class TableManagerModel with ChangeNotifier{ @@ -51,7 +51,7 @@ class TableManagerModel with ChangeNotifier{
51 initTime(BuildContext context) async { 51 initTime(BuildContext context) async {
52 userModel = Provider.of<UserModel>(context, listen: false); 52 userModel = Provider.of<UserModel>(context, listen: false);
53 dateTime = DateTime.now(); 53 dateTime = DateTime.now();
54 - dateText = Utils.addZeroNumber(dateTime.month) + 54 + dateText = "${dateTime.year}年 "+Utils.addZeroNumber(dateTime.month) +
55 "月" + 55 "月" +
56 Utils.addZeroNumber(dateTime.day) + 56 Utils.addZeroNumber(dateTime.day) +
57 "日" + 57 "日" +
@@ -346,7 +346,7 @@ class TableManagerModel with ChangeNotifier{ @@ -346,7 +346,7 @@ class TableManagerModel with ChangeNotifier{
346 createDateText(BuildContext context,DateTime day) { 346 createDateText(BuildContext context,DateTime day) {
347 if (Utils.isOneDay(day, dateTime)) return; //日期没变 347 if (Utils.isOneDay(day, dateTime)) return; //日期没变
348 DateTime dateNow = DateTime.now(); 348 DateTime dateNow = DateTime.now();
349 - dateText = Utils.addZeroNumber(day.month) + 349 + dateText = "${day.year}年 "+Utils.addZeroNumber(day.month) +
350 "月" + 350 "月" +
351 Utils.addZeroNumber(day.day) + 351 Utils.addZeroNumber(day.day) +
352 "日"; 352 "日";
@@ -20,7 +20,7 @@ import '../app.dart'; @@ -20,7 +20,7 @@ import '../app.dart';
20 20
21 class Utils { 21 class Utils {
22 static void showToast(String msg) { 22 static void showToast(String msg) {
23 - Fluttertoast.showToast(msg: msg, gravity: ToastGravity.CENTER); 23 + Fluttertoast.showToast(msg: msg, toastLength:Toast.LENGTH_LONG,gravity: ToastGravity.CENTER);
24 } 24 }
25 25
26 //本地图片资源路径 26 //本地图片资源路径