Przeglądaj źródła

修改新增商机的配置

huangyp 7 lat temu
rodzic
commit
e4685119a1

+ 2 - 2
shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -18645,7 +18645,7 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh",
 				"${PODS_ROOT}/AliPay/AlipaySDK.bundle",
 				"${PODS_ROOT}/Bugtags/Bugtags.bundle",
 				"${PODS_ROOT}/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle",
@@ -18664,7 +18664,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-shiku_im/Pods-shiku_im-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

+ 1 - 1
shiku_im/shiku_im/shiku_im-Info.plist

@@ -33,7 +33,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.3.4</string>
+	<string>6.3.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

+ 60 - 13
shiku_im/shiku_im/文件夹1/CRM3.0/商机管理/Controllers/NicheManageVC.m

@@ -483,19 +483,66 @@ static NSString *cellID = @"cellID";
 
 -(void)addAction:(UIButton *)sender
 {
-    NSArray *menuItems = @[
-                           [KxMenuItem menuItem:@"项目商机"
-                                          image:nil
-                                         target:self
-                                         action:@selector(addProjectNiche)],
-                           [KxMenuItem menuItem:@"OEM商机"
-                                          image:nil
-                                         target:self
-                                         action:@selector(addOEMNiche)],
-                           ];
-    [KxMenu showMenuInView:self.view
-                  fromRect:CGRectMake(SCREEN_WIDTH - 50,-30,30,30)
-                 menuItems:menuItems];
+    NSString *url = FORMAT(@"%@ma/setting/config.action",g_id);
+    NSDictionary *dic = @{
+                          @"caller":@"sys",
+                          @"code":@"isNewBusinessChance"
+                          };
+    UASNetworkManager *manager = [UASNetworkManager shareManager];
+    manager.responseSerializer = [AFJSONResponseSerializer serializer];
+    [manager request:url method:GET parameters:dic progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
+        SLog(@"数据:%@",responseObject);
+        
+        if (responseObject) {
+            NSArray *menuItems = @[
+                                   [KxMenuItem menuItem:@"项目商机"
+                                                  image:nil
+                                                 target:self
+                                                 action:@selector(addProjectNiche)],
+                                   [KxMenuItem menuItem:@"OEM商机"
+                                                  image:nil
+                                                 target:self
+                                                 action:@selector(addOEMNiche)],
+                                   ];
+            [KxMenu showMenuInView:self.view
+                          fromRect:CGRectMake(SCREEN_WIDTH - 50,-30,30,30)
+                         menuItems:menuItems];
+
+        }else{
+            NSArray *menuItems = @[
+                                   [KxMenuItem menuItem:@"公司商机"
+                                                  image:nil
+                                                 target:self
+                                                 action:@selector(addCustomNiche)],
+                                   ];
+            [KxMenu showMenuInView:self.view
+                          fromRect:CGRectMake(SCREEN_WIDTH - 50,-30,30,30)
+                         menuItems:menuItems];
+        }
+        
+    } failure:^(NSURLSessionDataTask *task, NSError *error) {
+        ErrorInfomation;
+        
+        SLog(@"%@",error);
+        
+        NSArray *menuItems = @[
+                               [KxMenuItem menuItem:@"公司商机"
+                                              image:nil
+                                             target:self
+                                             action:@selector(addCustomNiche)],
+                               ];
+        [KxMenu showMenuInView:self.view
+                      fromRect:CGRectMake(SCREEN_WIDTH - 50,-30,30,30)
+                     menuItems:menuItems];
+    }];
+}
+
+-(void)addCustomNiche
+{
+    CreatNicheVC *vc = [CreatNicheVC new];
+    vc.title = @"公司商机";
+    vc.caller = @"BusinessChance";
+    [self.navigationController pushViewController:vc animated:YES];
 }
 
 -(void)addProjectNiche