提交

weixin_45529955
1 parent d5c51432
Showing 4 changed files with 23 additions and 21 deletions
android/app/build.gradle
ios/Runner.xcodeproj/project.pbxproj
lib/constant/constant.dart
lib/pages/my/marketing_center/book_notification/marking_interaction_page.dart
--- a/android/app/build.gradle
View file @e653164
+++ b/android/app/build.gradle
View file @e653164
@@ -83,8 +83,8 @@ android {
         ndk {
             //选择要添加的对应 cpu 类型的 .so 库。
-            // abiFilters  'arm64-v8a', 'x86_64',  'mips64'   //魅族64位，不支持32位
-            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
+            abiFilters  'arm64-v8a', 'x86_64',  'mips64'   //魅族64位，不支持32位
+            // abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64','x86', 'mips', 'mips64'
         }
          lintOptions {
--- a/ios/Runner.xcodeproj/project.pbxproj
View file @e653164
+++ b/ios/Runner.xcodeproj/project.pbxproj
View file @e653164
@@ -355,10 +355,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -372,10 +376,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -527,7 +535,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 7108;
+				CURRENT_PROJECT_VERSION = 710;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -712,7 +720,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 7108;
+				CURRENT_PROJECT_VERSION = 710;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -740,7 +748,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 7108;
+				CURRENT_PROJECT_VERSION = 710;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
--- a/lib/constant/constant.dart
View file @e653164
+++ b/lib/constant/constant.dart
View file @e653164
@@ -4,6 +4,8 @@ import 'package:fluwx/fluwx.dart';
 class Constant {
   static const int status_success = 200; //服务器返回成功
+  static const String ohos_app_id = '6917567548342276009'; //
+
   /**
    *  
    * 打包注意事项 ！！！！！！！！     ****************苹果 看看导出预订数据****************
--- a/lib/pages/my/marketing_center/book_notification/marking_interaction_page.dart
View file @e653164
+++ b/lib/pages/my/marketing_center/book_notification/marking_interaction_page.dart
View file @e653164
@@ -47,10 +47,10 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
   late UploadImageProvider _uploadImageProvider;
   late MarketingCenterProvider marketingCenterProvider;
-  bool isTranspond = false; //转发邀请函
+  bool isTranspond = true; //转发邀请函
   bool isArrival = false; //确认到店
-  bool isOnlineBook = false; //在线预订
-  bool isCustomerConfirm = false; //确认赴约
+  bool isOnlineBook = true; //在线预订
+  bool isCustomerConfirm = true; //确认赴约
   bool isOrder = false; //提前点餐
   bool isLink = false; //充值优惠活动链接
   bool isCouponFree = false; // 代金券
@@ -140,9 +140,7 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
     bool success = await marketingCenterProvider.getDzSellerConf(context);
     if (success && marketingCenterProvider.dzSellerConfModel != null) {
       isCustomerCancel =
-          marketingCenterProvider.dzSellerConfModel!.isCustomerCancel == '1'
-              ? true
-              : false;
+          marketingCenterProvider.dzSellerConfModel!.isCustomerCancel != '0';
     }
     setState(() {});
   }
@@ -151,24 +149,18 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
     bool success = await marketingCenterProvider.getSellerTemplateConf(context);
     if (success && marketingCenterProvider.markDataModel!.marketing != null) {
       isTranspond =
-          marketingCenterProvider.markDataModel!.marketing!.isTranspond == '1'
-              ? true
-              : false;
+          marketingCenterProvider.markDataModel!.marketing!.isTranspond != '0';
       isArrival =
           marketingCenterProvider.markDataModel!.marketing!.isArrival == '1'
               ? true
               : false;
       isOnlineBook =
-          marketingCenterProvider.markDataModel!.marketing!.isOnlineBook == '1'
-              ? true
-              : false;
+          marketingCenterProvider.markDataModel!.marketing!.isOnlineBook != '0';
       isCustomerConfirm =
-          marketingCenterProvider.markDataModel!.marketing!.isCustomerConfirm ==
-                  '1'
-              ? true
-              : false;
+          marketingCenterProvider.markDataModel!.marketing!.isCustomerConfirm !=
+              '0';
       isOrder = marketingCenterProvider.markDataModel!.marketing!.isOrder == '1'
           ? true
           : false;