查看菜品，提前点餐

wdn127929
1 parent 0e4251f6
Showing 5 changed files with 28 additions and 24 deletions
android/app/build.gradle
ios/Runner.xcodeproj/project.pbxproj
lib/pages/detail/notebook_detail_page.dart
lib/pages/invicate/invitation_page.dart
lib/route/route_handles.dart
--- a/android/app/build.gradle
View file @9e0dbd4
+++ b/android/app/build.gradle
View file @9e0dbd4
@@ -18,19 +18,19 @@ if (flutterRoot == null) {
-def flutterVersionCode = "527"
+def flutterVersionCode = "528"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '527'
+    flutterVersionCode = '528'
 }
-def flutterVersionName = "5.2.7"
+def flutterVersionName = "5.2.8"
 if (flutterVersionName == null) {
-    flutterVersionName = '5.2.7' 
+    flutterVersionName = '5.2.8' 
 }
--- a/ios/Runner.xcodeproj/project.pbxproj
View file @9e0dbd4
+++ b/ios/Runner.xcodeproj/project.pbxproj
View file @9e0dbd4
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 /* Begin PBXBuildFile section */
@@ -548,7 +548,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5272;
+				CURRENT_PROJECT_VERSION = 5280;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -563,7 +563,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 5.2.7;
+				MARKETING_VERSION = 5.2.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -696,10 +696,10 @@
 				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5272;
+				CURRENT_PROJECT_VERSION = 5280;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
-				FLUTTER_BUILD_MODE = release;
+				FLUTTER_BUILD_MODE = debug;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -711,7 +711,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 5.2.7;
+				MARKETING_VERSION = 5.2.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -732,7 +732,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5272;
+				CURRENT_PROJECT_VERSION = 5280;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -747,7 +747,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 5.2.7;
+				MARKETING_VERSION = 5.2.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
--- a/lib/pages/detail/notebook_detail_page.dart
View file @9e0dbd4
+++ b/lib/pages/detail/notebook_detail_page.dart
View file @9e0dbd4
@@ -59,6 +59,7 @@ import '../../models/reserveA_action_log_modol.dart';
 import '../../models/reserve_deposit_model.dart';
 import '../../models/upload_img_model.dart';
 import '../../provider/collect_store_provider.dart';
+import '../../provider/notebook_detail_model.dart';
 import '../../provider/personnel_provider.dart';
 import '../../provider/upload_img_provider.dart';
 import '../../utils/screen_util.dart';
@@ -246,7 +247,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
     if (detailModel.detailModelAllSunModel.photoNote != null &&
         detailModel.detailModelAllSunModel.photoNote.length > 0) {
       detailModel.detailModelAllSunModel
-        ..photoNote.forEach((element) {
+        .photoNote.forEach((element) {
           UploadImgModel imageModel = UploadImgModel();
           imageModel.qiniuUrl = element;
           imageModel.isUpload = true;
@@ -4294,11 +4295,11 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
                                           //         0
                                           //     ?
                                           if (detailModel.detailModelAllSunModel
-                                                      .cookbooklist !=
-                                                  null &&
+                                                      .cookbooklist ==
+                                                  null ||
                                               detailModel.detailModelAllSunModel
-                                                      .cookbooklist.toString ==
-                                                  '1')
+                                                      .cookbooklist ==
+                                                  0)
                                             Expanded(
                                                 flex: 1,
                                                 child: InkWell(
@@ -4583,8 +4584,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
                                                   null &&
                                               detailModel.detailModelAllSunModel
                                                       .cookbooklist
-                                                      .toString() ==
-                                                  '1')
+                                                      ==
+                                                  1)
                                             Expanded(
                                                 flex: 1,
                                                 child: InkWell(
--- a/lib/pages/invicate/invitation_page.dart
View file @9e0dbd4
+++ b/lib/pages/invicate/invitation_page.dart
View file @9e0dbd4
@@ -477,10 +477,12 @@ class InvicationPageState extends State<InvicationPage>
       moneyControl.text = detailModel.price;
       detailModel.depositId = detailModel.priceID;
     } else {
-      moneyControl.text =
-          detailModel.depositPrice == null || detailModel.depositPrice == ''
-              ? '选填，未填写表示无需支付订金'
-              : detailModel.depositPrice;
+      if (moneyControl.text.length == 0) {
+        moneyControl.text =
+            detailModel.depositPrice == null || detailModel.depositPrice == ''
+                ? '选填，未填写表示无需支付订金'
+                : detailModel.depositPrice;
+      }
     }
     if (detailModel.smsInfo == '0') {
--- a/lib/route/route_handles.dart
View file @9e0dbd4
+++ b/lib/route/route_handles.dart
View file @9e0dbd4
@@ -287,13 +287,14 @@ import '../pages_sim/my/marketing_center/book_notification/marking_interaction_p
 import '../pages_sim/my/marketing_center/sms_template_setting_page.dart';
 import '../pages_sim/my/personnel_type/personnel_detail_page.dart';
 import '../pages_sim/my/personnel_type/personnel_manage_page.dart';
-import '../pages_sim/order_advance/order_advance_home_page.dart';
+
 import '../provider/SmsModel.dart';
 import '../provider/collect_store_provider.dart';
 import '../provider/comment_manage_provider.dart';
 import '../provider/feast_model.dart';
 import '../provider/marketing_center_provider.dart';
 import '../provider/notebook_detail_change_model_only.dart';
+
 import '../provider/plan_dish_provider.dart';
 import '../provider/store_wine_provider.dart';