菜单配置bug

Podfile.lock

@@ -64,4 +64,4 @@ SPEC CHECKSUMS:
   SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
   SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
 
-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0

XFFruit.xcodeproj/project.pbxproj

@@ -2705,6 +2705,7 @@
 				C1F696001AB870B400F9F5DD /* Frameworks */,
 				C1F696011AB870B400F9F5DD /* Resources */,
 				1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
+				39995800F52C4DB969DAF75D /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2844,6 +2845,21 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
+		39995800F52C4DB969DAF75D /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -3437,7 +3453,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
+				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Debug;
@@ -3462,7 +3478,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.xffruit;
 				PRODUCT_NAME = XFFruit;
-				PROVISIONING_PROFILE = "3a32e5a9-395f-425a-b1b0-c221be8d15d8";
+				PROVISIONING_PROFILE = "5747a061-d994-4f1f-8eac-4b028fb34d89";
 				USER_HEADER_SEARCH_PATHS = "${SRCROOT}/**";
 			};
 			name = Release;

XFFruit/Controllers/DataBaseController/GXFFunctionDB.m

@@ -423,11 +423,6 @@
             [arr replaceObjectAtIndex:count withObject:displayFunction];
             
             
-        
-
-            
-
-            
         }
     }
     
@@ -436,8 +431,9 @@
 
 //返回全部原始数据的function
 - (NSArray *)originDisplayFunctions {
-    NSMutableArray *muArr = [NSMutableArray array];
-    FMResultSet *rs = [_dataBase executeQuery: @"SELECT * FROM displayFunction"];
+//    NSMutableArray *muArr = [NSMutableArray array];
+//    FMResultSet *rs = [_dataBase executeQuery: @"SELECT * FROM displayFunction"];
+    NSMutableArray *muArr = [NSMutableArray arrayWithArray:[self displayFunctionsHasPermission]];
     BOOL hasSeeOption1 = NO;
    
     BOOL hasSeeOption3 = NO;
@@ -446,10 +442,11 @@
     BOOL hasSeeOption6 = NO;
     BOOL hasSeeOption7 = NO;
     BOOL hasSeeOption8 = NO;
-    while ([rs next]) {
-        GXFDisplayFunction *displayFunction = [self p_resultSetDisplayFunction:rs];
-        [muArr addObject:displayFunction];
-        
+    for(GXFDisplayFunction *displayFunction in muArr){
+//    while ([rs next]) {
+//        GXFDisplayFunction *displayFunction = [self p_resultSetDisplayFunction:rs];
+//        [muArr addObject:displayFunction];
+    
         
         //"行情反馈",
         if (displayFunction.functionId == 500102 && hasSeeOption1 == NO) {

XFFruit/General/Views/FunctionView/ICRFunctionItemControl.h

@@ -16,7 +16,7 @@ typedef NS_ENUM (NSUInteger, ICRFunctionID) {
     kFunctionNotice = 0, //公告
     kFunctionNewSurvey,  //新建行情调研 1
     kFunctionSeeSurvey,  //查看行情调研2
-    kFunctionFeeBackSurvey,   //填写行情反馈3
+    kFunctionFeedBackSurvey,   //填写行情反馈3
     kFunctionNewPurchaseNotice,  //新建采购通知4
     kFunctionSeePurchaseNotice,  //查看采购通知5
     kFunctionNewPurchase,   // 新建采购单6

XFFruit/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>

XFFruit/Macro/ICRAppMacro.h

@@ -23,14 +23,14 @@
 #define ICR_IMAGE_BG_COLOR              [UIColor colorWithW:242 a:1]
 
 //********阿里云内部测试环境********
-//#define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:7580/cruiser-server/rest"
+#define HTTP_REST_API_BASE_URL  @"http://218.244.151.129:7580/cruiser-server/rest"
 
 //********现场测试环境********
 //#define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7280/cruiser-server/rest"
 
 
 //********现场正式环境*********
- #define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7380/cruiser-server/rest"
+// #define HTTP_REST_API_BASE_URL  @"http://122.224.171.126:7380/cruiser-server/rest"
 
  #define HTTP_REST_REPORT_BASE_URL  @"http://122.224.171.126:7380"
 // HTTP

XFFruit/ViewControllers/Home/Controllers/ICRHomeViewController.m

@@ -234,6 +234,15 @@ static NSString *collectionCellID = @"collectionCell";
         }
             break;
         case kFunctionSeeSurvey://查看行情
+        {
+            SurveyViewController *svc = [[SurveyViewController alloc] init];
+            svc.title = [IBTCommon localizableString:@"Survey"];
+            svc.navigationItem.hidesBackButton = YES;
+            [self PushViewController:svc animated:YES];
+        }
+            break;
+            
+        case  kFunctionFeedBackSurvey:   //填写行情反馈3
         {
             SurveyViewController *svc = [[SurveyViewController alloc] init];
             svc.title = [IBTCommon localizableString:@"Survey"];