Просмотр исходного кода

1.修改NPD Cart,使用条件编译区分Back Order。

Pen Li 8 лет назад
Родитель
Сommit
d62893524f
1 измененных файлов с 7 добавлено и 2 удалено
  1. 7 2
      RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

+ 7 - 2
RedAnt ERP Mobile/common/Functions/cart/CartViewController.m

@@ -1032,8 +1032,10 @@
      }
      }
      
      
      */
      */
+    
+#ifdef BUILD_NPD
     if (self.back_order_flag) {
     if (self.back_order_flag) {
-        
+
         NSMutableDictionary * params= [[NSMutableDictionary alloc] init];
         NSMutableDictionary * params= [[NSMutableDictionary alloc] init];
         [params setObject:@(0) forKey:@"step"];
         [params setObject:@(0) forKey:@"step"];
         RAOrderEditorViewController *orderEditorVC = [self.storyboard instantiateViewControllerWithIdentifier:@"RAOrderEditorViewController"];
         RAOrderEditorViewController *orderEditorVC = [self.storyboard instantiateViewControllerWithIdentifier:@"RAOrderEditorViewController"];
@@ -1045,7 +1047,10 @@
         orderEditorVC.delegate=self;
         orderEditorVC.delegate=self;
         [self.navigationController pushViewController:orderEditorVC animated:true];
         [self.navigationController pushViewController:orderEditorVC animated:true];
         
         
-    } else {
+    }
+    else
+#endif
+    {
         NSMutableDictionary * params= [[NSMutableDictionary alloc] init];
         NSMutableDictionary * params= [[NSMutableDictionary alloc] init];
         //   NSString * string = [checked componentsJoinedByString:@","];
         //   NSString * string = [checked componentsJoinedByString:@","];
         //  [params setValue:string forKey:@"cart2Checkbox"];
         //  [params setValue:string forKey:@"cart2Checkbox"];