Commit a44ffd28 authored by 曹云霄's avatar 曹云霄

修改项说明:storyboard分类

parent 1c8a5b36
......@@ -167,7 +167,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
dispatch_group_leave(group);
[weakSelf RemoveMBProgressHUDLoding];
if ([returnValue[@"code"] isEqualToNumber:@0]) {
NSArray *promotionalArray = returnValue[@"data"];
NSArray *promotionalArray = returnValue[@"data"][@"actions"];
[weakSelf.promotionalArray removeAllObjects];
[weakSelf.luckyDrawAndJDECardArray removeAllObjects];
for (NSDictionary *dict in promotionalArray) {
......@@ -344,7 +344,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
LuckyDrawModel *model = (LuckyDrawModel *)object;
if ([model.body isEqualToString:@"consumer"]) {
[self showLuckyDrawControl:model.lotteryId andDrawId:@"" andOrderNumber:self.orderCode luckyDrawFinish:^(NSDictionary *dict) {
NSLog(@"%@",dict);
}];break;
......
......@@ -121,7 +121,7 @@
CardViewController *cardVc = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardViewController"];
[self addChildViewController:cardVc];
cardVc.view.frame = CGRectMake(10, 40, self.cardBackgroundView.mj_w-20, self.cardBackgroundView.mj_h-50);
cardVc.view.frame = CGRectMake(10, 40, (self.cardBackgroundView.mj_w-20)/2, self.cardBackgroundView.mj_h-50);
[self.cardBackgroundView addSubview:cardVc.view];
}
......
This diff is collapsed.
This diff is collapsed.
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/MJRefresh/MJRefresh/MJRefresh.bundle
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/UMSocialSDKResourcesNew.bundle
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/TencentOpenApi_IOS_Bundle.bundle
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/WeiboSDK.bundle
......@@ -21,7 +21,7 @@
/**
* 抽奖完成
*/
@property (nonatomic,weak) void(^luckyDrawFinishBlock)(NSDictionary *luckyDrawResultDict);
@property (nonatomic,copy) void(^luckyDrawFinishBlock)(NSDictionary *luckyDrawResultDict);
......
......@@ -73,7 +73,6 @@
if ([message.name isEqualToString:@"AppModel"]) {
// 打印所传过来的参数,只支持NSNumber, NSString, NSDate, NSArray,
// NSDictionary, and NSNull类型
NSLog(@"%@", message.body);
if (self.luckyDrawFinishBlock) {
self.luckyDrawFinishBlock(message.body);
}
......
......@@ -563,73 +563,67 @@ extern NSString * const SORTDIRECTION_DESC;
*/
@interface OrderPayRequest : JSONModel
/**
*
* 订单编号
*
*
*/
@property (nonatomic, copy) NSString *orderNumber;
/**
*
* 旧状态
*
*
*/
@property (nonatomic, copy) NSString *oldstate;
/**
*
* 新状态
*
*
*/
@property (nonatomic, copy) NSString *fnewstate;
/**
*
* 支付方式
*
*
*/
@property (nonatomic, copy) NSString *payType;
/**
*
* 是否开票
*
*
*/
@property (nonatomic, copy) NSString *isbill;
/**
*
* 发票类型
*
*
*/
@property (nonatomic, copy) NSString *billType;
/**
*
* 发票抬头
*
*
*/
@property (nonatomic, copy) NSString *billTitle;
/**
* (no documentation provided)
* 实际支付金额
*
*
*/
@property (nonatomic, strong) NSNumber *realAmount;
/**
* (no documentation provided)
*
*
*/
@property (nonatomic, copy) NSString *drawId;
/**
* (no documentation provided)
* 抽奖主题标识
*
*
*/
@property (nonatomic, copy) NSString *lotteryId;
/**
* (no documentation provided)
* 促销商品
* @see PromotionGoods
*
*/
@property (nonatomic, strong) NSArray<PromotionGoods> *promotionGoods;
/**
* (no documentation provided)
* 京东E卡面额
*
*
*/
......
......@@ -208,7 +208,6 @@
@synthesize billType;
@synthesize billTitle;
@synthesize realAmount;
@synthesize drawId;
@synthesize lotteryId;
@synthesize promotionGoods;
@synthesize jdCardDenomation;
......
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