变更预订

@@ -11,14 +11,14 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
-def flutterVersionCode = "310"
+def flutterVersionCode = "311"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '310'
+    flutterVersionCode = '311'
 }
 
-def flutterVersionName = "3.1.0"
+def flutterVersionName = "3.1.1"
 if (flutterVersionName == null) {
-    flutterVersionName = '3.1.0'
+    flutterVersionName = '3.1.1'
 }
 
 apply plugin: 'com.android.application'

@@ -940,6 +940,17 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
     } else if (detailEntity.ddate_solt == '3') {
       title = '晚餐';
     }
+
+    for (var itemSun in dailyList) {
+      itemSun['select'] = false;
+      if (itemSun['title'] == detailEntity.ddateStr) {
+        itemSun['select'] = true;
+      }
+    }
+    // if (item['isSelect'] == true) {
+
+    // }
+
     final option = await showModalBottomSheet(
         context: context,
         isScrollControlled: true,

@@ -542,7 +542,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
     // } else if (currTimeIndex == 3) {
     //   tempTime = '18:00';
     // }
-    String ymd = DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);
+    // String ymd = DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);
     // String timeStr = ymd + ' ' + tempTime + ':00';
     // int start = DateUtil.getDateMsByTimeStr(timeStr);
     // int start = DateUtil.getDateMsByTimeStr(timeStr);
@@ -550,6 +550,28 @@ class NotebookDetailChangeModel with ChangeNotifier {
     // LogUtil.v(timeStr);
     // String tempDdate = ymyStr + ' ' + ddateStr + ':00';
 
+    String ddateHm = detailEntity.ddateHm; //订座详情页面的到店时间
+    String ddateSolt = detailEntity.ddate_solt; //订座详情页面的餐段（1，2，3 早餐、午餐、晚餐）
+    String tempTime = ddateHm; //默认上个页面到店时间半小时值
+    if (ddateSolt != currTimeIndex.toString()) {
+      //餐段发生改变，则重新默认到店时间半小时值
+      if (currTimeIndex == 1) {
+        tempTime = '08:00';
+      } else if (currTimeIndex == 2) {
+        tempTime = '12:00';
+      } else if (currTimeIndex == 3) {
+        tempTime = '18:00';
+      }
+    }
+
+    String ymd = DateUtil.formatDate(dateTime, format: DateFormats.y_mo_d);
+    String timeStr = ymd + ' ' + tempTime + ':00';
+    // int start = DateUtil.getDateMsByTimeStr(timeStr);
+
+    LogUtil.v(timeStr);
+    // String tempDdate = ymyStr + ' ' + ddateStr + ':00';
+    int ddate = DateUtil.getDateMsByTimeStr(timeStr);
+
     String tableSelectInfo = '';
     for (TableList item in tableList) {
       // if (item.selected) {
@@ -592,6 +614,7 @@ class NotebookDetailChangeModel with ChangeNotifier {
       'type': "0", //内部预订
       "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time)
       // 'is_set_ddate': "1",
+      "ddate": '${ddate}'.substring(0, 10), //到店时间
       "channel": '5',
       "uid": userModel.user.openid
     };

@@ -312,12 +312,12 @@ class TableManagerModel with ChangeNotifier {
         'type': "0", //内部预订
         "rdate": rdate, //预定用餐时间范围：时间戳 开始时间戳(time)-结束时间戳(time)
         "ddate": '${ddate}'.substring(0, 10), //到店时间
-        'is_set_ddate': '1',
+        // 'is_set_ddate': '1',
         "channel": '5',
         "uid": userModel.user.openid,
-        'sex': '',
-        'phone': '',
-        "cusdem": ''
+        // 'sex': '',
+        // 'phone': '',
+        // "cusdem": ''
       };
       print(params);
       BaseResp<Map<String, dynamic>> baseResp = await DioUtil()