预订详情和预订变更页优化

@@ -18,19 +18,19 @@ if (flutterRoot == null) {
 
 
 
 
 
 
-def flutterVersionCode = "526"
+def flutterVersionCode = "527"
 if (flutterVersionCode == null) {
 if (flutterVersionCode == null) {
-    flutterVersionCode = '526'
+    flutterVersionCode = '527'
 
 
 
 
 
 
 }
 }
 
 
 
 
-def flutterVersionName = "5.2.6"
+def flutterVersionName = "5.2.7"
 
 
 if (flutterVersionName == null) {
 if (flutterVersionName == null) {
-    flutterVersionName = '5.2.6' 
+    flutterVersionName = '5.2.7' 
 
 
 
 
 }
 }

@@ -416,9 +416,9 @@ class HandleOnlinePageState extends State<HandleOnlinePage> {
         body: SafeArea(
         body: SafeArea(
             child: WillPopScope(
             child: WillPopScope(
           child: Consumer<NotebookDetailModel>(builder: (context, model, _) {
           child: Consumer<NotebookDetailModel>(builder: (context, model, _) {
-            if (model.pageState != PageState.Success) {
+            if (model.pageStateChange!= PageState.Success) {
               return ExceptionPage(
               return ExceptionPage(
-                pageState: model.pageState,
+                pageState: model.pageStateChange,
                 callback: () {
                 callback: () {
                   _getOrderListData();
                   _getOrderListData();
                 },
                 },

@@ -151,7 +151,12 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
         },
         },
         showCircle: showCicle,
         showCircle: showCicle,
         isShowLoading: isShowLoading);
         isShowLoading: isShowLoading);
+        if (detailEntity.type == "0") {
+      //内部预订
+      detailEntity.is_set_ddate = "1";
+    }
 _notebookDetailChangeModel.detailEntity = detailEntity;
 _notebookDetailChangeModel.detailEntity = detailEntity;
+
      print(detailEntity);
      print(detailEntity);
     if (detailEntity.phone != '0') {
     if (detailEntity.phone != '0') {
       _notebookDetailChangeModel.phoneController.text = detailEntity.phone;
       _notebookDetailChangeModel.phoneController.text = detailEntity.phone;

@@ -74,7 +74,7 @@ class HandleOnlinePageSimState extends State<HandleOnlinePageSim> {
 
 
   /// 获取当前预订订单详情
   /// 获取当前预订订单详情
   _getOrderListData() async {
   _getOrderListData() async {
-    detailEntity = await detailModel.getReserveDetail(context, {
+    detailEntity = await detailModel.getReserveDetailSim(context, {
       "rid": widget.rid,
       "rid": widget.rid,
     });
     });
     setState(() {
     setState(() {
@@ -417,9 +417,9 @@ class HandleOnlinePageSimState extends State<HandleOnlinePageSim> {
         body: SafeArea(
         body: SafeArea(
             child: WillPopScope(
             child: WillPopScope(
           child: Consumer<NotebookDetailModel>(builder: (context, model, _) {
           child: Consumer<NotebookDetailModel>(builder: (context, model, _) {
-            if (model.pageState != PageState.Success) {
+            if (model.pageStateSim != PageState.Success) {
               return ExceptionPage(
               return ExceptionPage(
-                pageState: model.pageState,
+                pageState: model.pageStateSim,
                 callback: () {
                 callback: () {
                   _getOrderListData();
                   _getOrderListData();
                 },
                 },

@@ -237,6 +237,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> {
       'rid': widget.rid,
       'rid': widget.rid,
     };
     };
     await detailModel.getReserveDepositByRid(context, params);
     await detailModel.getReserveDepositByRid(context, params);
+    setState((){});
   }
   }
 
 
   ///获取核餐记录
   ///获取核餐记录
@@ -245,6 +246,9 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> {
       'rid': widget.rid,
       'rid': widget.rid,
     };
     };
     await detailModel.getReserveRecheckByRid(context, params);
     await detailModel.getReserveRecheckByRid(context, params);
+    setState(() {
+      
+    });
   }
   }
 
 
   ///删除订金
   ///删除订金
@@ -499,7 +503,7 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> {
 
 
   ///订座详情
   ///订座详情
   _getReserveDetail({bool showCicle = false, bool isShowLoading = true}) async {
   _getReserveDetail({bool showCicle = false, bool isShowLoading = true}) async {
-    detailEntity = await detailModel.getReserveDetail(
+    detailEntity = await detailModel.getReserveDetailSim(
         context,
         context,
         {
         {
           "rid": widget.rid,
           "rid": widget.rid,
@@ -2298,9 +2302,9 @@ class NotebookDetailPageSimState extends State<NotebookDetailPageSim> {
                 ),
                 ),
                 body: Consumer<NotebookDetailModel>(
                 body: Consumer<NotebookDetailModel>(
                     builder: (context1, model, _) {
                     builder: (context1, model, _) {
-                  if (model.pageState != PageState.Success) {
+                  if (model.pageStateSim != PageState.Success) {
                     return ExceptionPage(
                     return ExceptionPage(
-                      pageState: model.pageState,
+                      pageState: model.pageStateSim,
                       callback: () async {
                       callback: () async {
                         // _getOrderListData();
                         // _getOrderListData();
                         _initCancel();
                         _initCancel();

@@ -36,6 +36,8 @@ import 'dart:convert' as convert;
 class NotebookDetailModel extends ChangeNotifier {
 class NotebookDetailModel extends ChangeNotifier {
   PageState pageState = PageState.Loading;
   PageState pageState = PageState.Loading;
   PageState pageStateChange = PageState.Loading;
   PageState pageStateChange = PageState.Loading;
+  PageState pageStateSim = PageState.Loading;
+  
 
 
   String selectNum;
   String selectNum;
   int selectIndex;
   int selectIndex;
@@ -403,7 +405,9 @@ class NotebookDetailModel extends ChangeNotifier {
       return null;
       return null;
     });
     });
     if (baseResp.code == Constant.status_success) {
     if (baseResp.code == Constant.status_success) {
-      return GetReserveTypeFieldModel.fromJson(baseResp.responseData).data;
+       reserveTypes =
+          GetReserveTypeFieldModel.fromJson(baseResp.responseData).data;
+      return reserveTypes;
     } else {
     } else {
       pageState = PageState.ConnectivityError;
       pageState = PageState.ConnectivityError;
       if (baseResp != null) {
       if (baseResp != null) {
@@ -413,6 +417,51 @@ class NotebookDetailModel extends ChangeNotifier {
     return null;
     return null;
   }
   }
 
 
+   ///获取已预订订单
+  Future<NotebookDetail> getReserveDetailSim(
+      BuildContext context, Map<String, String> params,
+      {isShowLoading = true, bool showCircle = false}) async {
+    if (isShowLoading) {
+      pageStateSim = PageState.Loading;
+      notifyListeners();
+    }
+    BaseResp<Map<String, dynamic>> baseResp = await DioUtil()
+        .request<Map<String, dynamic>>(
+            context, Method.post, HttpUrl.reserve_detail,
+            data: params, showLoading: isShowLoading ? false : showCircle)
+        .catchError((error) {
+      print(error.toString());
+      if (error is MyError) {
+        switch (error.type) {
+          case 1:
+            pageStateSim = PageState.ConnectivityError;
+            break;
+          case 2:
+            pageStateSim = PageState.ConnectivityTimeOut;
+            break;
+          default:
+            pageStateSim = PageState.ConnectivityError;
+            break;
+        }
+      }
+      notifyListeners();
+    });
+    if (baseResp.code == Constant.status_success) {
+      if (baseResp.data.isEmpty) {
+        pageStateSim = PageState.Empty;
+      } else {
+        pageStateSim = PageState.Success;
+      }
+      notifyListeners();
+      return NotebookDetail.fromJson(baseResp.data);
+    } else {
+      pageStateSim = PageState.ConnectivityError;
+      if (baseResp != null) {
+        Utils.showToast(baseResp.msg ?? "");
+      }
+    }
+  }
+
   ///获取已预订订单
   ///获取已预订订单
   Future<NotebookDetail> getReserveDetail(
   Future<NotebookDetail> getReserveDetail(
       BuildContext context, Map<String, String> params,
       BuildContext context, Map<String, String> params,