Ver Fonte

1.修改UWA Signature需要先打开对应的Order。

Pen Li há 7 anos atrás
pai
commit
e7a623724c

+ 11 - 13
RedAnt ERP Mobile/common/Functions/order/OrderDetailViewController.m

@@ -1023,7 +1023,7 @@
         UIAlertAction *openAction = [UIAlertAction actionWithTitle:@"Open" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             
             [self opentOrder:^{
-               
+                
                 [weakSelf showSignaturePanel];
             }];
             
@@ -1079,14 +1079,18 @@
                 [self.navigationController popViewControllerAnimated:false];
                 
                 
+#ifdef RA_NOTIFICATION
+                [ActiveViewController Notify:@"CartViewController,ContactListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
+#else
+                AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
+                [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
+                [((MainViewController*)appDelegate.main_vc) reloadContact:true immediately:false];
+#endif
+                
                 if (completionBlk) {
                     completionBlk();
                 }
                 
-                if(self.selectOrder)
-                    self.selectOrder(self.content_data);
-                
-                
             }
             else
             {
@@ -1113,14 +1117,8 @@
 
         [self opentOrder:^{
             
-#ifdef RA_NOTIFICATION
-            [ActiveViewController Notify:@"CartViewController,ContactListViewController" Message:RA_NOTIFICATION_RELOAD_DATA];
-#else
-            AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
-            [((MainViewController*)appDelegate.main_vc) reloadCart:true immediately:false];
-            [((MainViewController*)appDelegate.main_vc) reloadContact:true immediately:false];
-#endif
-            
+            if(self.selectOrder)
+                self.selectOrder(self.content_data);
         }];