0.2.1

liushiyu
1 parent cff85fea
Showing 21 changed files with 664 additions and 9 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/Core/CNLiveCommunitModuleProtocol.h
CNLiveCommuntyModule/Classes/Core/CNLiveCommuntyModule.h
CNLiveCommuntyModule/Classes/Core/CNLiveCommuntyModule.m
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.h
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntPaycostViewController.h
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntPaycostViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyResultViewController.h
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyResultViewController.m
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.h
CNLiveCommuntyModule/Classes/ViewModel/CNLiveCommuntViewModel.m
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
Example/CNLiveCommuntyModule/CNLIVEViewController.m
Example/CNLiveCommuntyModule/CNLiveCommunitModuleImpl.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.2.0'
+  s.version          = '0.2.1'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -27,7 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param orderId 订单id
 /// @param price 价格
 /// @param body 支付名
--(void)pushMainProjectWithPayManagerWithOrderId:(NSString *)orderId price:(NSString *)price body:(NSString *)body;
+/// @param notifyUrl 授权回调地址
+-(void)pushMainProjectWithPayManagerWithOrderId:(NSString *)orderId price:(NSString *)price body:(NSString *)body NotifyUrl:(NSString *)notifyUrl;
 /// 获取主工程的视讯相关界面逻辑
@@ -39,6 +39,10 @@ static NSString *const kCNLiveHiddenModalViewWithQrNotification = @&quot;kCNLiveHidde
 /// 跳转到报修编辑界面
 /// @param nbhdId 小区id
 -(void)pushCommuntyRepairEditWithNBhdId:(NSString *)nbhdId;
+
+/// 跳转到支付结果界面
+/// @param status 支付结果
+-(void)pushCommuntyPayCostResultWithStatus:(BOOL)status;
 @end
 NS_ASSUME_NONNULL_END
@@ -98,4 +98,13 @@
     CNLiveCommuntInformViewController * informView = [[CNLiveCommuntInformViewController alloc] initWithNBhdId:nbhdId];
     [[self displayViewController] dsPushViewController:informView animated:YES];
 }
+
+
+/// 跳转到支付结果界面
+/// @param status 支付结果
+-(void)pushCommuntyPayCostResultWithStatus:(BOOL)status
+{
+    CNLiveCommuntyResultViewController * resultView = [[CNLiveCommuntyResultViewController alloc] initWithStatus:status];
+    [[self displayViewController] dsPushViewController:resultView animated:YES];
+}
 @end
@@ -125,6 +125,21 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *createId;
 @end
+/// 物业缴费model
+@interface CNLiveCommuntyActivityPaycostListModel : NSObject
+@property (nonatomic, copy) NSString *idStr;
+@property (nonatomic, copy) NSString *locality;
+/**0未缴费 1已缴费*/
+@property (nonatomic, copy) NSString *payStatus;
+@property (nonatomic, copy) NSString *totalFee;
+@property (nonatomic, copy) NSString *payerName;
+@property (nonatomic, strong) NSNumber *beginTime;
+@property (nonatomic, strong) NSNumber *endTime;
+@property (nonatomic, strong) NSNumber *payTime;
+/**收费单位*/
+@property (nonatomic, copy) NSString *propertyName;
+@end
+
 @interface CNLiveCommuntyActivityMaintainsListModel : NSObject
 @property (nonatomic, copy) NSString *idStr;
 @property (nonatomic, copy) NSString *name;
@@ -172,6 +172,54 @@ MJCodingImplementation
 @end
+@implementation CNLiveCommuntyActivityPaycostListModel
+
+MJCodingImplementation
+
++ (NSDictionary *)mj_replacedKeyFromPropertyName
+{
+    return @{@"idStr":@"id"};
+}
+//- (void)mj_didConvertToObjectWithKeyValues:(NSDictionary *)keyValues
+//{
+//
+//    
+//    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+//    [dateFormatter setDateFormat:@"yyyy-MM"];
+//    
+//    NSNumber * beginTime = [keyValues numberValueForKey:@"beginTime" default:@0];
+//    NSDate *detaildate_beginTime = [NSDate dateWithTimeIntervalSince1970:([beginTime doubleValue]/1000)];
+//    self.beginTimeString = [dateFormatter stringFromDate:detaildate_beginTime];
+//    
+//    NSNumber * endTime = [keyValues numberValueForKey:@"endTime" default:@0];
+//    NSDate *detaildate_endTime = [NSDate dateWithTimeIntervalSince1970:([endTime doubleValue]/1000)];
+//    self.endTimeString = [dateFormatter stringFromDate:detaildate_endTime];
+//    NSLog(@"%@",keyValues);
+//}
+- (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
+{
+    BOOL isNULL = [oldValue isKindOfClass:NSNull.class] || oldValue == nil;
+    oldValue = [NSString stringWithFormat:@"%@",isNULL?@"":oldValue];
+    if ([property.name isEqualToString:@"totalFee"]) {
+        oldValue = [NSString stringWithFormat:@"%.2f",[oldValue floatValue]/100];
+    }
+//    if ([property.name isEqualToString:@"beginTime"]) {
+//        NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+//        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+//        [dateFormatter setDateFormat:@"yyyy-MM"];
+//        self.beginTimeString = [dateFormatter stringFromDate:detaildate];
+//    }
+//    if ([property.name isEqualToString:@"endTime"]) {
+//        NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+//        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+//        [dateFormatter setDateFormat:@"yyyy-MM"];
+//        self.endTimeString = [dateFormatter stringFromDate:detaildate];
+//    }
+    return oldValue;
+}
+
+@end
+
 @implementation CNLiveCommuntyActivityMaintainsListModel
 MJCodingImplementation
@@ -131,4 +131,31 @@ NS_ASSUME_NONNULL_BEGIN
 @end
+@interface CNLiveCommuntPayCostListViewCell : UITableViewCell
+@property (nonatomic, strong) UIView * mainView;
+@property (nonatomic, strong) UILabel * nameLabel;
+@property (nonatomic, strong) UILabel * timeLabel;
+@property (nonatomic, strong) QMUIButton * moreButton;
+@property (nonatomic, strong) UILabel * lineLabel;
+@property (nonatomic, strong) UILabel * priceLabel;
+
+@property (nonatomic, strong) CNLiveCommuntyActivityPaycostListModel * payModel;
+
++(CNLiveCommuntPayCostListViewCell *)setTableView:(UITableView *)tableView payCostModel:(CNLiveCommuntyActivityPaycostListModel *)payModel;
+@end
+
+@interface CNLiveCommuntPayCostDetailViewCell : UITableViewCell
+@property (nonatomic, strong) UIView * mainView;
+@property (nonatomic, strong) UILabel * nameLabel;
+@property (nonatomic, strong) UILabel * descLabel;
+
+/// 数据源
+@property (nonatomic, strong) NSDictionary * paramDict;
+
+/// 初始化界面显示
+/// @param tableView tableView
+/// @param paramDict 数据源
++(CNLiveCommuntPayCostDetailViewCell *)setTableView:(UITableView *)tableView ParamDict:(NSDictionary *)paramDict;
+@end
+
 NS_ASSUME_NONNULL_END
@@ -1110,3 +1110,233 @@
     return _bottemLabel;
 }
 @end
+
+@implementation CNLiveCommuntPayCostListViewCell
+
++(CNLiveCommuntPayCostListViewCell *)setTableView:(UITableView *)tableView payCostModel:(nonnull CNLiveCommuntyActivityPaycostListModel *)payModel
+{
+    CNLiveCommuntPayCostListViewCell * textCell = [tableView dequeueReusableCellWithIdentifier:@"CNLiveCommuntPayCostListViewCell"];
+    if (!textCell) {
+        textCell = [[CNLiveCommuntPayCostListViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CNLiveCommuntPayCostListViewCell"];
+    }
+    textCell.payModel = payModel;
+    return textCell;
+}
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
+        self.contentView.backgroundColor = [UIColor clearColor];
+        self.selectionStyle = UITableViewCellSelectionStyleNone;
+        self.backgroundColor = [UIColor clearColor];
+        [self.contentView addSubview:self.mainView];
+        [self.mainView addSubview:self.nameLabel];
+        [self.mainView addSubview:self.timeLabel];
+        
+        [self.mainView addSubview:self.moreButton];
+        [self.mainView addSubview:self.lineLabel];
+        [self.mainView addSubview:self.priceLabel];
+        
+    }
+    return self;
+}
+-(void)setPayModel:(CNLiveCommuntyActivityPaycostListModel *)payModel
+{
+    _payModel = payModel;
+    self.nameLabel.text = payModel.locality;
+    
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setDateFormat:@"yyyy/MM"];
+    NSDate *detaildate_beginTime = [NSDate dateWithTimeIntervalSince1970:([payModel.beginTime doubleValue]/1000)];
+    NSDate *detaildate_endTime = [NSDate dateWithTimeIntervalSince1970:([payModel.endTime doubleValue]/1000)];
+    self.timeLabel.text = [NSString stringWithFormat:@"%@~%@",[dateFormatter stringFromDate:detaildate_beginTime],[dateFormatter stringFromDate:detaildate_endTime]];
+    self.lineLabel.hidden = [payModel.payStatus isEqualToString:@"1"];
+    self.priceLabel.hidden = [payModel.payStatus isEqualToString:@"1"];
+    self.priceLabel.text = [NSString stringWithFormat:@"待缴金额：¥%@",payModel.totalFee];
+}
+-(void)layoutSubviews
+{
+    [super layoutSubviews];
+    __weak typeof(self) weakSelf = self;
+    [self.mainView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.left.mas_equalTo(weakSelf.contentView).offset(10);
+        make.bottom.right.mas_equalTo(weakSelf.contentView).offset(-10);
+    }];
+    [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.mainView.mas_top).offset(10);
+        make.left.mas_equalTo(weakSelf.mainView.mas_left).offset(10);
+        make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-30);
+    }];
+    [self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.nameLabel.mas_bottom).offset(10);
+        make.left.mas_equalTo(weakSelf.mainView.mas_left).offset(10);
+    }];
+    [self.moreButton mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(weakSelf.nameLabel);
+        make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-5);
+        make.width.mas_equalTo(20);
+        make.height.mas_equalTo(30);
+    }];
+    [self.lineLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(weakSelf.mainView.mas_left).offset(10);
+        make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-10);
+        make.top.mas_equalTo(weakSelf.timeLabel.mas_bottom).offset(10);
+        make.height.mas_equalTo(0.5);
+    }];
+    [self.priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(weakSelf.lineLabel.mas_bottom).offset(10);
+        make.left.mas_equalTo(weakSelf.mainView.mas_left).offset(10);
+    }];
+}
+
+-(UIView *)mainView
+{
+    if (!_mainView) {
+        _mainView = [[UIView alloc] init];
+        _mainView.backgroundColor = [UIColor whiteColor];
+        _mainView.layer.masksToBounds = YES;
+        _mainView.layer.cornerRadius = 5;
+    }
+    return _mainView;
+}
+-(UILabel *)nameLabel
+{
+    if (!_nameLabel) {
+        _nameLabel = [[UILabel alloc] init];
+        _nameLabel.textColor = UIColorHex(#333333);
+        _nameLabel.numberOfLines = 1;
+        _nameLabel.lineBreakMode =  NSLineBreakByTruncatingTail;
+        _nameLabel.backgroundColor = [UIColor whiteColor];
+        _nameLabel.textAlignment = NSTextAlignmentLeft;
+        _nameLabel.font = [UIFont systemFontOfSize:15];
+        _nameLabel.font = [UIFont boldSystemFontOfSize:15];
+        
+    }
+    return _nameLabel;
+}
+-(UILabel *)timeLabel
+{
+    if (!_timeLabel) {
+        _timeLabel = [[UILabel alloc] init];
+        _timeLabel.textColor = UIColorHex(#999999);
+        _timeLabel.numberOfLines = 1;
+        _timeLabel.backgroundColor = [UIColor whiteColor];
+        _timeLabel.textAlignment = NSTextAlignmentLeft;
+        _timeLabel.font = [UIFont systemFontOfSize:12];
+        
+    }
+    return _timeLabel;
+}
+-(QMUIButton *)moreButton
+{
+    if (!_moreButton) {
+        _moreButton = [[QMUIButton alloc] init];
+        [_moreButton setTitleColor:UIColorHex(#C8C8C8) forState:UIControlStateNormal];
+        [_moreButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communt_list_more"] forState:UIControlStateNormal];
+        _moreButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
+        _moreButton.titleLabel.font = [UIFont systemFontOfSize:14.0f];
+        _moreButton.imagePosition = QMUIButtonImagePositionRight;
+        _moreButton.spacingBetweenImageAndTitle = 2.5;
+        _moreButton.userInteractionEnabled = NO;
+    }
+    return _moreButton;
+}
+-(UILabel *)lineLabel
+{
+    if (!_lineLabel) {
+        _lineLabel = [[UILabel alloc] init];
+        _lineLabel.backgroundColor = UIColorHex(#E6E6E6);
+        _lineLabel.hidden = YES;
+    }
+    return _lineLabel;
+}
+-(UILabel *)priceLabel
+{
+    if (!_priceLabel) {
+        _priceLabel = [[UILabel alloc] init];
+        _priceLabel.textColor = UIColorHex(#FD862E);
+        _priceLabel.lineBreakMode = NSLineBreakByTruncatingTail;
+        _priceLabel.numberOfLines = 1;
+        _priceLabel.font = [UIFont systemFontOfSize:18];
+        _priceLabel.font = [UIFont boldSystemFontOfSize:18];
+        _priceLabel.hidden = YES;
+    }
+    return _priceLabel;
+}
+@end
+
+@implementation CNLiveCommuntPayCostDetailViewCell
+
++(CNLiveCommuntPayCostDetailViewCell *)setTableView:(UITableView *)tableView ParamDict:(NSDictionary *)paramDict
+{
+    CNLiveCommuntPayCostDetailViewCell * textCell = [tableView dequeueReusableCellWithIdentifier:@"CNLiveCommuntPayCostDetailViewCell"];
+    if (!textCell) {
+        textCell = [[CNLiveCommuntPayCostDetailViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"CNLiveCommuntPayCostDetailViewCell"];
+    }
+    textCell.paramDict = paramDict;
+    return textCell;
+}
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    if (self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]) {
+        self.contentView.backgroundColor = [UIColor clearColor];
+        self.selectionStyle = UITableViewCellSelectionStyleNone;
+        self.backgroundColor = [UIColor clearColor];
+        [self.contentView addSubview:self.nameLabel];
+        [self.contentView addSubview:self.descLabel];
+    }
+    return self;
+}
+-(void)layoutSubviews
+{
+    [super layoutSubviews];
+    __weak typeof(self) weakSelf = self;
+    [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(weakSelf.contentView);
+        make.left.mas_equalTo(weakSelf.contentView.mas_left).offset(10);
+    }];
+    [self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(weakSelf.contentView);
+        make.left.mas_equalTo(weakSelf.nameLabel.mas_right).offset(10);
+        make.right.mas_equalTo(weakSelf.contentView.mas_right).offset(-10);
+    }];
+}
+
+-(void)setParamDict:(NSDictionary *)paramDict
+{
+    _paramDict = paramDict;
+    _nameLabel.text = [paramDict stringValueForKey:@"key" default:@""];
+    _descLabel.text = [paramDict stringValueForKey:@"value" default:@""];
+}
+
+-(UILabel *)nameLabel
+{
+    if (!_nameLabel) {
+        _nameLabel = [[UILabel alloc] init];
+        _nameLabel.textColor = UIColorHex(#333333);
+        _nameLabel.numberOfLines = 1;
+        _nameLabel.lineBreakMode =  NSLineBreakByTruncatingTail;
+        _nameLabel.backgroundColor = [UIColor whiteColor];
+        _nameLabel.textAlignment = NSTextAlignmentLeft;
+        _nameLabel.font = [UIFont systemFontOfSize:15];
+        _nameLabel.font = [UIFont boldSystemFontOfSize:15];
+    }
+    return _nameLabel;
+}
+
+-(UILabel *)descLabel
+{
+    if (!_descLabel) {
+        _descLabel = [[UILabel alloc] init];
+        _descLabel.textColor = UIColorHex(#333333);
+        _descLabel.numberOfLines = 1;
+        _descLabel.lineBreakMode =  NSLineBreakByTruncatingTail;
+        _descLabel.backgroundColor = [UIColor whiteColor];
+        _descLabel.textAlignment = NSTextAlignmentLeft;
+        _descLabel.font = [UIFont systemFontOfSize:14];
+        _descLabel.font = [UIFont boldSystemFontOfSize:14];
+    }
+    return _descLabel;
+}
+@end
@@ -6,7 +6,7 @@
 //
 #import "CNLiveCommuntListViewController.h"
-
+#import "CNLiveCommuntPaycostViewController.h"
 #import "CNLiveCommuntSignUpViewController.h"
 @interface CNLiveCommuntListViewController ()<DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 @property (nonatomic, assign) CNLiveCommuntListShowType showType;
@@ -54,6 +54,7 @@
     self.view.backgroundColor = UIColorHex(#F9F9F9);
     self.dataArray = [[NSMutableArray alloc] init];
     [self addRefreshMainView];
+    
 }
 -(void)addRefreshMainView
@@ -106,6 +107,10 @@
         make.left.right.bottom.mas_equalTo(weakSelf.view);
     }];
 }
+-(void)initSubviews
+{
+    [super initSubviews];
+}
 -(void)layoutTableView
 {
     [super layoutTableView];
@@ -122,6 +127,7 @@
     if (self.showType == CNLiveCommuntListShowTypeHome) string = @"暂无内容";
     if (self.showType == CNLiveCommuntListShowTypeRecord) string = @"亲，您还没有活动记录哦～";
     if (self.showType == CNLiveCommuntListShowTypeRepair) string = @"亲，您还没有报修记录哦～";
+    if (self.showType == CNLiveCommuntListShowTypePayCost) string = @"亲，您还没有缴费记录哦～";
     return [[NSAttributedString alloc] initWithString:string attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16]}];
 }
 -(UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
@@ -198,6 +204,10 @@
         CNLiveCommuntyActivityRepairListModel * repairModel = self.dataArray[indexPath.row];
         return [CNLiveCommuntSubRepairTableView setTableView:tableView RepairModel:repairModel];
     }
+    if (self.showType == CNLiveCommuntListShowTypePayCost) {
+        CNLiveCommuntyActivityPaycostListModel * paycostModel = self.dataArray[indexPath.row];
+        return [CNLiveCommuntPayCostListViewCell setTableView:tableView payCostModel:paycostModel];
+    }
     return nil;
 }
@@ -214,6 +224,10 @@
         CGFloat itemW = repairModel.imgs.count > 0 ?  (kScreenWidth - 60)/3 + 20 : 0;
         return ([repairModel.status isEqualToString:@"3"] && [repairModel.totalFee integerValue] > 0?110.0:70.0) + itemW;
     }
+    if (self.showType == CNLiveCommuntListShowTypePayCost) {
+        CNLiveCommuntyActivityPaycostListModel * paycostModel = self.dataArray[indexPath.row];
+        return [paycostModel.payStatus isEqualToString:@"0"]?120.0:80.0;
+    }
     return 0.001;
 }
@@ -243,6 +257,11 @@
         CNLiveCommuntyActivityHomeListModel * listModel = self.dataArray[indexPath.row];
         [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithActivityId:listModel.idStr];
     }
+    if (self.showType == CNLiveCommuntListShowTypePayCost) {
+        CNLiveCommuntyActivityPaycostListModel * paycostModel = self.dataArray[indexPath.row];
+        CNLiveCommuntPaycostViewController * paycostView = [[CNLiveCommuntPaycostViewController alloc] initWithPayCostId:paycostModel.idStr];
+        [self.navigationController pushViewController:paycostView animated:YES];
+    }
 }
 - (UIView *)listView {
+//
+//  CNLiveCommuntPaycostViewController.h
+//  CNLiveCommuntyModule
+//
+//  Created by open on 2022/4/9.
+//
+
+#import <CNLiveBusinessBaseModule/CNLiveBusinessBaseModule.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CNLiveCommuntPaycostViewController : CNCommonTableViewController
+- (instancetype)initWithPayCostId:(NSString *)payCostId;
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  CNLiveCommuntPaycostViewController.m
+//  CNLiveCommuntyModule
+//
+//  Created by open on 2022/4/9.
+//
+
+#import "CNLiveCommuntPaycostViewController.h"
+#import "CNLiveCommuntSignUpView.h"
+#import "CNLiveCommuntyResultViewController.h"
+@interface CNLiveCommuntPaycostViewController ()
+@property (nonatomic, strong) CNLiveCommuntyActivityPaycostListModel * detailModel;
+@property (nonatomic, copy) NSString * payCostId;
+@property (nonatomic, strong) NSMutableArray * dataArray;
+@end
+
+@implementation CNLiveCommuntPaycostViewController
+- (instancetype)initWithPayCostId:(NSString *)payCostId
+{
+    self = [super init];
+    if (self) {
+        self.dataArray = [[NSMutableArray alloc] init];
+        _payCostId = payCostId;
+    }
+    return self;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    self.view.backgroundColor = UIColorHex(#F9F9F9);
+    self.title = @"物业费";
+    
+    __weak typeof(self) weakSelf = self;
+    [CNLiveCommuntViewModel requestWithCommuntyPayCostDetailMentPaycostId:self.payCostId CompleterBlock:^(CNLiveCommuntyActivityPaycostListModel * _Nonnull detailModel) {
+        weakSelf.detailModel = detailModel;
+        [weakSelf.view addSubview:[weakSelf setTableViewFooterView:[NSString stringWithFormat:@"（¥%@）",detailModel.totalFee] isStatus:[detailModel.payStatus isEqualToString:@"1"]]];
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        [dateFormatter setDateFormat:@"yyyy/MM"];
+        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"];
+        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}];
+        [weakSelf.dataArray addObject:@{@"key":[detailModel.payStatus isEqualToString:@"1"]?@"已缴费用":@"待缴费用",@"value":[NSString stringWithFormat:@"¥%@",detailModel.totalFee]}];
+        [weakSelf.dataArray addObject:@{@"key":@"缴费房屋",@"value":detailModel.locality}];
+        [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:@""}];
+        }
+        [weakSelf.tableView reloadData];
+    }];
+}
+
+- (void)initTableView
+{
+    [super initTableView];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    self.tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
+    self.tableView.separatorInset = UIEdgeInsetsMake(0, 10, 0, 10);
+    self.tableView.tableFooterView = [[UIView alloc] init];
+    
+    self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
+    self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight + 10, 0, 60 + kVerticalBottomSafeHeight, 0);
+}
+-(UIView *)setTableViewFooterView:(NSString *)priceString isStatus:(BOOL)isStatus
+{
+    NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
+    
+    self.tableView.contentInset = UIEdgeInsetsMake(kNavigationBarHeight, 0, [nb_info isNotBlank]?(isStatus?30:90):0, 0);
+    
+    UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, kScreenHeight - ([nb_info isNotBlank]?(isStatus?30:90):0), kScreenWidth, [nb_info isNotBlank]?(isStatus?30:90):0)];
+    footerView.backgroundColor = [UIColor whiteColor];
+    
+    if ([nb_info isNotBlank]) {
+        CNLiveCommuntyHomeListModel * listModel = [CNLiveCommuntyHomeListModel mj_objectWithKeyValues:nb_info];
+        YYLabel * phoneLabel = [[YYLabel alloc] initWithFrame:CGRectMake(0, 5, kScreenWidth, 20)];
+        phoneLabel.textColor = UIColorHex(#B4B4B4);
+        phoneLabel.textAlignment = NSTextAlignmentCenter;
+        phoneLabel.textVerticalAlignment = YYTextVerticalAlignmentCenter;
+        phoneLabel.numberOfLines = 0;
+        phoneLabel.hidden = ![listModel.propertyPhone isNotBlank];
+        phoneLabel.backgroundColor = [UIColor whiteColor];
+        
+        NSString * string = [NSString stringWithFormat:@"物业电话 %@",listModel.propertyPhone];
+        NSMutableAttributedString *textAttributedString = [[NSMutableAttributedString alloc] initWithString:string];
+        textAttributedString.yy_font = [UIFont systemFontOfSize:10];
+        textAttributedString.yy_color = UIColorHex(#B4B4B4);
+        textAttributedString.yy_alignment = NSTextAlignmentCenter;
+        [textAttributedString yy_setTextHighlightRange:[string rangeOfString:listModel.propertyPhone]
+                                                 color:[UIColor qmui_colorWithHexString:@"0091FF"]
+                                       backgroundColor:[UIColor qmui_colorWithHexString:@"0091FF"]
+                                             tapAction:^(UIView *containerView, NSAttributedString *text, NSRange range, CGRect rect){
+            UIAlertController * alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+            [alert addAction:[UIAlertAction actionWithTitle:listModel.propertyPhone style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+                NSMutableString* str = [[NSMutableString alloc] initWithFormat:@"tel:%@",listModel.propertyPhone];
+                [[UIApplication sharedApplication] openURL:[NSURL URLWithString:str] options:@{} completionHandler:NULL];
+            }]];
+            [alert addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:NULL]];
+            [[self displayViewController] presentViewController:alert animated:YES completion:nil];
+        }];
+        phoneLabel.attributedText = textAttributedString;
+        [footerView addSubview:phoneLabel];
+        
+        UILabel * lineLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 30, kScreenWidth - 20, 0.5)];
+        lineLabel.backgroundColor = UIColorHex(#E6E6E6);
+        lineLabel.hidden = isStatus;
+        [footerView addSubview:lineLabel];
+    }
+    
+    UIButton * submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    submitBtn.backgroundColor = UIColorHex(#CD0302);
+    submitBtn.frame = CGRectMake(10, [nb_info isNotBlank]?40:20, kScreenWidth - 20, isStatus?0:40);
+    submitBtn.layer.cornerRadius = 20;
+    submitBtn.layer.masksToBounds = YES;
+    [submitBtn setTitle:[NSString stringWithFormat:@"立即缴费%@",priceString] forState:UIControlStateNormal];
+    submitBtn.titleLabel.font = [UIFont systemFontOfSize:16];
+    submitBtn.titleLabel.font = [UIFont boldSystemFontOfSize:16];
+    [submitBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [submitBtn addTarget:self action:@selector(submitRequestAction:) forControlEvents:UIControlEventTouchUpInside];
+    [footerView addSubview:submitBtn];
+    return footerView;
+}
+-(void)submitRequestAction:(UIButton *)button
+{
+    __weak typeof(self) weakSelf = self;
+    [CNLiveCommuntViewModel requestWithCommuntyPayCostDetailMentHousePropertyFeeId:self.detailModel.idStr CompleterBlock:^(NSString * _Nonnull orderId) {
+        [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:orderId price:weakSelf.detailModel.totalFee body:[weakSelf.detailModel.propertyName isNotBlank]?weakSelf.detailModel.propertyName:@"物业缴费" NotifyUrl:cn_API_CommuntyApi(@"/housePropertyFeeApi/housePropertyFeeOrderNotify")];
+    }];
+}
+#pragma mark =
+-(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 1;
+}
+-(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.dataArray.count;
+}
+-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [CNLiveCommuntPayCostDetailViewCell setTableView:tableView ParamDict:self.dataArray[indexPath.row]];
+}
+-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 60;
+}
+@end
@@ -198,7 +198,7 @@
             CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithSignUpModel:signUpModel activityId:handworkId];
             [weakSelf.navigationController pushViewController:resultVC animated:YES];
         }else{
-            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:[signUpModel.order.idStr isNotBlank]?signUpModel.order.idStr:@"" price:[NSString stringWithFormat:@"%.2f",(weakSelf.userArray.count * [weakSelf.detailModel.unitPrice floatValue])] body:[weakSelf.detailModel.name isNotBlank]?weakSelf.detailModel.name:@"网家家社区活动"];
+            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:[signUpModel.order.idStr isNotBlank]?signUpModel.order.idStr:@"" price:[NSString stringWithFormat:@"%.2f",(weakSelf.userArray.count * [weakSelf.detailModel.unitPrice floatValue])] body:[weakSelf.detailModel.name isNotBlank]?weakSelf.detailModel.name:@"网家家社区活动" NotifyUrl:cn_API_CommuntyApi(@"/signupApi/signupOrderNotify")];
             [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(payResultSuccessNNotification:) name:@"kIMAMSG_CommunityPaySuccessNotification" object:nil];
         }
     }];
@@ -382,7 +382,7 @@
             CGFloat height = [[subDict stringValueForKey:@"value" default:@""] calculateSizeWithUIWidth:kScreenWidth - 125 font:[UIFont systemFontOfSize:15.0]].height;
             return height > 30 ? height : 30;
         }
-        if (indexPath.section == 2) return 70;
+        if (indexPath.section == 1) return 70;
     }
     if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
         if (indexPath.section == 0) {
@@ -19,6 +19,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param activityId 活动id
 /// @param orderId 活动id
 - (instancetype)initWithActivityId:(NSString *)activityId OrderId:(NSString *)orderId Msg:(NSString *)msg;
+
+/// 初始化物业缴费结果界面
+/// @param isStatus 支付状态
+- (instancetype)initWithStatus:(BOOL)isStatus;
 @end
 NS_ASSUME_NONNULL_END
@@ -8,6 +8,7 @@
 #import "CNLiveCommuntyResultViewController.h"
+
 @interface CNLiveCommuntyResultViewController ()
 @property (nonatomic, strong) QMUIButton * statusButton;
 @property (nonatomic, strong) QMUIFillButton * descButton;
@@ -19,6 +20,8 @@
 @property (nonatomic, copy) NSString *orderId;
 @property (nonatomic, copy) NSString *msg;
 @property (nonatomic, assign) BOOL isSuccess;
+
+@property (nonatomic, assign) NSInteger status;//0报名结果界面 1物业缴费界面
 @end
 @implementation CNLiveCommuntyResultViewController
@@ -29,6 +32,7 @@
 {
     self = [super init];
     if (self) {
+        _status = 0;
         _activityId = activityId;
         _isSuccess = signUpModel != nil;
         _signUpModel = signUpModel;
@@ -44,6 +48,7 @@
 {
     self = [super init];
     if (self) {
+        _status = 0;
         _activityId = activityId;
         _orderId = orderId;
         _msg = msg;
@@ -52,6 +57,18 @@
     return self;
 }
+/// 初始化物业缴费结果界面
+/// @param isStatus 支付状态
+- (instancetype)initWithStatus:(BOOL)isStatus
+{
+    self = [super init];
+    if (self) {
+        _status = 1;
+        _isSuccess = isStatus;
+    }
+    return self;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -76,9 +93,29 @@
         make.width.mas_equalTo(200);
         make.height.mas_equalTo(40);
     }];
+    
+    if (self.status == 1) {
+        self.title  = self.isSuccess?@"缴费成功":@"缴费失败";
+        [self.statusButton setTitle:self.isSuccess?@"缴费成功":@"缴费失败" forState:UIControlStateNormal];
+        [self.descButton setTitle:@"返回" forState:UIControlStateNormal];
+        [self.descButton setTitle:@"返回" forState:UIControlStateHighlighted];
+        [self.descButton setTitle:@"返回" forState:UIControlStateSelected];
+        self.descButton.layer.cornerRadius = 20;
+        self.descButton.layer.masksToBounds = YES;
+        self.descButton.layer.borderColor = self.isSuccess?UIColorHex(#65C468).CGColor:UIColorHex(#FF8585).CGColor;
+        self.descButton.layer.borderWidth = 1;
+        self.descButton.fillColor = [UIColor whiteColor];
+        [self.descButton setTitleColor:self.isSuccess?UIColorHex(#65C468):UIColorHex(#FF8585) forState:UIControlStateNormal];
+        [self.descButton setTitleColor:self.isSuccess?UIColorHex(#65C468):UIColorHex(#FF8585) forState:UIControlStateHighlighted];
+        [self.descButton setTitleColor:self.isSuccess?UIColorHex(#65C468):UIColorHex(#FF8585) forState:UIControlStateSelected];
+    }
 }
 -(void)descAction:(UIButton *)button
 {
+    if ([button.titleLabel.text isEqualToString:@"返回"]) {
+        [self.navigationController popViewControllerAnimated:YES];
+        return;
+    }
     if (self.isSuccess) {
         CNLiveCommuntyResultListViewController * resultVC = [[CNLiveCommuntyResultListViewController alloc] initWithStyle:UITableViewStyleGrouped SignId:self.signUpModel.signsString OrderId:[self.signUpModel.orderId isNotBlank]?self.signUpModel.orderId:self.orderId handworkId:self.activityId];
         [self.navigationController pushViewController:resultVC animated:YES];
@@ -13,6 +13,7 @@ typedef enum : NSUInteger {
     CNLiveCommuntListShowTypeHome,//公益活动显示类型
     CNLiveCommuntListShowTypeRecord,//活动记录
     CNLiveCommuntListShowTypeRepair,//报修记录
+    CNLiveCommuntListShowTypePayCost,//缴费记录
 } CNLiveCommuntListShowType;
@@ -107,6 +108,16 @@ typedef enum : NSUInteger {
 /// @param completerBlock 返回结果
 +(void)requestWithCommuntyActivityDetailMentActivityId:(NSString *)activityId CompleterBlock:(void(^)(CNLiveCommuntyActivityDetailModel * detailModel))completerBlock;
+/// 获取缴费详情界面接口
+/// @param paycostId 活动id
+/// @param completerBlock 返回结果
++(void)requestWithCommuntyPayCostDetailMentPaycostId:(NSString *)paycostId CompleterBlock:(void(^)(CNLiveCommuntyActivityPaycostListModel * detailModel))completerBlock;
+
+/// 获取缴费支付的orderId
+/// @param housePropertyFeeId 物业费id
+/// @param completerBlock 返回结果
++(void)requestWithCommuntyPayCostDetailMentHousePropertyFeeId:(NSString *)housePropertyFeeId CompleterBlock:(void(^)(NSString * orderId))completerBlock;
+
 /// 获取成功界面查看详情界面
 /// @param orderId 订单id
 /// @param signId 报名id
@@ -25,6 +25,12 @@
 #define CNCCommuntListOrderContentURL   cn_API_CommuntyApi(@"/signupApi/userOrders")
 //获取保修记录列表数据
 #define CNCCommuntListRepairContentURL   cn_API_CommuntyApi(@"/repairApi/getUserOrders")
+//获取缴费记录列表数据
+#define CNCCommuntListPayCostContentURL   cn_API_CommuntyApi(@"/housePropertyFeeApi/listHousePropertyFee4Api")
+//获取缴费记录详情数据
+#define CNCCommuntListPayCostContentDetailURL   cn_API_CommuntyApi(@"/housePropertyFeeApi/housePropertyFeeById")
+//获取缴费数据
+#define CNCCommuntListPayCostPropertyDetailURL   cn_API_CommuntyApi(@"/housePropertyFeeApi/payHousePropertyFee")
 //获取获取维修项目数据
 #define CNCCommuntListMaintainContentURL   cn_API_CommuntyApi(@"/repairApi/getMaintains")
 //获取报修详情
@@ -190,6 +196,28 @@
             }];
         }];
     }
+    if (showType == CNLiveCommuntListShowTypePayCost) {
+        NSDictionary * paramDict = @{
+            @"sid":[CNUserInfoManager manager].userInfoModel.uid,
+            @"neighborhoodId":nbhdId,
+            @"page":[NSString stringWithFormat:@"%ld",page],
+            @"pageSize":@"10"
+        };
+        [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+        [CNLiveNetworking setupShowDataResult:NO];
+        [CNLiveNetworking setupShowResult:YES];
+        [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNCCommuntListPayCostContentURL Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+            [QMUITips hideAllTipsInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
+            [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject) {
+                if (responseObject && [[responseObject allKeys] containsObject:@"list"]) {
+                    NSMutableArray * tempArray = [CNLiveCommuntyActivityPaycostListModel mj_objectArrayWithKeyValuesArray:[responseObject arrayForKey:@"list"]];
+                    if (completerBlock) completerBlock(tempArray,[responseObject boolValueForKey:@"isLastPage" default:YES]);
+                }else{
+//                    if (completerBlock) completerBlock(@[],YES);
+                }
+            }];
+        }];
+    }
 }
 /// 获取维修项目
 /// @param nbhdId 小区id
@@ -615,6 +643,57 @@
         }];
     }];
 }
+
+/// 获取缴费详情界面接口
+/// @param paycostId 活动id
+/// @param completerBlock 返回结果
++(void)requestWithCommuntyPayCostDetailMentPaycostId:(NSString *)paycostId CompleterBlock:(void(^)(CNLiveCommuntyActivityPaycostListModel * detailModel))completerBlock
+{
+    NSDictionary * paramDict = @{
+        @"housePropertyFeeId":[paycostId isNotBlank]?paycostId:@""
+    };
+    [QMUITips showLoadingInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    [CNLiveNetworking setupShowResult:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNCCommuntListPayCostContentDetailURL Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        [QMUITips hideAllTipsInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
+        [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject) {
+            if (responseObject) {
+                CNLiveCommuntyActivityPaycostListModel * detailModel = [CNLiveCommuntyActivityPaycostListModel mj_objectWithKeyValues:responseObject];
+                if (completerBlock) completerBlock(detailModel);
+            }else{
+                if (completerBlock) completerBlock(nil);
+            }
+        }];
+    }];
+}
+/// 获取缴费支付的orderId
+/// @param housePropertyFeeId 物业费id
+/// @param completerBlock 返回结果
++(void)requestWithCommuntyPayCostDetailMentHousePropertyFeeId:(NSString *)housePropertyFeeId CompleterBlock:(void(^)(NSString * orderId))completerBlock
+{
+    NSDictionary * paramDict = @{
+        @"housePropertyFeeId":[housePropertyFeeId isNotBlank]?housePropertyFeeId:@"",
+        @"payUserid":[CNUserInfoManager manager].userInfoModel.uid,
+        @"type":@"1",
+    };
+    [QMUITips showLoadingInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    [CNLiveNetworking setupShowResult:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNCCommuntListPayCostPropertyDetailURL Param:paramDict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        [QMUITips hideAllTipsInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
+        [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject) {
+            if (responseObject) {
+                NSDictionary * order = [responseObject dictionaryForKey:@"order"];
+                if (completerBlock) completerBlock([order stringValueForKey:@"id" default:@""]);
+            }else{
+                if (completerBlock) completerBlock(nil);
+            }
+        }];
+    }];
+}
 #pragma mark =========== 对放回的结果进行提醒判断 ===========
 /// 获取时间戳
@@ -24,7 +24,7 @@
     [IQKeyboardManager sharedManager].enable = YES;
     [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
-    [CNUserInfoManager manager].userInfoModel.uid = @"10458139";//@"145680";//@"11174272";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
+    [CNUserInfoManager manager].userInfoModel.uid = @"10504761";//@"10458139";//@"145680";//@"11174272";//@"145680";//@"395098";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10537318";//@"10499533";//@"11973842";//@"1342671"
 //    [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
 //    [[NSUserDefaults standardUserDefaults] synchronize];
@@ -27,6 +27,7 @@
 #import "BHRouter.h"
 #import "CNLiveCommuntViewModel.h"
 #import "CNLiveCommuntSignUpView.h"
+#import "CNLiveCommuntListViewController.h"
 #import "CNLiveCommuntyResultListViewController.h"
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <CNLiveUserManagement/CNUserInfoManager.h>
@@ -114,6 +115,7 @@
 {
     if (indexPath.row == 0) {
         [[CNLiveCommuntyModule shareInstance] pushCommuntyHomeViewMethod];
+
     }
     if (indexPath.row == 1) {
         NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"kCNLiveCommuntyNBhdInfoIdentifier%@",[CNUserInfoManager manager].userInfoModel.uid]];
@@ -126,8 +128,10 @@
     if (indexPath.row == 2) {
 //        CNLiveCommuntActiviRepairViewController * repairView = [[CNLiveCommuntActiviRepairViewController alloc] init];
 //        [self.navigationController pushViewController:repairView animated:YES];
-        [BHRouter openURL:[NSURL URLWithString:@"com.cnlive.CNLiveNetAdd://jump.vc.beehive/CNLiveCommuntActiviRepairViewController.push"]];
+//        [BHRouter openURL:[NSURL URLWithString:@"com.cnlive.CNLiveNetAdd://jump.vc.beehive/CNLiveCommuntActiviRepairViewController.push"]];
+        CNLiveCommuntListViewController * listView = [[CNLiveCommuntListViewController alloc] initWithShowType:CNLiveCommuntListShowTypePayCost NBhdId:@"72"];//@"53"];
+        [self.navigationController pushViewController:listView animated:YES];
     }
     if (indexPath.row == 3) {
         NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"kCNLiveCommuntyNBhdInfoIdentifier%@",[CNUserInfoManager manager].userInfoModel.uid]];
@@ -23,7 +23,7 @@
 /// @param orderId 订单id
 /// @param price 价格
 /// @param body 支付名
--(void)pushMainProjectWithPayManagerWithOrderId:(NSString *)orderId price:(NSString *)price body:(NSString *)body
+-(void)pushMainProjectWithPayManagerWithOrderId:(NSString *)orderId price:(NSString *)price body:(NSString *)body NotifyUrl:(NSString *)notifyUrl
 {
     NSLog(@"调用支付相关参数 orderId=>%@ price=>%@ body=>%@",orderId,price,body);
 }
@@ -12,7 +12,7 @@
 int main(int argc, char * argv[])
 {
     @autoreleasepool {
-        [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveProductionAppStore];//CNLiveProductionAppStore//CNLiveDebugAppStore];
+        [CNLiveEnvironmentManager setAppType:CNLiveAppTypeUser environmentType:CNLiveDebugAppStore];//CNLiveProductionAppStore//CNLiveDebugAppStore];
         return UIApplicationMain(argc, argv, nil, NSStringFromClass([CNLIVEAppDelegate class]));
     }
 }