修改项说明：合并代码

Class/OrderdetailsViewController.m

@@ -358,7 +358,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
             if (resultModel.award) {
                 weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel];
             }
-            PromotionChooseNavigationController *promotionChooseNav = [[weakSelf getStoryboardWithName] instantiateViewControllerWithIdentifier:@"PromotionChooseNavigationController"];
+            PromotionChooseNavigationController *promotionChooseNav = [[[weakSelf class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"PromotionChooseNavigationController"];
             PromotionChooseViewController *promotionChoose = (PromotionChooseViewController *)promotionChooseNav.visibleViewController;
             promotionChoose.promotionDelegate = self;
             promotionChoose.promotionDatasArray = weakSelf.customerPromotionArray;
@@ -545,7 +545,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
 #pragma mark - 卡劵领取成功
 - (void)rebateApplySuccess:(NSString *)message
 {
-    RebateSuccessTableViewController *success = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
+    RebateSuccessTableViewController *success = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
     success.titleArray = @[message,@"查看账户",@"我知道了"];
     [success setClickEvent:^(NSIndexPath *indexPath) {
         if (indexPath.row == 1) {
@@ -567,7 +567,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
 - (void)showJDECard
 {
     WS(weakSelf);
-    JDEcardViewController *jdeCard = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"JDEcardViewController"];
+    JDEcardViewController *jdeCard = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"JDEcardViewController"];
     [jdeCard setDismissJDECardBlock:^{
         [weakSelf.settingsPopoverController dismissPopoverAnimated:YES];
     }];

Tools/BaseViewController.h

@@ -62,6 +62,11 @@
 - (void)callAirprintWithdata:(NSString *)PDFpath SuccessBlock:(void(^)())success ErrorBlock:(void(^)())failed;
 
 
+/**
+ 提示框
+ */
+- (void)promptCustomerTitle:(NSString *)title withMessage:(NSString *)message finish:(void (^)())complete;
++ (BOOL)determineCameraPermissions;
 
 /**
  *  成功等待视图