Commit 63f30440 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent c896772f
...@@ -328,24 +328,23 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -328,24 +328,23 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
} }
/// 默认弹出支付框 /// 默认弹出支付框
if (weakSelf.isShowPayButton && [weakSelf.orderDetails.order.orderState isEqualToString:NOTPAY]) { if (weakSelf.isShowPayButton && [weakSelf.orderDetails.order.orderState isEqualToString:NOTPAY]) {
/// 找出客户抽奖
if (weakSelf.luckyDrawAndJDECardArray.count) { for (int i=0;i<weakSelf.luckyDrawAndJDECardArray.count;i++) {
for (id object in weakSelf.luckyDrawAndJDECardArray) { id object = weakSelf.luckyDrawAndJDECardArray[i];
if ([object isKindOfClass:[LuckyDrawModel class]] && !resultModel) { if ([object isKindOfClass:[LuckyDrawModel class]] && !resultModel) {
[weakSelf queryConsumerLuckyDrawChance:object]; LuckyDrawModel *model = (LuckyDrawModel *)object;
}else {
[weakSelf payButtonClickAction];
}
/// 区分导购抽奖和消费者抽奖
if ([object isKindOfClass:[LuckyDrawModel class]]) {
LuckyDrawModel *model = object;
if ([model.body isEqualToString:CONSUMER]) { if ([model.body isEqualToString:CONSUMER]) {
[weakSelf queryConsumerLuckyDrawChance:model];
break; break;
} }
} }
/// 有促销无抽奖情况
if (i == weakSelf.luckyDrawAndJDECardArray.count-1) {
[weakSelf payButtonClickAction];
} }
}else { }
/// 无促销的情况 /// 无促销情况
if (!weakSelf.luckyDrawAndJDECardArray.count) {
[weakSelf payButtonClickAction]; [weakSelf payButtonClickAction];
} }
} }
...@@ -469,7 +468,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -469,7 +468,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
- (void)queryConsumerLuckyDrawChance:(LuckyDrawModel *)model - (void)queryConsumerLuckyDrawChance:(LuckyDrawModel *)model
{ {
WS(weakSelf); WS(weakSelf);
if ([model.body isEqualToString:CONSUMER]) {
UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:nil message:@"恭喜您获得一次大转盘抽奖机会!" preferredStyle:UIAlertControllerStyleAlert]; UIAlertController *alertControl = [UIAlertController alertControllerWithTitle:nil message:@"恭喜您获得一次大转盘抽奖机会!" preferredStyle:UIAlertControllerStyleAlert];
[alertControl addAction:[UIAlertAction actionWithTitle:@"马上参与" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) { [alertControl addAction:[UIAlertAction actionWithTitle:@"马上参与" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
[weakSelf showLuckyDrawControl:model.lottery.uuid andOrderNumber:weakSelf.orderCode luckyDrawFinish:^(NSDictionary *dict) { [weakSelf showLuckyDrawControl:model.lottery.uuid andOrderNumber:weakSelf.orderCode luckyDrawFinish:^(NSDictionary *dict) {
...@@ -488,7 +486,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -488,7 +486,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
}]; }];
}]]; }]];
[self presentViewController:alertControl animated:YES completion:nil]; [self presentViewController:alertControl animated:YES completion:nil];
}
} }
#pragma mark - 查询导购抽奖机会 #pragma mark - 查询导购抽奖机会
......
...@@ -48,7 +48,7 @@ static NetworkRequestClassManager *manager = nil; ...@@ -48,7 +48,7 @@ static NetworkRequestClassManager *manager = nil;
AFHTTPSessionManager *manager = [AFHTTPSessionManager manager]; AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
manager.responseSerializer = [AFJSONResponseSerializer serializer]; manager.responseSerializer = [AFJSONResponseSerializer serializer];
manager.requestSerializer = [AFJSONRequestSerializer serializer]; manager.requestSerializer = [AFJSONRequestSerializer serializer];
manager.requestSerializer.timeoutInterval = 10.0f; manager.requestSerializer.timeoutInterval = 60.0f;
[manager.requestSerializer setValue:@"application/json;charset=utf-8" forHTTPHeaderField: @"Content-Type"]; [manager.requestSerializer setValue:@"application/json;charset=utf-8" forHTTPHeaderField: @"Content-Type"];
return manager; return manager;
} }
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
/** /**
* 服务器开发地址 * 服务器开发地址
*/ */
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL] #define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
/** /**
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
///** ///**
// * 服务器正式地址 // * 服务器正式地址
// */ // */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL] //#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
/** /**
* 搜索框输入通知 * 搜索框输入通知
......
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