time 6 years ago
parent
commit
fdedab2e6d

+ 2 - 1
shiku_im/shiku_im/controller/SearchGoodsVC.m

@@ -66,9 +66,10 @@
 #pragma mark --- 跳网页
 -(void)goToWebViewWithToken:(NSString *)token
 {
+    
+    //如果缓存的网页已经加载完成,直接显示加载完成的网页
     if ([UASPreView shareManager].finished) {
         
-        
         [self.view addSubview:[UASPreView shareManager].webView];
         
         [[UASPreView shareManager].webView mas_makeConstraints:^(MASConstraintMaker *make) {

+ 2 - 2
shiku_im/shiku_im/controller/myOA/ALLURLHeader.h

@@ -83,8 +83,8 @@ static NSString * const zhifuStr = @"http://lj.ubtob.com/alipay/appPay";
 #define URL_WEEKBAO_ADD_WORKCONTENT @"/oa/persontask/catchWorkContentWeekly.action"
 #define URL_MONTHBAO_ADD_WORKCONTENT @"/oa/persontask/catchWorkContentMonthly.action"
 #define URL_RIBAO_UPDATE @"/oa/persontask/updateWorkDaily.action" /*修改工作日报*/
-#define URL_WEEKBAO_UPDATE @"/oa/persontask/updateWorkWeekly.action" /*修改工作报*/
-#define URL_MONTHBAO_UPDATE @"/oa/persontask/updateWorkMonthly.action" /*修改工作报*/
+#define URL_WEEKBAO_UPDATE @"/oa/persontask/updateWorkWeekly.action" /*修改工作报*/
+#define URL_MONTHBAO_UPDATE @"/oa/persontask/updateWorkMonthly.action" /*修改工作报*/
 #define URL_RIBAO_UPDATE_FINISH @"oa/persontask/submitWorkDaily.action" /*修改工作日报完成后调去*/
 #define URL_WEEKBAO_UPDATE_FINISH @"oa/persontask/submitWorkWeekly.action" /*修改工作周报完成后调去*/
 #define URL_MONTHBAO_UPDATE_FINISH @"oa/persontask/submitWorkMonthly.action" /*修改工作月报完成后调去*/

+ 2 - 2
shiku_im/shiku_im/controller/myOA/JONewMeetingTableViewController.m

@@ -676,10 +676,10 @@
                              };
         NSString *url = [NSString stringWithFormat:@"%@plm/task/addbilltask.action",ip];
         
-        DLog(@"URL%@",url);
+       
         
         url = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-        DLog(@"转吗了吗操%@",url);
+    
     [[UASNetworkManager shareManager]request:url method:POST parameters:dic11 progress:nil success:^(NSURLSessionDataTask *task, id responseObject) {
         
         DLog(@"chenggong---:%@",responseObject);

+ 1 - 1
shiku_im/shiku_im/controller/myOA/工作汇报/LYYWorkreportMainVC.m

@@ -55,7 +55,7 @@
     
 }
 - (void)btnAction:(UIButton  *)sender{
-    DLog(@"%ld",sender.tag);
+   
     
     [MBProgressHUD showMessage:@"加载数据中..."];
     [LYHTTPRequest Get:RBao_YESTERDAYORTODAY page:sender.tag condition:@"" Completion:^(id ObjectData, NSError *error) {

+ 0 - 3
shiku_im/shiku_im/文件夹1/InviteReg(邀请注册)/UASInvireRegVC.m

@@ -297,14 +297,11 @@
     
     [self.view endEditing:YES];
     
-    
 }
 
 -(void)shareBtnDidClicked:(UIButton *)btn{
     
     
-    
-    
     if (self.companyName.length == 0 || self.companyName == nil) {
         
         [JOShowMessageFromNavi showDropViewWithMessage:@"请输入企业名称" ToNavi:self.navigationController withColor:nil];

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

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

+ 0 - 3
shiku_im/shiku_im/文件夹1/日程管理/Controllers/UASScheduleVC.m

@@ -485,9 +485,6 @@
         }
     }
     
-   
-    
-    
 }