变更预订bug&预订安排页转圈

wdn127929
1 parent 98eca51d
Showing 7 changed files with 44 additions and 26 deletions
ios/Runner.xcodeproj/project.pbxproj
lib/constant/constant.dart
lib/pages/detail/notebook_detail_page.dart
lib/pages/invicate/invitation_page.dart
lib/pages/notebook/notebook_page.dart
lib/pages/table/table_manager_page.dart
lib/provider/notebook_detail_change_model_only.dart
--- a/ios/Runner.xcodeproj/project.pbxproj
View file @ec2c692
+++ b/ios/Runner.xcodeproj/project.pbxproj
View file @ec2c692
@@ -548,7 +548,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 52695;
+				CURRENT_PROJECT_VERSION = 52697;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -696,7 +696,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 52695;
+				CURRENT_PROJECT_VERSION = 52697;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -732,7 +732,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 52695;
+				CURRENT_PROJECT_VERSION = 52697;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
--- a/lib/constant/constant.dart
View file @ec2c692
+++ b/lib/constant/constant.dart
View file @ec2c692
@@ -10,10 +10,10 @@ class Constant {
    * 
    * 测试账号变更，已经删除0001 账户   代替为 0019！！！！！！！注意！！！！！！！！！！！！！！
    * */
-  // static const WXMiniProgramType wxMiniProgramType =
-  //     WXMiniProgramType.RELEASE; //正式版
   static const WXMiniProgramType wxMiniProgramType =
-      WXMiniProgramType.PREVIEW; //体验版
+      WXMiniProgramType.RELEASE; //正式版
+  // static const WXMiniProgramType wxMiniProgramType =
+  //     WXMiniProgramType.PREVIEW; //体验版
   // static const WXMiniProgramType wxMiniProgramType =
   //     WXMiniProgramType.TEST; //开发版
--- a/lib/pages/detail/notebook_detail_page.dart
View file @ec2c692
+++ b/lib/pages/detail/notebook_detail_page.dart
View file @ec2c692
@@ -212,7 +212,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
         _cancelState(() {});
       });
       bus.on("refresh_detail", (args) {
-        _getReserveDetail();
+        _getReserveDetail(isShowLoading: false);
       });
       bus.on("refresh_detail_deposit", (args) {
         _getReserveDepositByRid(); //刷新订金数据
--- a/lib/pages/invicate/invitation_page.dart
View file @ec2c692
+++ b/lib/pages/invicate/invitation_page.dart
View file @ec2c692
@@ -358,7 +358,7 @@ class InvicationPageState extends State<InvicationPage>
   }
   getReserveImgText() async {
-    await marketingCenterProvider.getReserveImgText(context, widget.rid);
+    await marketingCenterProvider.getReserveImgText(context, widget.rid,showLoading: false);
     if (marketingCenterProvider.reserveImgText != null) {
       additionTitle = marketingCenterProvider.reserveImgText.title;
       setState(() {});
@@ -366,7 +366,7 @@ class InvicationPageState extends State<InvicationPage>
   }
   getDzSellerConf() async {
-    bool success = await marketingCenterProvider.getDzSellerConf(context);
+    bool success = await marketingCenterProvider.getDzSellerConf(context,showLoading: false);
     if (success && marketingCenterProvider.dzSellerConfModel != null) {
       if (marketingCenterProvider.dzSellerConfModel.isShowNoticeDeposit == '1'
           //     &&
@@ -1203,7 +1203,7 @@ class InvicationPageState extends State<InvicationPage>
   }
   _getReserveTypeField() async {
-    await detailModel.getReserveTypeField(context);
+    await detailModel.getReserveTypeField(context,isShowLoading: false);
   }
   ///订座详情
@@ -1340,7 +1340,7 @@ class InvicationPageState extends State<InvicationPage>
     }
     bool isSuccess =
-        await _baseIndoProvider.setCustomerActivityBaseinfo(context, params);
+        await _baseIndoProvider.setCustomerActivityBaseinfo(context, params,isShowLoading: false);
     // _baseIndoProvider.baseInfoSunModel = null;
     if (isSuccess) {
       name = user.sellername;
--- a/lib/pages/notebook/notebook_page.dart
View file @ec2c692
+++ b/lib/pages/notebook/notebook_page.dart
View file @ec2c692
@@ -82,7 +82,7 @@ class NoteBookPageState extends State<NoteBookPage> {
     _controller = EasyRefreshController();
     // _initTime();
     bus.on("refresh_book_list", (args) {
-      _getReserveList();
+      _getReserveList(showLoading: false);
     });
     startingDayOfWeek = _initStartingDayOfWeek();
     // dateTimeNow = DateTime.now();
--- a/lib/pages/table/table_manager_page.dart
View file @ec2c692
+++ b/lib/pages/table/table_manager_page.dart
View file @ec2c692
@@ -202,7 +202,7 @@ class TableManagerPageState extends State<TableManagerPage> {
       EventBus().on("refresh_tablemanager", (arg) {
         //订座-完成预订 刷新管理桌位
         tableManagerModel.getTableListOrReserve(
-            context, currTimeIndex, dateTime, selectNumber);
+            context, currTimeIndex, dateTime, selectNumber,showLoading: false);
         print(tableManagerModel);
       });
       EventBus().on("refresh_tablePhoto", (arg) {
--- a/lib/provider/notebook_detail_change_model_only.dart
View file @ec2c692
+++ b/lib/provider/notebook_detail_change_model_only.dart
View file @ec2c692
@@ -125,20 +125,38 @@ class NotebookDetailChangeModelOnly with ChangeNotifier {
     ];
   }
-  List<t.Table> getSpTableList() {
-    List<t.Table> tables = [];
-    String tableList = App.sp.getString('table_list');
-    if (tableList != null) {
-      List list = json.decode(tableList);
-      if (list.length > 0) {
-        list.forEach((element) {
-          tables.addAll(TableOuter.fromJson2(element).list);
-        });
-      }
+  List<TableListReserve> getSpTableListOr() {
+    String tableList = App.sp.getString('table_list_or_reserve');
+    if (tableList == null) {
+      return [];
     }
-    return tables;
+
+    List<TableListReseveSunModel> temp = [];
+
+    List list = json.decode(tableList);
+    if (list.length > 0) {
+      list.forEach((element) {
+        temp.add(TableListReseveSunModel.fromJson2(element));
+      });
+    }
+    print(temp[0].tableList);
+    return  temp[0].tableList;
   }
+  // List<t.Table> getSpTableList() {
+  //   List<t.Table> tables = [];
+  //   String tableList = App.sp.getString('table_list');
+  //   if (tableList != null) {
+  //     List list = json.decode(tableList);
+  //     if (list.length > 0) {
+  //       list.forEach((element) {
+  //         tables.addAll(TableOuter.fromJson2(element).list);
+  //       });
+  //     }
+  //   }
+  //   return tables;
+  // }
+
   /// 根据时间和分钟组装 格式：11:00
   _dealTime(int begin, int mm) {
     String sb = '';
@@ -298,8 +316,8 @@ class NotebookDetailChangeModelOnly with ChangeNotifier {
       List<String> tableIds = []; //所有桌位的id
       List<String> tableIdsOld = []; //带过来所有桌位的id
-      List<t.Table> tableS = getSpTableList(); //缓存的所有桌子
-      for (t.Table elementT in tableS) {
+      List<TableListReserve> tableS = getSpTableListOr(); //缓存的所有桌子
+      for (TableListReserve elementT in tableS) {
         tableIds.add(elementT.id);
       }
       for (var table in oldTableList) {