Commit 411e96c3 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 6a00b24e
...@@ -295,10 +295,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -295,10 +295,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
deductionModel.priority = oldPromotion.prority; deductionModel.priority = oldPromotion.prority;
[weakSelf.promotionInformationArray addObject:deductionModel]; [weakSelf.promotionInformationArray addObject:deductionModel];
} else if (![BaseViewController isBlankString:[oldPromotion.jdecardDenomation stringValue]]) { } else if (![BaseViewController isBlankString:[oldPromotion.JDEcardDenomation stringValue]]) {
// 京东E卡 // 京东E卡
PromotionJDECardModel *jdECardModel = [[PromotionJDECardModel alloc]init]; PromotionJDECardModel *jdECardModel = [[PromotionJDECardModel alloc]init];
jdECardModel.total = [oldPromotion.jdecardDenomation integerValue]; jdECardModel.total = [oldPromotion.JDEcardDenomation integerValue];
jdECardModel.body = GUIDE; jdECardModel.body = GUIDE;
jdECardModel.type = JDECardAction; jdECardModel.type = JDECardAction;
jdECardModel.priority = oldPromotion.prority; jdECardModel.priority = oldPromotion.prority;
...@@ -381,7 +381,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -381,7 +381,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
if (resultModel.award) { if (resultModel.award) {
weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel]; weakSelf.customerDrawModel = [PromotionLuckDrawResultModel initializeWith:resultModel];
} }
PromotionChooseNavigationController *promotionChooseNav = [[weakSelf getStoryboardWithName] instantiateViewControllerWithIdentifier:@"PromotionChooseNavigationController"]; PromotionChooseNavigationController *promotionChooseNav = [[[weakSelf class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"PromotionChooseNavigationController"];
PromotionChooseViewController *promotionChoose = (PromotionChooseViewController *)promotionChooseNav.visibleViewController; PromotionChooseViewController *promotionChoose = (PromotionChooseViewController *)promotionChooseNav.visibleViewController;
promotionChoose.promotionDelegate = self; promotionChoose.promotionDelegate = self;
promotionChoose.promotionDatasArray = weakSelf.customerPromotionArray; promotionChoose.promotionDatasArray = weakSelf.customerPromotionArray;
...@@ -582,7 +582,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -582,7 +582,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
#pragma mark - 卡劵领取成功 #pragma mark - 卡劵领取成功
- (void)rebateApplySuccess:(NSString *)message - (void)rebateApplySuccess:(NSString *)message
{ {
RebateSuccessTableViewController *success = [self.getStoryboardWithName instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"]; RebateSuccessTableViewController *success = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateSuccessTableViewController"];
success.titleArray = @[message,@"查看账户",@"我知道了"]; success.titleArray = @[message,@"查看账户",@"我知道了"];
[success setClickEvent:^(NSIndexPath *indexPath) { [success setClickEvent:^(NSIndexPath *indexPath) {
if (indexPath.row == 1) { if (indexPath.row == 1) {
...@@ -604,7 +604,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -604,7 +604,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
- (void)showJDECard - (void)showJDECard
{ {
WS(weakSelf); WS(weakSelf);
JDEcardViewController *jdeCard = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"JDEcardViewController"]; JDEcardViewController *jdeCard = [[[weakSelf class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"JDEcardViewController"];
[jdeCard setDismissJDECardBlock:^{ [jdeCard setDismissJDECardBlock:^{
[weakSelf.settingsPopoverController dismissPopoverAnimated:YES]; [weakSelf.settingsPopoverController dismissPopoverAnimated:YES];
}]; }];
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment