0.2.5

liushiyu
1 parent 00e4a6fb
Showing 9 changed files with 237 additions and 19 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Core/CNLiveCommunitModuleProtocol.h
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.h
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntPaycostViewController.m
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
Example/CNLiveCommuntyModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.2.4'
+  s.version          = '0.2.5'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -38,6 +38,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param webUrl url
 -(UIViewController *)pushLiveViewWithMainProjectWithPageId:(NSString *)pageId ChannelName:(NSString *)channelName ChannelId:(NSString *)channelId WebUrl:(NSString *)webUrl;
+/// 调用转发好友方法
+/// @param imageData 转发的data
+-(void)pushPayResultWithForwardFriendsWithImageData:(NSData *)imageData;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -129,10 +129,21 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveCommuntyActivityPaycostListModel : NSObject
 @property (nonatomic, copy) NSString *idStr;
 @property (nonatomic, copy) NSString *locality;
-/**0未缴费 1已缴费*/
+/**缴费状态 0未缴费 1已缴费*/
 @property (nonatomic, copy) NSString *payStatus;
 @property (nonatomic, copy) NSString *totalFee;
+/**缴费方式 1现金缴费 2线上缴费*/
+@property (nonatomic, copy) NSString *payType;
+/**快捷支付方式 1微信 2 支付宝*/
+@property (nonatomic, copy) NSString *bankPayType;
+/**缴费人id*/
+@property (nonatomic, copy) NSString *payUserId;
 @property (nonatomic, copy) NSString *payerName;
+/**回执单号id*/
+@property (nonatomic, copy) NSString *receiptId;
+@property (nonatomic, copy) NSString *receiptType;
+@property (nonatomic, copy) NSString *receiptName;
+@property (nonatomic, copy) NSString *rmb;
 @property (nonatomic, strong) NSNumber *beginTime;
 @property (nonatomic, strong) NSNumber *endTime;
 @property (nonatomic, strong) NSNumber *payTime;
@@ -23,6 +23,11 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param completerBlock 确认回调  
 +(void)showAlertViewWithMessage:(NSString *)message CompleterBlock:(void(^)(void))completerBlock;
+
+/// 获取显示的回执图片
+/// @param paycostModel 显示参数
++(UIImageView *)showContentViewWithParamPaycostModel:(CNLiveCommuntyActivityPaycostListModel *)paycostModel;
+
 @end
@@ -136,6 +141,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UILabel * nameLabel;
 @property (nonatomic, strong) UILabel * timeLabel;
 @property (nonatomic, strong) QMUIButton * moreButton;
+@property (nonatomic, strong) QMUIButton * receiptButton;
 @property (nonatomic, strong) UILabel * lineLabel;
 @property (nonatomic, strong) UILabel * priceLabel;
@@ -9,6 +9,147 @@
 @implementation CNLiveCommuntSignUpView
+
+
+/// 获取显示的回执图片
+/// @param paycostModel 显示参数
++(UIImageView *)showContentViewWithParamPaycostModel:(CNLiveCommuntyActivityPaycostListModel *)paycostModel
+{
+    UIImage * temp_image = (UIImage *)[CNLiveRespCacheManager objectCacheWithFileName:[NSString stringWithFormat:@"receipt_%@_%@",CNUserShareModelUid,paycostModel.receiptId]];
+    if (temp_image) {
+        UIImageView * imageView = [[UIImageView alloc] initWithImage:temp_image];
+        imageView.backgroundColor = [UIColor whiteColor];
+        imageView.contentMode = UIViewContentModeScaleAspectFill;
+        return imageView;
+    }
+    
+    UIView * mainView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth - DS_adapt_length(10), 0)];
+    mainView.backgroundColor = [UIColor whiteColor];
+    
+    UILabel * nameLabel = [[UILabel alloc] initWithFrame:CGRectMake(DS_adapt_length(5), DS_adapt_length(2.5), kScreenWidth - DS_adapt_length(30), DS_adapt_length(20))];
+    nameLabel.textColor = [UIColor blackColor];
+    nameLabel.font = DS_regular_font(9);
+    nameLabel.text = [NSString stringWithFormat:@"电子回执单号码: %@",paycostModel.receiptId];
+    [mainView addSubview:nameLabel];
+    
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setDateFormat:@"yyyy/MM"];
+    NSDate *detaildate_beginTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.beginTime doubleValue]/1000)];
+    NSDate *detaildate_endTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.endTime doubleValue]/1000)];
+    NSString * time_string = [NSString stringWithFormat:@"%@~%@",[dateFormatter stringFromDate:detaildate_beginTime],[dateFormatter stringFromDate:detaildate_endTime]];
+    
+    NSDateFormatter *dateFormatter_pay = [[NSDateFormatter alloc] init];
+    [dateFormatter_pay setDateFormat:@"yyyy/MM/dd"];//HH:mm:ss
+    NSDate *detaildate_payTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.payTime doubleValue]/1000)];
+    NSMutableArray * dataArray = [[NSMutableArray alloc] init];
+    [dataArray addObject:@{@"key":@"回单类型",@"value":paycostModel.receiptType}];
+    [dataArray addObject:@{@"key":@"收费单位",@"value":paycostModel.propertyName}];
+    [dataArray addObject:@{@"key":@"缴费房屋",@"value":paycostModel.locality}];
+    [dataArray addObject:@{@"key":@"缴费人",@"value":paycostModel.payerName}];
+    [dataArray addObject:@{@"key":@"金额(大写)",@"value":paycostModel.rmb}];
+    [dataArray addObject:@{@"key":@"支付方式",@"value":[paycostModel.bankPayType isEqualToString:@"1"]?@"微信支付":@"支付宝支付"}];
+    [dataArray addObject:@{@"key":@"账单周期",@"value":time_string}];
+    [dataArray addObject:@{@"key":@"支付时间",@"value":[dateFormatter_pay stringFromDate:detaildate_payTime]}];
+    
+    UIView * lastView;
+    for (int i = 0; i < dataArray.count; i ++) {
+        NSDictionary * dict = dataArray[i];
+        UIView * view = [[UIView alloc] initWithFrame:CGRectMake(DS_adapt_length(5), lastView?CGRectGetMaxY(lastView.frame):0 + DS_adapt_length(23), mainView.width - DS_adapt_length(10), DS_adapt_length(35))];
+        view.backgroundColor = [UIColor whiteColor];
+        [mainView addSubview:view];
+        
+        UILabel * leftLab = [[UILabel alloc]initWithFrame:CGRectMake(DS_adapt_length(5), 0, 0, 0)];
+        leftLab.textColor = DS_HEX_RGB(0x000000);//DS_HEX_RGB(0x6d6d6d);
+        leftLab.font = [UIFont systemFontOfSize:10];
+        leftLab.font = [UIFont fontWithName:@"Heiti SC" size:10];
+        leftLab.textAlignment = NSTextAlignmentCenter;
+        leftLab.backgroundColor = [UIColor whiteColor];
+        leftLab.text = dict[@"key"];
+        leftLab.numberOfLines = 1;
+        [view addSubview:leftLab];
+        leftLab.height = ceil([leftLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:leftLab.font].height) + DS_adapt_length(5);
+        leftLab.width = ceil([leftLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:leftLab.font].width);
+        
+        UILabel * rightLab = [[UILabel alloc] initWithFrame:CGRectMake(DS_adapt_length(65), DS_adapt_length(2.5), 0, 0)];
+        rightLab.textColor = DS_HEX_RGB(0x000000);//DS_HEX_RGB(0xaaaaaa);
+        rightLab.font = [UIFont systemFontOfSize:10];
+        rightLab.font = [UIFont fontWithName:@"Heiti SC" size:10];
+        rightLab.textAlignment = NSTextAlignmentCenter;
+        rightLab.backgroundColor = [UIColor whiteColor];
+        rightLab.text = dict[@"value"];
+        rightLab.numberOfLines = 0;
+        [view addSubview:rightLab];
+        rightLab.height = ceil([rightLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:rightLab.font].height) + DS_adapt_length(5);
+        rightLab.width = ceil([rightLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:rightLab.font].width);
+
+        
+        if (rightLab.height > leftLab.height) {
+            view.height = rightLab.height;
+        }else{
+            view.height = leftLab.height;
+        }
+        
+        DSImageView * line = [[DSImageView alloc] initWithFrame:CGRectMake(0, 0, view.width, DS_ONE_PIXEL)];
+        line.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
+        [view addSubview:line];
+        
+        if (i == 0 || i == 4) {
+            UILabel * insertLeftLabel = [[UILabel alloc] initWithFrame:CGRectMake(mainView.width - DS_adapt_length(150), 0, 0, leftLab.height + DS_adapt_length(2))];
+            insertLeftLabel.textColor = DS_HEX_RGB(0x000000);
+            insertLeftLabel.font = [UIFont systemFontOfSize:10];
+            insertLeftLabel.font = [UIFont fontWithName:@"Heiti SC" size:10];
+            insertLeftLabel.textAlignment = NSTextAlignmentCenter;
+            insertLeftLabel.backgroundColor = [UIColor whiteColor];
+            insertLeftLabel.text = i == 0 ? @"缴费项目" : @"金额(小写)";
+            insertLeftLabel.numberOfLines = 1;
+            insertLeftLabel.layer.borderColor = [UIColor blackColor].CGColor;
+            insertLeftLabel.layer.borderWidth = DS_ONE_PIXEL;
+            [view addSubview:insertLeftLabel];
+            insertLeftLabel.width = ceil([insertLeftLabel.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:insertLeftLabel.font].width) + DS_adapt_length(5);
+            
+            UILabel * insertRightLab = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(insertLeftLabel.frame) + DS_adapt_length(5), DS_adapt_length(2.5), 0, rightLab.height + DS_adapt_length(1))];
+            insertRightLab.textColor = DS_HEX_RGB(0x000000);
+            insertRightLab.font = [UIFont systemFontOfSize:10];
+            insertRightLab.font = [UIFont fontWithName:@"Heiti SC" size:10];
+            insertRightLab.textAlignment = NSTextAlignmentCenter;
+            insertRightLab.backgroundColor = [UIColor whiteColor];
+            insertRightLab.text = i == 0 ? paycostModel.receiptName : [NSString stringWithFormat:@"¥%@",paycostModel.totalFee];
+            insertRightLab.numberOfLines = 1;
+            [view addSubview:insertRightLab];
+            insertRightLab.width = ceil([insertRightLab.text calculateSizeWithUIWidth:kScreenWidth - DS_adapt_length(10) font:insertRightLab.font].width) + DS_adapt_length(5);
+        }
+        
+        lastView = view;
+    }
+    
+    DSImageView * leftLine = [[DSImageView alloc] initWithFrame:CGRectMake(lastView.x, DS_adapt_length(23), DS_ONE_PIXEL, CGRectGetMaxY(lastView.frame) - DS_adapt_length(23))];
+    leftLine.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
+    [mainView addSubview:leftLine];
+
+    DSImageView * middleLine = [[DSImageView alloc] initWithFrame:CGRectMake(lastView.x + DS_adapt_length(63), DS_adapt_length(23), DS_ONE_PIXEL, CGRectGetMaxY(lastView.frame) - DS_adapt_length(23))];
+    middleLine.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
+    [mainView addSubview:middleLine];
+
+    DSImageView * rightLine = [[DSImageView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(lastView.frame) - DS_ONE_PIXEL, DS_adapt_length(23), DS_ONE_PIXEL, CGRectGetMaxY(lastView.frame) - DS_adapt_length(23))];
+    rightLine.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
+    [mainView addSubview:rightLine];
+
+    DSImageView * bottomLine = [[DSImageView alloc] initWithFrame:CGRectMake(lastView.x, CGRectGetMaxY(lastView.frame), lastView.width, DS_ONE_PIXEL)];
+    bottomLine.backgroundColor = [UIColor blackColor];//DS_HEX_RGB(0xd4d4d4);
+    [mainView addSubview:bottomLine];
+    
+    mainView.height = CGRectGetMaxY(bottomLine.frame) + DS_adapt_length(5);
+    
+    UIImage * image = [UIImage qmui_imageWithView:mainView];
+    
+    [CNLiveRespCacheManager cachePathWithObject:image FileName:[NSString stringWithFormat:@"receipt_%@_%@",CNUserShareModelUid,paycostModel.receiptId]];
+    
+    UIImageView * imageView = [[UIImageView alloc] initWithImage:image];
+    imageView.backgroundColor = [UIColor whiteColor];
+    imageView.contentMode = UIViewContentModeScaleAspectFill;
+    return imageView;
+}
+
 /// 显示接单成功弹框
 +(void)showHaveTipSuccessViewCompleterBlock:(void(^)(void))completerBlock
 {
@@ -1136,6 +1277,7 @@
         [self.mainView addSubview:self.moreButton];
         [self.mainView addSubview:self.lineLabel];
         [self.mainView addSubview:self.priceLabel];
+        [self.mainView addSubview:self.receiptButton];
     }
     return self;
@@ -1153,6 +1295,22 @@
     self.lineLabel.hidden = [payModel.payStatus isEqualToString:@"1"];
     self.priceLabel.hidden = [payModel.payStatus isEqualToString:@"1"];
     self.priceLabel.text = [NSString stringWithFormat:@"待缴金额：¥%@",payModel.totalFee];
+    
+    self.receiptButton.hidden = ![payModel.payType isEqualToString:@"2"];
+    self.lineLabel.hidden = ![payModel.payType isEqualToString:@"2"];
+    
+}
+-(void)browerAction:(UIButton *)button
+{
+    UIImageView * imageView = [CNLiveCommuntSignUpView showContentViewWithParamPaycostModel:self.payModel];
+    imageView.frame = button.frame;
+    imageView.hidden = YES;
+    [self.contentView addSubview:imageView];
+    [CNLivePhotoBrowser photoBrowserForDefultWithSourceViews:@[imageView] MediaURLArray:@[imageView.image] CurrentIndex:0 ShowType:CNLivePhotoBrowserShowTypeImage Sheet:@[@"转发好友",@"保存图片"] CompleterBlock:^(NSString *sheet) {
+        if ([sheet isEqualToString:@"转发好友"]) {
+            [[CNLiveCommuntyModule shareInstance].protocol pushPayResultWithForwardFriendsWithImageData:UIImagePNGRepresentation(imageView.image)];
+        }
+    }];
 }
 -(void)layoutSubviews
 {
@@ -1187,6 +1345,10 @@
         make.top.mas_equalTo(weakSelf.lineLabel.mas_bottom).offset(10);
         make.left.mas_equalTo(weakSelf.mainView.mas_left).offset(10);
     }];
+    [self.receiptButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.lineLabel.mas_bottom).offset(10);
+        make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-10);
+    }];
 }
 -(UIView *)mainView
@@ -1240,6 +1402,18 @@
     }
     return _moreButton;
 }
+-(QMUIButton *)receiptButton
+{
+    if (!_receiptButton) {
+        _receiptButton = [[QMUIButton alloc] init];
+        [_receiptButton setTitleColor:UIColorHex(#0091FF) forState:UIControlStateNormal];
+        [_receiptButton setTitle:@"电子回执单" forState:UIControlStateNormal];
+        _receiptButton.titleLabel.font = DS_regular_font(14);
+        _receiptButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
+        [_receiptButton addTarget:self action:@selector(browerAction:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _receiptButton;
+}
 -(UILabel *)lineLabel
 {
     if (!_lineLabel) {
@@ -238,7 +238,7 @@
     }
     if (self.showType == CNLiveCommuntListShowTypePayCost) {
         CNLiveCommuntyActivityPaycostListModel * paycostModel = self.dataArray[indexPath.row];
-        return [paycostModel.payStatus isEqualToString:@"0"]?120.0:80.0;
+        return [paycostModel.payStatus isEqualToString:@"0"] || [paycostModel.payType isEqualToString:@"2"] ? 120.0 : 80.0;
     }
     return 0.001;
 }
@@ -48,7 +48,7 @@
         NSDate *detaildate_beginTime = [NSDate dateWithTimeIntervalSince1970:([detailModel.beginTime doubleValue]/1000)];
         NSDate *detaildate_endTime = [NSDate dateWithTimeIntervalSince1970:([detailModel.endTime doubleValue]/1000)];
         NSDateFormatter *dateFormatter_pay = [[NSDateFormatter alloc] init];
-        [dateFormatter_pay setDateFormat:@"yyyy/MM/dd HH:mm:ss"];
+        [dateFormatter_pay setDateFormat:@"yyyy/MM/dd"];// HH:mm:ss
         NSDate *detaildate_payTime = [NSDate dateWithTimeIntervalSince1970:([detailModel.payTime doubleValue]/1000)];
         NSString * time_string = [NSString stringWithFormat:@"%@~%@",[dateFormatter stringFromDate:detaildate_beginTime],[dateFormatter stringFromDate:detaildate_endTime]];
         [weakSelf.dataArray addObject:@{@"key":@"收费单位",@"value":detailModel.propertyName}];
@@ -57,7 +57,13 @@
         [weakSelf.dataArray addObject:@{@"key":@"账单周期",@"value":time_string}];
         if ([detailModel.payStatus isEqualToString:@"1"]) {
             [weakSelf.dataArray addObject:@{@"key":@"支付时间",@"value":[dateFormatter_pay stringFromDate:detaildate_payTime]}];
-            [weakSelf.dataArray addObject:@{@"key":@"缴费人",@"value":[detailModel.payerName isNotBlank]?detailModel.payerName:@""}];
+            if ([detailModel.payType isEqualToString:@"2"]) {
+                [weakSelf.dataArray addObject:@{@"key":@"缴费方式",@"value":[detailModel.bankPayType isEqualToString:@"1"]?@"微信支付":@"支付宝支付"}];
+                [weakSelf.dataArray addObject:@{@"key":@"缴费人",@"value":[detailModel.payerName isNotBlank]?detailModel.payerName:@""}];
+            }else{
+                [weakSelf.dataArray addObject:@{@"key":@"缴费方式",@"value":@"现金支付"}];
+            }
+            
         }
         [weakSelf.tableView reloadData];
@@ -24,7 +24,7 @@
     [IQKeyboardManager sharedManager].enable = YES;
     [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
-    [CNUserInfoManager manager].userInfoModel.uid = @"10504761";//@"10458139";//@"145680";//@"11174272";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
+    [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"10504761";//@"145680";//@"11174272";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
 //    [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
 //    [[NSUserDefaults standardUserDefaults] synchronize];
@@ -32,6 +32,7 @@
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <CNLiveUserManagement/CNUserInfoManager.h>
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <CNLivePhotoBrowser/CNLivePhotoBrowser.h>
 @interface CNLIVEViewController ()<UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate>
 @property (nonatomic, strong) UITableView * tableView;
 @property (nonatomic, strong) NSMutableArray * dataArray;
@@ -77,19 +78,34 @@
         make.edges.mas_equalTo(self.view);
     }];
-    int h = 23;//小时数
-    float mun = 61245.98;//3月累计
-    float s = ((21 * 91.954) + 16400);//四月前累计
-    float w = ((h * 91.954) + 16400);//五月前累计
-    float kou = 2276.25 + 5000 + 1500 + 400;//每月扣
+//    int h = 30.5;//小时数
+//    float mun = 61245.98;//3月累计
+//    float s = ((21 * 91.954) + 16400);//四月前累计
+//    float w = ((h * 91.954) + 16400);//五月前累计
+//    float kou = 2276.25 + 5000 + 1500 + 400;//每月扣
-    float z = (w + s + mun) - (kou * 5);
-    float sui = (z * 0.1) - 2520 - 1767.20;
-    NSLog(@"税=>%.2f",sui);
-    float dao = w - 2276.25 - sui;
-    NSLog(@"到=>%.2f",dao);
-    
+//    float z = (w + s + mun) - (kou * 5) - 2000;
+//    float sui = (z * 0.1) - 2520 - 1767.20;
+//    NSLog(@"税=>%.2f",sui);
+//    float dao = w - 2276.25 - sui;
+//    NSLog(@"到=>%.2f",dao);
+//    UIImageView * imageView = [CNLiveCommuntSignUpView showContentViewWithParamPaycostModel:nil];
+//    [self.view addSubview:imageView];
+//    imageView.userInteractionEnabled = YES;
+//    [imageView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+//        [CNLivePhotoBrowser photoBrowserForDefultWithSourceViews:@[imageView] MediaURLArray:@[imageView.image] CurrentIndex:0 ShowType:CNLivePhotoBrowserShowTypeImage Sheet:nil CompleterBlock:^(NSString *sheet) {
+//
+//        }];
+//    }]];
+//    [imageView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.mas_equalTo(self.view.mas_top).offset(100);
+//        make.centerX.mas_equalTo(self.view);
+//        make.height.mas_equalTo(100);
+//        make.left.mas_equalTo(self.view.mas_left).offset(10);
+//        make.right.mas_equalTo(self.view.mas_right).offset(-10);
+//    }];
+//
 //    __block NSArray * array = @[@"123",@"123",@"123",@"123",@"123",@"123"];
 //    __block NSMutableString *picString = [[NSMutableString alloc] init];
@@ -146,8 +162,9 @@
 //        CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
 //        [self.navigationController pushViewController:repairView animated:YES];
 //        [BHRouter openURL:[NSURL URLWithString:@"com.cnlive.CNLiveNetAdd://jump.vc.beehive/CNLiveCommuntActiviRepairViewController.push"]];
-        
-        CNLiveCommuntListViewController * listView = [[CNLiveCommuntListViewController alloc] initWithShowType:CNLiveCommuntListShowTypePayCost NBhdId:@"72"];//@"53"];
+        NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"kCNLiveCommuntyNBhdInfoIdentifier%@",[CNUserInfoManager manager].userInfoModel.uid]];
+        NSDictionary * dict = [nb_info mj_JSONObject];
+        CNLiveCommuntListViewController * listView = [[CNLiveCommuntListViewController alloc] initWithShowType:CNLiveCommuntListShowTypePayCost NBhdId:[dict stringValueForKey:@"id" default:@""]];//@"53"];
         [self.navigationController pushViewController:listView animated:YES];
     }
     if (indexPath.row == 3) {