xt / Flutter-ReserveApp · Commits

Go to a project

Commit 7323c77becfca92405330849e87a5f61fba41b13

Authored by wdn127929
1 parent 726f6ea6
build: skipped

变更预订

Inline Side-by-side
Showing 4 changed files with 43 additions and 9 deletions
@@ -11,14 +11,14 @@ if (flutterRoot == null) { @@ -11,14 +11,14 @@ if (flutterRoot == null) {
11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") 11 throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12 } 12 }
13 13
14 -def flutterVersionCode = "310" 14 +def flutterVersionCode = "311"
15 if (flutterVersionCode == null) { 15 if (flutterVersionCode == null) {
16 - flutterVersionCode = '310' 16 + flutterVersionCode = '311'
17 } 17 }
18 18
19 -def flutterVersionName = "3.1.0" 19 +def flutterVersionName = "3.1.1"
20 if (flutterVersionName == null) { 20 if (flutterVersionName == null) {
21 - flutterVersionName = '3.1.0' 21 + flutterVersionName = '3.1.1'
22 } 22 }
23 23
24 apply plugin: 'com.android.application' 24 apply plugin: 'com.android.application'
@@ -940,6 +940,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -940,6 +940,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
940 } else if (detailEntity.ddate_solt == '3') { 940 } else if (detailEntity.ddate_solt == '3') {
941 title = '晚餐'; 941 title = '晚餐';
942 } 942 }
  943 +
  944 + for (var itemSun in dailyList) {
  945 + itemSun['select'] = false;
  946 + if (itemSun['title'] == detailEntity.ddateStr) {
  947 + itemSun['select'] = true;
  948 + }
  949 + }
  950 + // if (item['isSelect'] == true) {
  951 +
  952 + // }
  953 +
943 final option = await showModalBottomSheet( 954 final option = await showModalBottomSheet(
944 context: context, 955 context: context,
945 isScrollControlled: true, 956 isScrollControlled: true,
@@ -542,7 +542,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -542,7 +542,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
542 // } else if (currTimeIndex == 3) { 542 // } else if (currTimeIndex == 3) {
543 // tempTime = '18:00'; 543 // tempTime = '18:00';
544 // } 544 // }
545 - String ymd = DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d); 545 + // String ymd = DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);
546 // String timeStr = ymd + ' ' + tempTime + ':00'; 546 // String timeStr = ymd + ' ' + tempTime + ':00';
547 // int start = DateUtil.getDateMsByTimeStr(timeStr); 547 // int start = DateUtil.getDateMsByTimeStr(timeStr);
548 // int start = DateUtil.getDateMsByTimeStr(timeStr); 548 // int start = DateUtil.getDateMsByTimeStr(timeStr);
@@ -550,6 +550,28 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -550,6 +550,28 @@ class NotebookDetailChangeModel with ChangeNotifier {
550 // LogUtil.v(timeStr); 550 // LogUtil.v(timeStr);
551 // String tempDdate = ymyStr + ' ' + ddateStr + ':00'; 551 // String tempDdate = ymyStr + ' ' + ddateStr + ':00';
552 552
  553 + String ddateHm = detailEntity.ddateHm; //订座详情页面的到店时间
  554 + String ddateSolt = detailEntity.ddate_solt; //订座详情页面的餐段（1，2，3 早餐、午餐、晚餐）
  555 + String tempTime = ddateHm; //默认上个页面到店时间半小时值
  556 + if (ddateSolt != currTimeIndex.toString()) {
  557 + //餐段发生改变，则重新默认到店时间半小时值
  558 + if (currTimeIndex == 1) {
  559 + tempTime = '08:00';
  560 + } else if (currTimeIndex == 2) {
  561 + tempTime = '12:00';
  562 + } else if (currTimeIndex == 3) {
  563 + tempTime = '18:00';
  564 + }
  565 + }
  566 +
  567 + String ymd = DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);
  568 + String timeStr = ymd + ' ' + tempTime + ':00';
  569 + // int start = DateUtil.getDateMsByTimeStr(timeStr);
  570 +
  571 + LogUtil.v(timeStr);
  572 + // String tempDdate = ymyStr + ' ' + ddateStr + ':00';
  573 + int ddate = DateUtil.getDateMsByTimeStr(timeStr);
  574 +
553 String tableSelectInfo = ''; 575 String tableSelectInfo = '';
554 for (TableList item in tableList) { 576 for (TableList item in tableList) {
555 // if (item.selected) { 577 // if (item.selected) {
@@ -592,6 +614,7 @@ class NotebookDetailChangeModel with ChangeNotifier { @@ -592,6 +614,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
592 'type': "0", //内部预订 614 'type': "0", //内部预订
593 "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time) 615 "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time)
594 // 'is_set_ddate': "1", 616 // 'is_set_ddate': "1",
  617 + "ddate": '${ddate}'.substring(0, 10), //到店时间
595 "channel": '5', 618 "channel": '5',
596 "uid": userModel.user.openid 619 "uid": userModel.user.openid
597 }; 620 };
@@ -312,12 +312,12 @@ class TableManagerModel with ChangeNotifier { @@ -312,12 +312,12 @@ class TableManagerModel with ChangeNotifier {
312 'type': "0", //内部预订 312 'type': "0", //内部预订
313 "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time) 313 "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time)
314 "ddate": '${ddate}'.substring(0, 10), //到店时间 314 "ddate": '${ddate}'.substring(0, 10), //到店时间
315 - 'is_set_ddate': '1', 315 + // 'is_set_ddate': '1',
316 "channel": '5', 316 "channel": '5',
317 "uid": userModel.user.openid, 317 "uid": userModel.user.openid,
318 - 'sex': '',  
319 - 'phone': '',  
320 - "cusdem": '' 318 + // 'sex': '',
  319 + // 'phone': '',
  320 + // "cusdem": ''
321 }; 321 };
322 print(params); 322 print(params);
323 BaseResp<Map<String, dynamic>> baseResp = await DioUtil() 323 BaseResp<Map<String, dynamic>> baseResp = await DioUtil()