NPD MOBILE

修复 trade show 提交订单自动登出后，账号仍然锁定的bug。

RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -73,7 +73,7 @@
 
 -(void) logout
 {
-    
+    [super logout];
     [self.content_arr removeAllObjects];
 }
 
@@ -1372,6 +1372,8 @@
 -(void) returnValue:(NSMutableDictionary *)value indexPath :(NSIndexPath*) indexPath
 {
     //   [self reload_data];
+    if([value[@"commitorder_logout"] boolValue])
+        [self logout];
     
     [[self navigationController] setNavigationBarHidden:YES animated:NO];
 }

RedAnt ERP Mobile/common/Functions/order/CreateOrderViewController.m

@@ -1190,12 +1190,19 @@
                                         //                                    }
                                         //                                    else
                                         {
+                                            NSMutableDictionary* value=[[NSMutableDictionary alloc]init];
                                             if([appDelegate.mode isEqualToString:@"TM"]&& appDelegate.submit_order_logout)
                                             {
                                                 //bbb
                                                 [((MainViewController*)appDelegate.main_vc) Loginout:false];
+                                                value[@"commitorder_logout"]=@"true";
                                             }
-                                            [self prepareReturn:nil];
+                                            
+                                            
+                                            value[@"is_subaction"] = self.params[@"is_subaction"];
+                                            value[@"subaction_tag"] = self.params[@"subaction_tag"];
+                                            
+                                            [self prepareReturn:value];
                                             
                                             [self.navigationController popViewControllerAnimated:true];
                                             

RedAnt ERP Mobile/iSales-NPD/iSales-NPD-Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>170608</string>
+	<string>170804</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>