xt / Flutter-ReserveApp · Commits

Go to a project

Commit 180f64ffccb8b9c22d69787dd1532cf58ce6d07b

Authored by wdn127929
1 parent 8d731f5f
build: skipped

桌面页面获取已预订订单的rdate从可预订时段改为2023-7-28 00：00：00 -- 2023-7-28 23：59：59

Inline Side-by-side
Showing 2 changed files with 46 additions and 23 deletions
@@ -1416,6 +1416,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1416,6 +1416,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1416 content: ddateHm, 1416 content: ddateHm,
1417 list: personNumList, 1417 list: personNumList,
1418 detailModel: model, 1418 detailModel: model,
  1419 + uid:widget.uid,
1419 callback: () { 1420 callback: () {
1420 //时间弹窗 1421 //时间弹窗
1421 FocusScope.of(context) 1422 FocusScope.of(context)
@@ -1489,6 +1490,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1489,6 +1490,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1489 isPrice: false, 1490 isPrice: false,
1490 controller: pnumC, 1491 controller: pnumC,
1491 focusNode: pnumF, 1492 focusNode: pnumF,
  1493 + uid:widget.uid,
1492 callback: () async { 1494 callback: () async {
1493 bool sucess = 1495 bool sucess =
1494 await detailModel 1496 await detailModel
@@ -1563,6 +1565,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -1563,6 +1565,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
1563 detailModel: detailModel, 1565 detailModel: detailModel,
1564 rid: widget.rid, 1566 rid: widget.rid,
1565 isPrice: true, 1567 isPrice: true,
  1568 + uid:widget.uid,
1566 controller: 1569 controller:
1567 detailModel.numController, 1570 detailModel.numController,
1568 focusNode: priceF, 1571 focusNode: priceF,
@@ -3335,6 +3338,7 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield> @@ -3335,6 +3338,7 @@ class _TitleAndTextfieldState extends State<TitleAndTextfield>
3335 if (notDo) { 3338 if (notDo) {
3336 hasAuthority = false; 3339 hasAuthority = false;
3337 } 3340 }
  3341 +
3338 WidgetsBinding.instance.addObserver(this); 3342 WidgetsBinding.instance.addObserver(this);
3339 // if (Platform.isIOS) { 3343 // if (Platform.isIOS) {
3340 widget.focusNode.addListener(() { 3344 widget.focusNode.addListener(() {
@@ -899,33 +899,52 @@ class TableManagerModel with ChangeNotifier { @@ -899,33 +899,52 @@ class TableManagerModel with ChangeNotifier {
899 //晚市 899 //晚市
900 keys = 'night'; 900 keys = 'night';
901 } 901 }
902 - String ymd = DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);  
903 - String timeStrStart = '';  
904 - String timeStrEnd = ''; 902 + // String ymd = DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);
  903 + // String timeStrStart = '';
  904 + // String timeStrEnd = '';
905 //一天开始时间 905 //一天开始时间
906 double startDay; 906 double startDay;
907 //一天结束时间 907 //一天结束时间
908 double endDay; 908 double endDay;
909 - if (keys != '') {  
910 - List temp = dailyMap[keys];  
911 - timeStrStart = ymd + ' ' + temp.first + ':00';  
912 - timeStrEnd = ymd + ' ' + temp.last + ':00';  
913 - } else {  
914 - timeStrStart = dateTime.year.toString() +  
915 - "-" +  
916 - Utils.addZeroNumber(dateTime.month) +  
917 - "-" +  
918 - Utils.addZeroNumber(dateTime.day) +  
919 - " 00:00:00";  
920 - timeStrEnd = dateTime.year.toString() +  
921 - "-" +  
922 - Utils.addZeroNumber(dateTime.month) +  
923 - "-" +  
924 - Utils.addZeroNumber(dateTime.day) +  
925 - " 23:59:59";  
926 - }  
927 - startDay = (DateTime.parse(timeStrStart).millisecondsSinceEpoch) / 1000;  
928 - endDay = (DateTime.parse(timeStrEnd).millisecondsSinceEpoch) / 1000; 909 + // if (keys != '') {
  910 + // List temp = dailyMap[keys];
  911 + // timeStrStart = ymd + ' ' + temp.first + ':00';
  912 + // timeStrEnd = ymd + ' ' + temp.last + ':00';
  913 + // } else {
  914 + // timeStrStart = dateTime.year.toString() +
  915 + // "-" +
  916 + // Utils.addZeroNumber(dateTime.month) +
  917 + // "-" +
  918 + // Utils.addZeroNumber(dateTime.day) +
  919 + // " 00:00:00";
  920 + // timeStrEnd = dateTime.year.toString() +
  921 + // "-" +
  922 + // Utils.addZeroNumber(dateTime.month) +
  923 + // "-" +
  924 + // Utils.addZeroNumber(dateTime.day) +
  925 + // " 23:59:59";
  926 + // }
  927 +
  928 + //一天开始时间
  929 + startDay = (DateTime.parse((dateTime.year.toString() +
  930 + "-" +
  931 + Utils.addZeroNumber(dateTime.month) +
  932 + "-" +
  933 + Utils.addZeroNumber(dateTime.day) +
  934 + " 00:00:00"))
  935 + .millisecondsSinceEpoch) /
  936 + 1000;
  937 + //一天结束时间
  938 + endDay = (DateTime.parse((dateTime.year.toString() +
  939 + "-" +
  940 + Utils.addZeroNumber(dateTime.month) +
  941 + "-" +
  942 + Utils.addZeroNumber(dateTime.day) +
  943 + " 23:59:59"))
  944 + .millisecondsSinceEpoch) /
  945 + 1000;
  946 + // startDay = (DateTime.parse(timeStrStart).millisecondsSinceEpoch) / 1000;
  947 + // endDay = (DateTime.parse(timeStrEnd).millisecondsSinceEpoch) / 1000;
929 return startDay.floor().toString() + "-" + endDay.floor().toString(); 948 return startDay.floor().toString() + "-" + endDay.floor().toString();
930 } 949 }
931 950