0.0.3

liushiyu
1 parent a9d90cd7
Showing 16 changed files with 171 additions and 96 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Assets/CNLiveCommuntyModule.bundle/c_communty_activity_cancel@2x.png
CNLiveCommuntyModule/Assets/CNLiveCommuntyModule.bundle/c_communty_activity_cancel@3x.png
CNLiveCommuntyModule/Classes/Core/CNLiveCommunitHeader.h
CNLiveCommuntyModule/Classes/Core/CNLiveCommuntyModule.m
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommuntyModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntActiviRecordViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntServiceViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyHomeListViewController.m
CNLiveCommuntyModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
Example/CNLiveCommuntyModule/CNLIVEAppDelegate.m
Example/CNLiveCommuntyModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommuntyModule'
-  s.version          = '0.0.2'
+  s.version          = '0.0.3'
   s.summary          = 'A short description of CNLiveCommuntyModule.'
 # This description is used to generate tags and improve search results.
@@ -58,7 +58,5 @@
-static NSString *const kCNLiveCommuntyNBhdIdIdentifier = @"kCNLiveCommuntyNBhdIdIdentifier";
-static NSString *const kCNLiveCommuntyNBhdNameIdentifier = @"kCNLiveCommuntyNBhdNameIdentifier";
-static NSString *const kCNLiveCommuntyNBhdPhoneIdentifier = @"kCNLiveCommuntyNBhdPhoneIdentifier";
+static NSString *const kCNLiveCommuntyNBhdInfoIdentifier = @"kCNLiveCommuntyNBhdInfoIdentifier";
 #endif /* CNLiveCommunitHeader_h */
@@ -36,9 +36,10 @@
 /// 跳转社区组件的主界面(如果已经选择过了就会直接进去,没有则需要进行重新选择)
 -(void)pushCommuntyHomeViewMethod
 {
-    NSString * nbhdId =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:kCNLiveCommuntyNBhdIdIdentifier];
-    if ([nbhdId isNotBlank]) {
-        CNLiveCommuntViewController * homeVC = [[CNLiveCommuntViewController alloc] initWithNBhdId:nbhdId];
+    NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
+    if ([nb_info isNotBlank]) {
+        CNLiveCommuntyHomeListModel * listModel = [CNLiveCommuntyHomeListModel mj_objectWithKeyValues:nb_info];
+        CNLiveCommuntViewController * homeVC = [[CNLiveCommuntViewController alloc] initWithNBhdId:listModel.idStr];
         homeVC.hidesBottomBarWhenPushed = YES;
         [[CNLiveCommuntTools cCommunt_currentViewController].navigationController pushViewController:homeVC animated:YES];
     }else{
@@ -81,7 +81,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**0未缴费 1已缴费*/
 @property (nonatomic, copy) NSString *paymentStatus;
 /**活动状态 0草稿 1活动已发布 2活动已取消*/
-@property (nonatomic, copy) NSString *status;
+@property (nonatomic, copy) NSString *handworkStatus;
 /**自己定义的  便于区分*/
 @property (nonatomic, copy) NSString *index;
 @property (nonatomic, copy) NSString *createUser;
@@ -126,8 +126,13 @@ MJCodingImplementation
             self.imgUrl = oldValue;
         }
     }
-    if ([oldValue isNotBlank] && [property.name isEqualToString:@"amount"]) {
-        oldValue = [NSString stringWithFormat:@"%.2f",[oldValue floatValue]/100];
+    if ([property.name isEqualToString:@"amount"]) {
+        oldValue = [NSString stringWithFormat:@"%@",oldValue];
+        if ([oldValue isEqualToString:@"0"]) {
+            oldValue = @"";
+        }else{
+            oldValue = [NSString stringWithFormat:@"%.2f",[oldValue floatValue]/100];
+        }
     }
     return oldValue;
 }
@@ -211,41 +211,93 @@
     [self.imgView sd_setImageWithURL:[NSURL URLWithString:recoredModel.imgUrl] placeholderImage:[UIImage imageWithColor:UIColorHex(#f9f9f9)]];
     self.dateLabel.text = recoredModel.createTimeString;
     self.nameLabel.text = recoredModel.handworkName;
-    self.descLabel.text = [NSString stringWithFormat:@"%@  %@",recoredModel.name,recoredModel.mobile];
-    self.priceLabel.text = [recoredModel.amount isNotBlank]?[NSString stringWithFormat:@"%@.00",recoredModel.amount]:@"";
+    self.descLabel.text = [NSString stringWithFormat:@"%@  %@",recoredModel.name,[recoredModel.mobile isNotBlank]?recoredModel.mobile:@""];
+    self.priceLabel.text = [recoredModel.amount isNotBlank]?[NSString stringWithFormat:@"%@",recoredModel.amount]:@"";
     if ([recoredModel.index isEqualToString:@"3"]) {
-        self.evalButton.layer.cornerRadius = 10;
-        self.evalButton.layer.masksToBounds = YES;
-        self.evalButton.layer.borderWidth = 1;
-        self.evalButton.layer.borderColor = UIColorHex(#FD862E).CGColor;
-        [self.evalButton setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithRed:253/255.0 green:134/255.0 blue:46/255.0 alpha:0.08]] forState:UIControlStateNormal];
-        self.evalButton.hidden = NO;
-        self.evalButton.userInteractionEnabled = YES;
+        if ([recoredModel.refundStatus isEqualToString:@"2"]) {//退费中
+            self.evalButton.hidden = NO;
+            self.evalButton.userInteractionEnabled = NO;
+            [self.evalButton setTitle:@"退款中" forState:UIControlStateNormal];
+            [self.evalButton setTitleColor:UIColorHex(#FD862E) forState:UIControlStateNormal];
+            [self.evalButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.bottom.right.mas_equalTo(self.mainView).offset(-10);
+                make.height.mas_equalTo(20);
+                make.width.mas_equalTo(90);
+            }];
+        }else{
+            if ([recoredModel.handworkStatus isEqualToString:@"2"]) {//活动已取消
+                self.evalButton.hidden = NO;
+                self.evalButton.userInteractionEnabled = NO;
+                [self.evalButton setTitle:nil forState:UIControlStateNormal];
+                [self.evalButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communty_activity_cancel"] forState:UIControlStateNormal];
+                self.evalButton.imageView.contentMode = UIViewContentModeScaleAspectFill;
+                __weak typeof(self) weakSelf = self;
+                [self.evalButton mas_updateConstraints:^(MASConstraintMaker *make) {
+                    make.bottom.mas_equalTo(weakSelf.mainView.mas_bottom);
+                    make.right.mas_equalTo(weakSelf.mainView.mas_right);
+                }];
+            }else{
+                self.evalButton.layer.cornerRadius = 10;
+                self.evalButton.layer.masksToBounds = YES;
+                self.evalButton.layer.borderWidth = 1;
+                self.evalButton.layer.borderColor = UIColorHex(#FD862E).CGColor;
+                [self.evalButton setBackgroundImage:[UIImage imageWithColor:[UIColor colorWithRed:253/255.0 green:134/255.0 blue:46/255.0 alpha:0.08]] forState:UIControlStateNormal];
+                self.evalButton.hidden = NO;
+                self.evalButton.userInteractionEnabled = YES;
+                [self.evalButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.bottom.right.mas_equalTo(self.mainView).offset(-10);
+                    make.height.mas_equalTo(20);
+                    make.width.mas_equalTo(90);
+                }];
+            }
+        }
     }else if ([recoredModel.index isEqualToString:@"4"]) {
         self.evalButton.hidden = NO;
         self.evalButton.userInteractionEnabled = NO;
         NSString * buttonName = @"";
         UIColor * color = UIColorHex(#0091FF);
-        if ([recoredModel.refundStatus isEqualToString:@"4"]) {
-            buttonName = @"退费失败";
+        if ([recoredModel.amount integerValue] == 0) {
+            buttonName = @"用户取消";
             color = UIColorHex(#FD862E);
+        }else{
+            buttonName = @"退款成功";
+            color = UIColorHex(#0091FF);
         }
         [self.evalButton setTitle:buttonName forState:UIControlStateNormal];
         [self.evalButton setTitleColor:color forState:UIControlStateNormal];
-    }else if ([recoredModel.index isEqualToString:@"0"]
-              || [recoredModel.index isEqualToString:@"1"]) {
-        if ([recoredModel.status isEqualToString:@"2"]) {
+        [self.evalButton mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.bottom.right.mas_equalTo(self.mainView).offset(-10);
+            make.height.mas_equalTo(20);
+            make.width.mas_equalTo(90);
+        }];
+    }else{
+        if ([recoredModel.refundStatus isEqualToString:@"2"]) {//退费中
             self.evalButton.hidden = NO;
             self.evalButton.userInteractionEnabled = NO;
-            [self.evalButton setTitle:@"活动已取消" forState:UIControlStateNormal];
+            [self.evalButton setTitle:@"退款中" forState:UIControlStateNormal];
             [self.evalButton setTitleColor:UIColorHex(#FD862E) forState:UIControlStateNormal];
+            [self.evalButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.bottom.right.mas_equalTo(self.mainView).offset(-10);
+                make.height.mas_equalTo(20);
+                make.width.mas_equalTo(90);
+            }];
         }else{
-            self.evalButton.userInteractionEnabled = NO;
-            self.evalButton.hidden = YES;
+            if ([recoredModel.handworkStatus isEqualToString:@"2"]) {//活动已取消
+                self.evalButton.hidden = NO;
+                self.evalButton.userInteractionEnabled = NO;
+                [self.evalButton setTitle:nil forState:UIControlStateNormal];
+                [self.evalButton setImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_communty_activity_cancel"] forState:UIControlStateNormal];
+                self.evalButton.imageView.contentMode = UIViewContentModeScaleAspectFill;
+                __weak typeof(self) weakSelf = self;
+                [self.evalButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                    make.bottom.mas_equalTo(weakSelf.mainView.mas_bottom);
+                    make.right.mas_equalTo(weakSelf.mainView.mas_right);
+                }];
+            }else{
+                self.evalButton.userInteractionEnabled = NO;
+                self.evalButton.hidden = YES;
+            }
         }
-    }else{
-        self.evalButton.userInteractionEnabled = NO;
-        self.evalButton.hidden = YES;
     }
 }
 -(void)evalContentButton:(UIButton *)button
@@ -282,11 +334,6 @@
         make.left.mas_equalTo(weakSelf.imgView.mas_right).offset(10);
         make.right.mas_equalTo(weakSelf.mainView.mas_right).offset(-10);
     }];
-    [self.evalButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.bottom.right.mas_equalTo(weakSelf.mainView).offset(-10);
-        make.height.mas_equalTo(20);
-        make.width.mas_equalTo([weakSelf.recoredModel.status isEqualToString:@"3"]?50:90);
-    }];
     [self.priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.mas_equalTo(weakSelf.mainView.mas_bottom).offset(-10);
         make.left.mas_equalTo(weakSelf.imgView.mas_right).offset(10);
@@ -89,7 +89,7 @@ static NSInteger const kCNLiveSectionTitleHeight = 44;//标题显示
 -(NSMutableArray<NSString *> *)titleArray
 {
     if (!_titleArray) {
-        _titleArray = @[@"未开始",@"进行中",@"已结束",@"待评价",@"退款"].mutableCopy;
+        _titleArray = @[@"未开始",@"进行中",@"已结束",@"待评价",@"已取消"].mutableCopy;
     }
     return _titleArray;
 }
@@ -61,10 +61,14 @@
     weakself
     [QMUITips showLoadingInView:self.view];
     self.dataArray = [[NSMutableArray alloc] init];
-    [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenForNBHdId:@"0" CompleterBlock:^(NSArray * _Nonnull dataArray) {
-        [QMUITips hideAllTipsInView:weakSelf.view];
-        [weakSelf.dataArray addObjectsFromArray:dataArray];
-    }];
+    NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
+    if ([nb_info isNotBlank]) {
+        CNLiveCommuntyHomeListModel * listModel = [CNLiveCommuntyHomeListModel mj_objectWithKeyValues:nb_info];
+        [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenForNBHdId:listModel.propertyId CompleterBlock:^(NSArray * _Nonnull dataArray) {
+            [QMUITips hideAllTipsInView:weakSelf.view];
+            [weakSelf.dataArray addObjectsFromArray:dataArray];
+        }];
+    }
 }
 -(void)initTableView
 {
@@ -103,42 +107,45 @@
 }
 -(UIView *)setTableViewFooterView
 {
-    NSString * phone = [[NSUserDefaults standardUserDefaults] objectForKey:kCNLiveCommuntyNBhdPhoneIdentifier];
+    NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
-    UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, [phone isNotBlank]?90:70)];
+    UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, [nb_info isNotBlank]?90:70)];
     footerView.backgroundColor = [UIColor whiteColor];
-    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 = ![phone isNotBlank];
-    phoneLabel.backgroundColor = [UIColor whiteColor];
-
-    NSString * string = [NSString stringWithFormat:@"您也可以拨打物业电话 %@",phone];
-    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:phone]
-                                          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:phone style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-            NSMutableString* str = [[NSMutableString alloc] initWithFormat:@"tel:%@",phone];
-            [[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);
-    [footerView addSubview:lineLabel];
+    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);
+        [footerView addSubview:lineLabel];
+    }
     UIButton * submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     submitBtn.backgroundColor = UIColorHex(#CD0302);
@@ -246,14 +253,25 @@
 {
     MJWeakSelf
     if (indexPath.row == 3) {
-        [CNLiveCommuntSubAlertTableView showAlertViewDataSource:self.dataArray isTime:NO CompleterBlock:^(NSString * _Nonnull idStr, NSString * _Nonnull content) {
-            CNLiveCommuntSubInputTableView * inpView = [tableView cellForRowAtIndexPath:indexPath];
-            inpView.moreButton.titleLabel.font = [UIFont systemFontOfSize:15];
-            inpView.moreButton.titleLabel.font = [UIFont boldSystemFontOfSize:15];
-            [inpView.moreButton setTitle:content forState:UIControlStateNormal];
-            [inpView.moreButton setTitleColor:UIColorHex(#333333) forState:UIControlStateNormal];
-            weakSelf.project = idStr;
-        }];
+        if (self.dataArray.count > 0) {
+            [CNLiveCommuntSubAlertTableView showAlertViewDataSource:self.dataArray isTime:NO CompleterBlock:^(NSString * _Nonnull idStr, NSString * _Nonnull content) {
+                CNLiveCommuntSubInputTableView * inpView = [tableView cellForRowAtIndexPath:indexPath];
+                inpView.moreButton.titleLabel.font = [UIFont systemFontOfSize:15];
+                inpView.moreButton.titleLabel.font = [UIFont boldSystemFontOfSize:15];
+                [inpView.moreButton setTitle:content forState:UIControlStateNormal];
+                [inpView.moreButton setTitleColor:UIColorHex(#333333) forState:UIControlStateNormal];
+                weakSelf.project = idStr;
+            }];
+        }else{
+            NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
+            if ([nb_info isNotBlank]) {
+                CNLiveCommuntyHomeListModel * listModel = [CNLiveCommuntyHomeListModel mj_objectWithKeyValues:nb_info];
+                [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenForNBHdId:listModel.propertyId CompleterBlock:^(NSArray * _Nonnull dataArray) {
+                    [QMUITips hideAllTipsInView:weakSelf.view];
+                    [weakSelf.dataArray addObjectsFromArray:dataArray];
+                }];
+            }
+        }
     }
     if (indexPath.row == 4) {
         [CNLiveCommuntViewModel requestWithCommuntyHomeMaintenForTimeInterval:7 CompleterBlock:^(NSArray * _Nonnull dataArray) {
@@ -128,9 +128,10 @@
     [searchBtn addTarget:self action:@selector(leftNavBtnAction) forControlEvents:UIControlEventTouchUpInside];
     self.leftNavBtns = @[searchBtn];
-    NSString * name = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:kCNLiveCommuntyNBhdNameIdentifier];
-    if (self.isShowLocation && [name isNotBlank]) {
-        DSNavButton * rightBtn = [[DSNavButton alloc] initWithImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_community_service_location"] imageSize:CGSizeMake(15, 15) title:name font:[UIFont systemFontOfSize:10] titleColor:UIColorHex(#333333) imagePosition:DSImagePositionLeft];
+    NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
+    if (self.isShowLocation && [nb_info isNotBlank]) {
+        CNLiveCommuntyHomeListModel * listModel = [CNLiveCommuntyHomeListModel mj_objectWithKeyValues:nb_info];
+        DSNavButton * rightBtn = [[DSNavButton alloc] initWithImage:[CNLiveCommuntTools cCommunt_setImageWithName:@"c_community_service_location"] imageSize:CGSizeMake(15, 15) title:listModel.name font:[UIFont systemFontOfSize:10] titleColor:UIColorHex(#333333) imagePosition:DSImagePositionLeft];
         rightBtn.size = CGSizeMake(80, self.topNavViewHeight - kStatusHeight);
         [rightBtn addTarget:self action:@selector(rightNavBtnAction) forControlEvents:UIControlEventTouchUpInside];
         self.rightNavBtns = @[rightBtn];
@@ -41,6 +41,8 @@
             weakSelf.detailModel = detailModel;
             [weakSelf addTopNavigationWithView];
             [weakSelf.tableView reloadData];
+        }else{
+            [[weakSelf displayViewController] dsPopViewControllerAnimated:YES];
         }
     }];
@@ -214,7 +216,11 @@
 #pragma mark =
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    return [self.detailModel.processDesc isNotBlank]?2:1;
+    if (self.detailModel) {
+        return [self.detailModel.processDesc isNotBlank]?2:1;
+    }
+    return 0;
+
 }
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
@@ -136,12 +136,7 @@
         }
         self.navigationController.viewControllers = tempArray01;
-        
-        [[NSUserDefaults standardUserDefaults] setObject:listModel.idStr forKey:kCNLiveCommuntyNBhdIdIdentifier];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        [[NSUserDefaults standardUserDefaults] setObject:listModel.name forKey:kCNLiveCommuntyNBhdNameIdentifier];
-        [[NSUserDefaults standardUserDefaults] synchronize];
-        [[NSUserDefaults standardUserDefaults] setObject:listModel.propertyPhone forKey:kCNLiveCommuntyNBhdPhoneIdentifier];
+        [[NSUserDefaults standardUserDefaults] setObject:[listModel mj_JSONString] forKey:[NSString stringWithFormat:@"%@%@",kCNLiveCommuntyNBhdInfoIdentifier,[CNUserInfoManager manager].userInfoModel.uid]];
         [[NSUserDefaults standardUserDefaults] synchronize];
         CNLiveCommuntViewController * homeView = [[CNLiveCommuntViewController alloc] initWithNBhdId:listModel.idStr];
         [self.navigationController pushViewController:homeView animated:YES];
@@ -78,11 +78,13 @@
         || [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
         NSString * name = @"";
         UIColor * titleColor = [UIColor whiteColor];
-        if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder && ![self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
+        if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
+            && ![self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
             name = @"咨询电话";
             titleColor = UIColorHex(#0091FF);
         }
-        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder || [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
+        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
+            || [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
             name = @"取消订单";
             titleColor = UIColorHex(#F5A623FF);
         }
@@ -23,7 +23,7 @@
     [IQKeyboardManager sharedManager].enable = YES;
     [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
-    [CNUserInfoManager manager].userInfoModel.uid = @"145680";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10458139";//@"10537318";//@"10499533";//@"11973842"
+    [CNUserInfoManager manager].userInfoModel.uid = @"395098";//@"145680";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10458139";//@"10537318";//@"10499533";//@"11973842"
 //    [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
 //    [[NSUserDefaults standardUserDefaults] synchronize];
@@ -22,6 +22,7 @@
 #import <JXCategoryView/JXCategoryView.h>
 #import <JXPagingView/JXPagerView.h>
 #import <Masonry/Masonry.h>
+#import <MJExtension/MJExtension.h>
 #import <YYText/YYText.h>
 #import "CNLiveCommuntViewModel.h"
 #import "CNLiveCommuntSignUpView.h"
@@ -114,8 +115,9 @@
         [[CNLiveCommuntyModule shareInstance] pushCommuntyHomeViewMethod];
     }
     if (indexPath.row == 1) {
-        NSString * nbhdId =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
-        CNLiveCommuntActiviRecordViewController * recordVC = [[CNLiveCommuntActiviRecordViewController alloc] initWithNBhdId:nbhdId];
+        NSString * nb_info =  (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:[NSString stringWithFormat:@"kCNLiveCommuntyNBhdInfoIdentifier%@",[CNUserInfoManager manager].userInfoModel.uid]];
+        NSDictionary * dict = [nb_info mj_JSONObject];
+        CNLiveCommuntActiviRecordViewController * recordVC = [[CNLiveCommuntActiviRecordViewController alloc] initWithNBhdId:[dict stringValueForKey:@"id" default:@""]];
         [self.navigationController pushViewController:recordVC animated:YES];
 //        [[NSUserDefaults standardUserDefaults] setObject:@"" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
 //        [[NSUserDefaults standardUserDefaults] synchronize];