Pen Li 7 лет назад
Родитель
Сommit
879c5e312a

+ 6 - 6
RedAnt ERP Mobile/common/Functions/portfolio/PortfolioViewController.m

@@ -358,15 +358,15 @@
 }
 - (IBAction)onCreateTearSheet:(id)sender {
     
-#ifdef BUILD_UWAVER
-
-    [self createPreviewPortfolio];
-
-#else
+//#ifdef BUILD_UWAVER
+//
+//    [self createPreviewPortfolio];
+//
+//#else
     
     [self createTearSheet];
     
-#endif
+//#endif
     
 }
 

+ 4 - 3
RedAnt ERP Mobile/common/data_provider/RANetwork.m

@@ -4557,7 +4557,7 @@ repeat:
 
 + (NSDictionary*)request_hangTag:(NSString *)group {
     
-#ifdef URL_UWAVER
+#ifdef BUILD_UWAVER
     NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
     AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
     if(appDelegate.user!=nil)
@@ -4570,6 +4570,8 @@ repeat:
     if (group) {
         [params setValue:group forKey:@"groupName"];
     }
+    NSString * uuid= [[NSUUID UUID] UUIDString];
+    params[@"resultSerial"]=uuid;
     
     [params setObject:ScreenCodeModelInfo forKey:kScreenName];
     
@@ -4589,8 +4591,7 @@ repeat:
         return nil;
     NSError *error=nil;
     NSDictionary *jsobj = [NSJSONSerialization JSONObjectWithData:json options:NSJSONReadingMutableLeaves error:&error];
-    int result = [[jsobj valueForKey:@"result"] intValue];
-    
+
     return jsobj;
 #else
     return nil;