huangyp 6 роки тому
батько
коміт
8a2af14488

+ 1 - 1
shiku_im/Podfile.lock

@@ -93,4 +93,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 2e58a501fbc028fd37151a6316b97f5594e0e1d5
 
-COCOAPODS: 1.5.2
+COCOAPODS: 1.6.0

+ 1 - 0
shiku_im/shiku_im.xcodeproj/project.pbxproj

@@ -17064,6 +17064,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				"zh-Hans",
 				"zh-Hant",

+ 0 - 1
shiku_im/shiku_im/controller/myOA/UASNetworkManager.m

@@ -35,7 +35,6 @@ static UASNetworkManager *b2bManager = nil;
     [manager.requestSerializer willChangeValueForKey:@"timeoutInterval"];
      manager.requestSerializer.timeoutInterval = 15.0f;
     [manager.requestSerializer didChangeValueForKey:@"timeoutInterval"];
-//    manager.ZXRequestCache = ZXBaseRequestReturnCacheDataThenLoad;
   
     return manager;
     

+ 4 - 4
shiku_im/shiku_im/controller/myOA/WorkTools/UASWorkManager.m

@@ -1283,12 +1283,12 @@
     
     
     //接口
-    NSString * urlAddress=@"mobile/addAutoSign.action";
+    NSString * urlAddress = @"mobile/addAutoSign.action";
     
     //Caller
-    NSString * caller=@"Mobile_outsign";
+    NSString * caller = @"Mobile_outsign";
     
-    NSDictionary *forms=[NSDictionary dictionaryWithObjectsAndKeys:
+    NSDictionary *forms = [NSDictionary dictionaryWithObjectsAndKeys:
                          
                          model.MPD_ADDRESS,@"mo_address",//签到地点
                          
@@ -1306,7 +1306,7 @@
     
     NSData * jsonData = [NSJSONSerialization dataWithJSONObject:forms options:NSJSONWritingPrettyPrinted error:nil];
     
-    NSString *formStore=[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    NSString *formStore = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
     
     NSString *url=[@"" stringByAppendingFormat:@"%@%@?caller=%@&formStore=%@&mpd_id=%@&sessionId=%@&master=%@&sessionUser=%@",g_id,urlAddress,caller,formStore,model.MPD_ID,sessionId,g_master,g_sessionUser];
     

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

@@ -112,7 +112,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>6.0.0</string>
+	<string>6.0.1</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>baidumap</string>

+ 5 - 5
shiku_im/shiku_im/文件夹1/CRM3.0/商机管理/Controllers/WriteNicheRecordVC.m

@@ -87,16 +87,16 @@
     f.dateFormat = @"yyyy-MM-dd HH:mm:ss";
     NSString *s = [f stringFromDate:[NSDate date]];
     
-    [params setObject:_bc_codeStr forKey:@"bcd_bccode"];
+    [params setObject:FORMAT(@"%@",_bc_codeStr) forKey:@"bcd_bccode"];
     [params setObject:_remark.text forKey:@"bcd_remark"];
     [params setObject:FORMAT(@"%@",_model.BS_NAME) forKey:@"bcd_bsname"];
-    [params setObject:_model.BS_CODE forKey:@"bcd_bscode"];
+    [params setObject:FORMAT(@"%@",_model.BS_CODE) forKey:@"bcd_bscode"];
     [params setObject:s forKey:@"bcd_date"];
     [params setObject:g_personChineseName forKey:@"bcd_man"];
     [params setObject:@"继续跟进" forKey:@"bcd_type"];
-    [params setObject:_bcdid forKey:@"bcd_id"];
-    [params setObject:_bc_oldStepStr forKey:@"bcd_oldstep"];//上一阶段名称
-    [params setObject:_bc_oldStepCode forKey:@"bcd_oldstepcode"];//上一阶段编号
+    [params setObject:FORMAT(@"%@",_bcdid) forKey:@"bcd_id"];
+    [params setObject:FORMAT(@"%@",_bc_oldStepStr) forKey:@"bcd_oldstep"];//上一阶段名称
+    [params setObject:FORMAT(@"%@",_bc_oldStepCode) forKey:@"bcd_oldstepcode"];//上一阶段编号
     
     NSData *jsonData = [NSJSONSerialization dataWithJSONObject:params options:NSJSONWritingPrettyPrinted error:nil];
     NSString *str=[[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];

+ 2 - 2
shiku_im/shiku_im/文件夹1/WorkMain(工作新页面)/Controllers/UASWorkMainVC.m

@@ -688,8 +688,8 @@
         
         [[NSUserDefaults standardUserDefaults] setObject:@"click" forKey:@"OANewGuidePunch2"];
     
-        NSUserDefaults * user=[NSUserDefaults standardUserDefaults];
-        NSString * str=[user objectForKey:@"OutPlanIsOpenOrClose"];
+        NSUserDefaults * user = [NSUserDefaults standardUserDefaults];
+        NSString * str = [user objectForKey:@"OutPlanIsOpenOrClose"];
         
         if ([str isEqualToString:@"1"])
         {

+ 1 - 1
shiku_im/shiku_im/文件夹1/多明细通用表单/Views/MoreGridFooterView.m

@@ -496,7 +496,7 @@
 {
     NSMutableArray *arr = [NSMutableArray new];
     for (int i = 0; i < _gridData.count; i++) {
-        MoreGridModel *model = _gridData[i][0];
+        MoreGridModel *model = [_gridData[i] count] == 0 ? nil : _gridData[i][0];
         [arr addObject:FORMAT(@"%@",model.dgtitle)];
     }
     _segment = [[HMSegmentedControl alloc]initWithSectionTitles:[arr mutableCopy]];