0.0.2

liushiyu
1 parent 9b21aec0
Showing 25 changed files with 676 additions and 224 deletions
CNLiveCommunitModule.podspec
CNLiveCommunitModule/Classes/Core/CNLiveCommunitModuleProtocol.h
CNLiveCommunitModule/Classes/Core/CNLiveCommuntyModule.h
CNLiveCommunitModule/Classes/Core/CNLiveCommuntyModule.m
CNLiveCommunitModule/Classes/Model/CNLiveCommuntyHomeModel.h
CNLiveCommunitModule/Classes/Model/CNLiveCommuntyHomeModel.m
CNLiveCommunitModule/Classes/View/CNLiveCommuntSignUpView.h
CNLiveCommunitModule/Classes/View/CNLiveCommuntSignUpView.m
CNLiveCommunitModule/Classes/View/CNLiveCommuntSubView.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntEvaluaViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntInformViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntListViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntSignUpViewController.h
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntSignUpViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyOrderViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyResultListViewController.h
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyResultListViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyResultViewController.h
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyResultViewController.m
CNLiveCommunitModule/Classes/ViewController/CNLiveCommuntyUserEditViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCommunitModule'
-  s.version          = '0.0.1'
+  s.version          = '0.0.2'
   s.summary          = 'A short description of CNLiveCommunitModule.'
 # This description is used to generate tags and improve search results.
@@ -30,24 +30,24 @@ TODO: Add long description of the pod here.
   s.ios.deployment_target = '10.0'
-#  s.source_files = 'CNLiveCommunitModule/Classes/ViewController/*.{h,m}'
+  s.source_files = 'CNLiveCommunitModule/Classes/**/*.{h,m}'
   s.static_framework = true
-  s.subspec 'ViewController' do |ss|
-      ss.source_files = 'CNLiveCommunitModule/Classes/ViewController/*.{h,m}'
-  end
-  s.subspec 'ViewModel' do |ss|
-      ss.source_files = 'CNLiveCommunitModule/Classes/ViewModel/*.{h,m}'
-  end
-  s.subspec 'Core' do |ss|
-      ss.source_files = 'CNLiveCommunitModule/Classes/Core/*.{h,m}'
-  end
-  s.subspec 'View' do |ss|
-      ss.source_files = 'CNLiveCommunitModule/Classes/View/*.{h,m}'
-  end
-  s.subspec 'Model' do |ss|
-      ss.source_files = 'CNLiveCommunitModule/Classes/Model/*.{h,m}'
-  end
+#  s.subspec 'ViewController' do |ss|
+#      ss.source_files = 'CNLiveCommunitModule/Classes/ViewController/*.{h,m}'
+#  end
+#  s.subspec 'ViewModel' do |ss|
+#      ss.source_files = 'CNLiveCommunitModule/Classes/ViewModel/*.{h,m}'
+#  end
+#  s.subspec 'Core' do |ss|
+#      ss.source_files = 'CNLiveCommunitModule/Classes/Core/*.{h,m}'
+#  end
+#  s.subspec 'View' do |ss|
+#      ss.source_files = 'CNLiveCommunitModule/Classes/View/*.{h,m}'
+#  end
+#  s.subspec 'Model' do |ss|
+#      ss.source_files = 'CNLiveCommunitModule/Classes/Model/*.{h,m}'
+#  end
    s.resource_bundles = {
      'CNLiveCommunitModule' => ['CNLiveCommunitModule/Assets/*.bundle']
@@ -15,6 +15,10 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param webUrl url
 -(UIViewController *)pushWebViewWithMainProjectWithWebUrl:(NSString *)webUrl;
+/// 用主工程的webView打开
+/// @param webUrl url
+-(void)pushWebViewWithMainProjectWithParamDict:(NSDictionary *)paramDict;
+
 /// 调用工程中支付功能
 /// @param orderId 订单id
 /// @param price 价格
@@ -9,6 +9,8 @@
 #import "CNLiveCommunitModuleProtocol.h"
 NS_ASSUME_NONNULL_BEGIN
+static NSString *const kCNLiveHiddenModalViewWithQrNotification = @"kCNLiveHiddenModalViewWithQrNotification";
+
 @interface CNLiveCommuntyModule : NSObject
 @property (nonatomic, strong) id<CNLiveCommunitModuleProtocol> protocol;
@@ -22,6 +24,21 @@ NS_ASSUME_NONNULL_BEGIN
 /// @param paramDict 支付参数
 -(void)pushCommuntyPayResultWithParamDict:(NSDictionary *)paramDict;
+/// 跳转到报名界面
+/// @param activityId 支付参数
+-(void)pushCommuntySignUpWithActivityId:(NSString *)activityId;
+
+/// 跳转到活动记录界面
+/// @param nbhdId 小区id
+-(void)pushCommuntyRecordListWithNBhdId:(NSString *)nbhdId;
+
+/// 跳转到报修详情界面
+/// @param maintenId 报修id
+-(void)pushCommuntyRepairDetailWithMaintenId:(NSString *)maintenId;
+
+/// 跳转到报修编辑界面
+/// @param nbhdId 小区id
+-(void)pushCommuntyRepairEditWithNBhdId:(NSString *)nbhdId;
 @end
 NS_ASSUME_NONNULL_END
@@ -6,7 +6,12 @@
 //
 #import "CNLiveCommuntyModule.h"
-
+#import "CNLiveCommuntyHomeModel.h"
+#import "CNLiveCommuntActiviRecordViewController.h"
+#import "CNLiveCommuntyResultViewController.h"
+#import "CNLiveCommuntSignUpViewController.h"
+#import "CNLiveCommuntInformViewController.h"
+#import "CNLiveCommuntyOrderViewController.h"
 @implementation CNLiveCommuntyModule
 +(instancetype)shareInstance
@@ -44,6 +49,50 @@
 /// @param paramDict 支付参数
 -(void)pushCommuntyPayResultWithParamDict:(NSDictionary *)paramDict
 {
-    
+    //(0支付失败，1支付成功报名失败，2报名成功)
+    NSString * type = [paramDict stringValueForKey:@"text" default:@""];
+    NSString * orderId = [paramDict stringValueForKey:@"orderId" default:@""];
+    NSString * classId = [paramDict stringValueForKey:@"classId" default:@""];
+    if ([type isEqualToString:@"0"]) {
+        CNLiveCommuntyResultViewController * successVC = [[CNLiveCommuntyResultViewController alloc] initWithActivityId:@"" OrderId:@"" Msg:@""];
+        [[self displayViewController] dsPushViewController:successVC animated:YES];
+    }else if ([type isEqualToString:@"1"]) {
+        CNLiveCommuntyResultViewController * successVC = [[CNLiveCommuntyResultViewController alloc] initWithActivityId:@"" OrderId:@"" Msg:@"剩余名额不足，退款将原路退回"];
+        [[self displayViewController] dsPushViewController:successVC animated:YES];
+    }else{
+        CNLiveCommuntyResultViewController * successVC = [[CNLiveCommuntyResultViewController alloc] initWithActivityId:classId OrderId:orderId Msg:@""];
+        [[self displayViewController] dsPushViewController:successVC animated:YES];
+    }
+}
+
+/// 跳转到报名界面
+/// @param activityId 支付参数
+-(void)pushCommuntySignUpWithActivityId:(NSString *)activityId
+{
+    CNLiveCommuntSignUpViewController * signUpVC = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped ActivityId:activityId];
+    [[self displayViewController] dsPushViewController:signUpVC animated:YES];
+}
+
+/// 跳转到活动记录界面
+/// @param nbhdId 小区id
+-(void)pushCommuntyRecordListWithNBhdId:(NSString *)nbhdId
+{
+    CNLiveCommuntActiviRecordViewController * recordVC = [[CNLiveCommuntActiviRecordViewController alloc] initWithNBhdId:nbhdId];
+    [[self displayViewController] dsPushViewController:recordVC animated:YES];
+}
+/// 跳转到报修详情界面界面
+/// @param maintenId 报修id
+-(void)pushCommuntyRepairDetailWithMaintenId:(NSString *)maintenId
+{
+    CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:maintenId];
+    [[self displayViewController] dsPushViewController:orderVC animated:YES];
+}
+
+/// 跳转到报修编辑界面
+/// @param nbhdId 小区id
+-(void)pushCommuntyRepairEditWithNBhdId:(NSString *)nbhdId
+{
+    CNLiveCommuntInformViewController * informView = [[CNLiveCommuntInformViewController alloc] initWithNBhdId:nbhdId];
+    [[self displayViewController] dsPushViewController:informView animated:YES];
 }
 @end
@@ -65,6 +65,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveCommuntyActivityRecordListModel : NSObject
 @property (nonatomic, copy) NSString *name;
 @property (nonatomic, copy) NSString *handworkId;
+/**0未退费 1申请退费 2退费中 3退费成功 4退费失败*/
 @property (nonatomic, copy) NSString *refundStatus;
 @property (nonatomic, copy) NSString *refundApplyTime;
 @property (nonatomic, copy) NSString *mobile;
@@ -74,7 +75,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *gender;
 @property (nonatomic, copy) NSString *amount;
 @property (nonatomic, copy) NSString *age;
+/**0未缴费 1已缴费*/
 @property (nonatomic, copy) NSString *paymentStatus;
+/**自己定义 0未开始 1进行中 2已结束 3待评价 4退款*/
+@property (nonatomic, copy) NSString *status;
 @property (nonatomic, copy) NSString *createUser;
 @property (nonatomic, copy) NSString *handworkName;
 @property (nonatomic, copy) NSString *refundAmount;
@@ -207,19 +211,61 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 @interface CNLiveCommuntyActivitySignUpModel : NSObject
-@property (nonatomic, copy) NSString *status;
-@property (nonatomic, copy) NSString *refundableBalance;
+@property (nonatomic, copy) NSString * type;
+@property (nonatomic, copy) NSString * orderId;
+@property (nonatomic, copy) NSString * signsString;
+@property (nonatomic, strong) NSArray * signs;
+@end
+
+
+@interface CNLiveCommuntyActivityUserDetailModel : NSObject
+@property (nonatomic, copy) NSString *gender;
+@property (nonatomic, copy) NSString *age;
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *mobile;
+@end
+
+@interface CNLiveCommuntyActivityResultDetailModel : NSObject
+@property (nonatomic, copy) NSString *craftId;
+@property (nonatomic, strong) NSArray<CNLiveCommuntyActivityUserDetailModel *> *signupVoList;
+@property (nonatomic, strong) NSMutableArray *dataArray;
+@property (nonatomic, copy) NSString *neighborhoodId;
+@property (nonatomic, copy) NSString *summaryPic;
 @property (nonatomic, copy) NSString *idStr;
-@property (nonatomic, copy) NSString *transId;
-@property (nonatomic, strong) NSNumber *updateTime;
-@property (nonatomic, copy) NSString *updateTimeString;
-@property (nonatomic, copy) NSString *totalFee;
+@property (nonatomic, copy) NSString *processDesc;
+@property (nonatomic, copy) NSString *unitPrice;
+@property (nonatomic, copy) NSString *publicityPic;
+@property (nonatomic, copy) NSString *duration;
+@property (nonatomic, copy) NSString *name;
+@property (nonatomic, copy) NSString *mobile;
+@property (nonatomic, copy) NSString *desc;
+@property (nonatomic, copy) NSString *oid;
+@property (nonatomic, copy) NSString *craftName;
 @property (nonatomic, copy) NSString *updatorId;
-@property (nonatomic, copy) NSString *type;
-@property (nonatomic, copy) NSString *payType;
+@property (nonatomic, copy) NSString *feedbackList;
+@property (nonatomic, copy) NSString *creatorId;
+@property (nonatomic, copy) NSString *signupNum;
+@property (nonatomic, copy) NSString *summary;
+@property (nonatomic, copy) NSString *status;
+@property (nonatomic, copy) NSString *location;
+@property (nonatomic, copy) NSString *organizer;
+@property (nonatomic, copy) NSString *personLimit;
+
+@property (nonatomic, strong) NSNumber *signupEndTime;
+@property (nonatomic, strong) NSNumber *signupStartTime;
+@property (nonatomic, strong) NSNumber *endTime;
+@property (nonatomic, strong) NSNumber *startTime;
 @property (nonatomic, strong) NSNumber *createTime;
+@property (nonatomic, strong) NSNumber *updateTime;
+
+@property (nonatomic, copy) NSString *signupEndTimeString;
+@property (nonatomic, copy) NSString *signupStartTimeString;
+@property (nonatomic, copy) NSString *endTimeString;
+@property (nonatomic, copy) NSString *startTimeString;
 @property (nonatomic, copy) NSString *createTimeString;
+@property (nonatomic, copy) NSString *updateTimeString;
 @end
+
 NS_ASSUME_NONNULL_END
@@ -355,28 +355,149 @@ MJCodingImplementation
 @implementation CNLiveCommuntyActivitySignUpModel
 MJCodingImplementation
+- (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
+{
+    if (![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"signs"]) {
+        __block NSArray * array = (NSArray *)oldValue;
+        __block NSMutableString * signsMString = [[NSMutableString alloc] init];
+        [array enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            [signsMString appendFormat:@"%@",obj];
+            if (array.count != idx + 1) [signsMString appendString:@","];
+        }];
+        [signsMString substringToIndex:signsMString.length - 1];
+        self.signsString = signsMString;
+    }
+    return oldValue;
+}
+
+@end
+
+@implementation CNLiveCommuntyActivityUserDetailModel
+
+MJCodingImplementation
+
+@end
+
+@implementation CNLiveCommuntyActivityResultDetailModel
+
+MJCodingImplementation
 + (NSDictionary *)mj_replacedKeyFromPropertyName
 {
-    return @{@"idStr":@"id"};
+    return @{@"idStr":@"id",@"desc":@"description"};
 }
-- (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
++ (NSDictionary *)mj_objectClassInArray
 {
-    oldValue = [NSString stringWithFormat:@"%@",oldValue];
+    return @{@"signupVoList":@"CNLiveCommuntyActivityUserDetailModel"};
+}
+- (void)mj_didConvertToObjectWithKeyValues:(NSDictionary *)keyValues
+{
+    self.dataArray = [[NSMutableArray alloc] init];
+    NSMutableArray * tempArray = [[NSMutableArray alloc] init];
+    [keyValues enumerateKeysAndObjectsUsingBlock:^(id  _Nonnull key, id  _Nonnull obj, BOOL * _Nonnull stop) {
+        key = [NSString stringWithFormat:@"%@",key];
+        obj = [NSString stringWithFormat:@"%@",obj];
+        NSMutableDictionary * tempDict = [[NSMutableDictionary alloc] init];
+        if (![obj isKindOfClass:NSNull.class] && [obj isNotBlank] && [key isEqualToString:@"location"]) {
+            [tempDict addString:@"地      点" forKey:@"key"];
+            [tempDict addString:obj forKey:@"value"];
+            [tempArray addObject:tempDict];
+        }
+        if (![obj isKindOfClass:NSNull.class] && [obj isNotBlank] && [key isEqualToString:@"startTime"]) {
+            NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([obj doubleValue]/1000)];
+            NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+            [dateFormatter setDateFormat:@"yyyy年MM月dd日 HH:mm"];
+            [tempDict addString:@"时      间" forKey:@"key"];
+            [tempDict addString:[dateFormatter stringFromDate:detaildate] forKey:@"value"];
+            [tempArray addObject:tempDict];
+        }
+        if (![obj isKindOfClass:NSNull.class] && [obj isNotBlank] && [key isEqualToString:@"personLimit"]) {
+            [tempDict addString:@"人      数" forKey:@"key"];
+            [tempDict addString:obj forKey:@"value"];
+            [tempArray addObject:tempDict];
+        }
+        if (![obj isKindOfClass:NSNull.class] && [obj isNotBlank] && [key isEqualToString:@"duration"]) {
+            [tempDict addString:@"活动时长" forKey:@"key"];
+            [tempDict addString:[NSString stringWithFormat:@"%@小时左右",obj] forKey:@"value"];
+            [tempArray addObject:tempDict];
+        }
+    }];
-    if (![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"createTime"]) {
-        NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
-        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-        [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
-        self.createTimeString = [dateFormatter stringFromDate:detaildate];
+    NSMutableArray * tempArray01 = [[NSMutableArray alloc] init];
+    NSArray * voList = [keyValues arrayForKey:@"signupVoList"];
+    for (NSDictionary * dict in voList) {
+        
+        NSMutableDictionary * tempDict01 = [[NSMutableDictionary alloc] init];
+        NSString * age = [NSString stringWithFormat:@"%@",dict[@"age"]];
+        [tempDict01 addString:@"年      龄" forKey:@"key"];
+        [tempDict01 addString:age forKey:@"value"];
+        [tempArray01 addObject:tempDict01];
+        
+        NSMutableDictionary * tempDict02 = [[NSMutableDictionary alloc] init];
+        NSString * name = [NSString stringWithFormat:@"%@",dict[@"name"]];
+        [tempDict02 addString:@"姓      名" forKey:@"key"];
+        [tempDict02 addString:name forKey:@"value"];
+        [tempArray01 addObject:tempDict02];
+        
+        NSMutableDictionary * tempDict03 = [[NSMutableDictionary alloc] init];
+        NSString * gender = [NSString stringWithFormat:@"%@",[dict[@"gender"] boolValue]?@"男":@"女"];
+        [tempDict03 addString:@"性      别" forKey:@"key"];
+        [tempDict03 addString:gender forKey:@"value"];
+        [tempArray01 addObject:tempDict03];
+        
+        NSMutableDictionary * tempDict04 = [[NSMutableDictionary alloc] init];
+        NSString * mobile = [NSString stringWithFormat:@"%@",dict[@"mobile"]];
+        [tempDict04 addString:@"联系方式" forKey:@"key"];
+        [tempDict04 addString:mobile forKey:@"value"];
+        [tempArray01 addObject:tempDict04];
     }
-    if (![oldValue isEqualToString:@"<null>"] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"updateTime"]) {
-        NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
-        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-        [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
-        self.updateTimeString = [dateFormatter stringFromDate:detaildate];
+    [self.dataArray addObject:tempArray01];
+    [self.dataArray addObject:tempArray];
+}
+- (id)mj_newValueFromOldValue:(id)oldValue property:(MJProperty *)property
+{
+    if (![property.name isEqualToString:@"signupVoList"]) {
+        
+        oldValue = [NSString stringWithFormat:@"%@",oldValue];
+        if ([oldValue isEqualToString:@"<null>"] || [oldValue isEqualToString:@"(null)"]) oldValue = @"";
+        
+        if ([oldValue isNotBlank] && [property.name isEqualToString:@"signupEndTime"]) {
+            NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+            NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+            [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+            self.signupEndTimeString = [dateFormatter stringFromDate:detaildate];
+        }
+        if ([oldValue isNotBlank] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"signupStartTime"]) {
+            NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+            NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+            [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+            self.signupStartTimeString = [dateFormatter stringFromDate:detaildate];
+        }
+        if ([oldValue isNotBlank] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"endTime"]) {
+            NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+            NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+            [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+            self.endTimeString = [dateFormatter stringFromDate:detaildate];
+        }
+        if ([oldValue isNotBlank] && ![oldValue isKindOfClass:NSNull.class] && [property.name isEqualToString:@"startTime"]) {
+            NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+            NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+            [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+            self.startTimeString = [dateFormatter stringFromDate:detaildate];
+        }
+        if ([oldValue isNotBlank] && [property.name isEqualToString:@"createTime"]) {
+            NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+            NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+            [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+            self.createTimeString = [dateFormatter stringFromDate:detaildate];
+        }
+        if ([oldValue isNotBlank] && [property.name isEqualToString:@"updateTime"]) {
+            NSDate *detaildate = [NSDate dateWithTimeIntervalSince1970:([oldValue doubleValue]/1000)];
+            NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+            [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+            self.updateTimeString = [dateFormatter stringFromDate:detaildate];
+        }
     }
+    
     return oldValue;
 }
-
-
 @end
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 显示收款弹框
 /// @param price 价格
-+(void)showQrTipSuccessViewWithPrice:(NSString *)price PayUrl:(NSString *)payUrl;
++(QMUIModalPresentationViewController *)showQrTipSuccessViewWithPrice:(NSString *)price PayUrl:(NSString *)payUrl;
 /// 显示双选项弹框
 /// @param completerBlock 确认回调  
@@ -80,7 +80,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UILabel * nameLabel;
 @property (nonatomic, strong) UILabel * cententLabel;
-
 @property (nonatomic, strong) NSDictionary * paramDict;
 +(CNLiveCommuntSignUpOrderViewCell *)setTableView:(UITableView *)tableView Dict:(NSDictionary *)dict;
@@ -93,6 +92,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UIButton * qrButton;
 @property (nonatomic, strong) UIButton * payButton;
+@property (nonatomic, strong) QMUIModalPresentationViewController * modalView;
 @property (nonatomic, strong) CNLiveCommuntyActivityMaintainsCreateModel * createModel;
 @property (nonatomic, copy) void(^reloadBlock)(void);
@@ -72,7 +72,7 @@
 /// 显示收款弹框
 /// @param price 价格
-+(void)showQrTipSuccessViewWithPrice:(NSString *)price PayUrl:(NSString *)payUrl
++(QMUIModalPresentationViewController *)showQrTipSuccessViewWithPrice:(NSString *)price PayUrl:(NSString *)payUrl
 {
     UIView * tipView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth - 60, 300)];
     tipView.backgroundColor = [UIColor whiteColor];
@@ -107,6 +107,7 @@
     modalViewController.contentView = tipView;
     [modalViewController showWithAnimated:YES completion:nil];
+    return modalViewController;
 //    __weak typeof(modalViewController) weakModalViewController = modalViewController;
 //    [payButton addBlockForControlEvents:UIControlEventTouchUpInside block:^(id  _Nonnull sender) {
 //        [weakModalViewController hideWithAnimated:YES completion:NULL];
@@ -551,9 +552,18 @@
         [self.mainView addSubview:self.amoutField];
         [self.mainView addSubview:self.qrButton];
         [self.mainView addSubview:self.payButton];
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hiddenModalViewNotification:) name:kCNLiveHiddenModalViewWithQrNotification object:nil];
     }
     return self;
 }
+-(void)hiddenModalViewNotification:(NSNotification *)note
+{
+    __weak typeof(self) weakSelf = self;
+    [self.modalView hideWithAnimated:YES completion:^(BOOL finished) {
+        if (finished && weakSelf.reloadBlock) weakSelf.reloadBlock();
+    }];
+}
 -(void)setCreateModel:(CNLiveCommuntyActivityMaintainsCreateModel *)createModel
 {
     _createModel = createModel;
@@ -620,19 +630,19 @@
     __weak typeof(self) weakSelf = self;
     if ([self.createModel.totalFee isNotBlank]
         && [self.createModel.totalFee integerValue] > 0) {
-        [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:self.createModel.idStr totalFee:self.amoutField.text CompleterBlock:^(NSString * _Nonnull payUrl) {
+        NSString * p = [NSString stringWithFormat:@"%.0f",([self.amoutField.text floatValue]*100)];
+        [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:self.createModel.idStr totalFee:p CompleterBlock:^(NSString * _Nonnull payUrl) {
             NSString * p = [NSString stringWithFormat:@"%.2f",[self.amoutField.text floatValue]];
-            [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:p PayUrl:payUrl];
+            weakSelf.modalView = [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:p PayUrl:payUrl];
         }];
     }else{
         [CNLiveCommuntSignUpView showAlertViewWithMessage:@"请仔细核对金额，确认后将不可修改" CompleterBlock:^{
-            NSString * p = [NSString stringWithFormat:@"%.2f",([weakSelf.createModel.totalFee floatValue]/100)];
-            weakSelf.amoutField.text = p;
+            NSString * p = [NSString stringWithFormat:@"%.0f",([weakSelf.amoutField.text floatValue]*100)];
             weakSelf.amoutField.enabled = NO;
             weakSelf.amoutField.textColor = UIColorHex(#c8c8c8);
-            [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:weakSelf.createModel.idStr totalFee:weakSelf.amoutField.text CompleterBlock:^(NSString * _Nonnull payUrl) {
+            [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:weakSelf.createModel.idStr totalFee:p CompleterBlock:^(NSString * _Nonnull payUrl) {
                 NSString * p = [NSString stringWithFormat:@"%.2f",[self.amoutField.text floatValue]];
-                [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:p PayUrl:payUrl];
+                weakSelf.modalView = [CNLiveCommuntSignUpView showQrTipSuccessViewWithPrice:p PayUrl:payUrl];
             }];
         }];
     }
@@ -660,7 +670,15 @@
         [QMUITips showError:@"似乎与互联网断开连接" inView:[CNLiveCommuntTools cCommunt_currentViewController].view hideAfterDelay:2];
         return;
     }
-    [CNLiveCommuntViewModel requestWithCommuntyMaintenPayMentOrderId:self.createModel.idStr CompleterBlock:self.reloadBlock];
+    __weak typeof(self) weakSelf = self;
+    [CNLiveCommuntSignUpView showAlertViewWithMessage:@"请仔细核对金额，确认后将不可修改" CompleterBlock:^{
+        NSString * p = [NSString stringWithFormat:@"%.0f",([weakSelf.amoutField.text floatValue]*100)];
+        weakSelf.amoutField.enabled = NO;
+        weakSelf.amoutField.textColor = UIColorHex(#c8c8c8);
+        [CNLiveCommuntViewModel requestWithCommuntyTotalFeeOrderMentOrderId:weakSelf.createModel.idStr totalFee:p CompleterBlock:^(NSString * _Nonnull payUrl) {
+            [CNLiveCommuntViewModel requestWithCommuntyMaintenPayMentOrderId:weakSelf.createModel.idStr CompleterBlock:weakSelf.reloadBlock];
+        }];
+    }];
 }
 #pragma mark =
 - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
@@ -213,6 +213,42 @@
     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]:@"0.00";
+    if ([recoredModel.status 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:UIColorHex(#FFFD862E)] forState:UIControlStateNormal];
+        self.evalButton.hidden = NO;
+        self.evalButton.userInteractionEnabled = YES;
+    }else if ([recoredModel.status isEqualToString:@"4"]) {
+        self.evalButton.hidden = NO;
+        self.evalButton.userInteractionEnabled = NO;
+        NSString * buttonName = @"";
+        UIColor * color = UIColorHex(#0091FF);
+        if ([recoredModel.refundStatus isEqualToString:@"4"]) {
+            buttonName = @"退费失败";
+            color = UIColorHex(#FD862E);
+        }
+        [self.evalButton setTitle:buttonName forState:UIControlStateNormal];
+        [self.evalButton setTitleColor:color forState:UIControlStateNormal];
+    }else if ([recoredModel.status isEqualToString:@"0"]
+              || [recoredModel.status isEqualToString:@"1"]) {
+        self.evalButton.hidden = NO;
+        self.evalButton.userInteractionEnabled = NO;
+        [self.evalButton setTitle:@"活动已取消" forState:UIControlStateNormal];
+        [self.evalButton setTitleColor:UIColorHex(#FD862E) forState:UIControlStateNormal];
+    }else{
+        self.evalButton.userInteractionEnabled = NO;
+        self.evalButton.hidden = YES;
+    }
+}
+-(void)evalContentButton:(UIButton *)button
+{
+    if ([self.recoredModel.status isEqualToString:@"1"]) {
+        CNLiveCommuntEvaluaViewController * evaluaView = [[CNLiveCommuntEvaluaViewController alloc] initWithRecord:self.recoredModel];
+        [[self displayViewController].navigationController pushViewController:evaluaView animated:YES];
+    }
 }
 -(void)layoutSubviews
 {
@@ -244,7 +280,7 @@
     [self.evalButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.right.mas_equalTo(weakSelf.mainView).offset(-10);
         make.height.mas_equalTo(20);
-        make.width.mas_equalTo(50);
+        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);
@@ -332,11 +368,8 @@
         [_evalButton setTitleColor:UIColorHex(#FD862E) forState:UIControlStateNormal];
         _evalButton.titleLabel.font = [UIFont systemFontOfSize:13];
         _evalButton.titleLabel.font = [UIFont boldSystemFontOfSize:13];
-        _evalButton.layer.cornerRadius = 10;
-        _evalButton.layer.masksToBounds = YES;
-        _evalButton.layer.borderWidth = 1;
-        _evalButton.layer.borderColor = UIColorHex(#FD862E).CGColor;
-        [_evalButton setBackgroundImage:[UIImage imageWithColor:UIColorHex(#FFFD862E)] forState:UIControlStateNormal];
+        _evalButton.hidden = YES;
+        [_evalButton addTarget:self action:@selector(evalContentButton:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _evalButton;
 }
@@ -187,16 +187,22 @@
 }
 -(void)submiteAction:(UIButton *)button
 {
+    __weak typeof(self) weakSelf = self;
     if (self.imageArray.count == 0) {
-        //self.recordModel.idStr  self.recordModel.handworkId
-        [CNLiveCommuntViewModel requestWithCommuntyCommentsInfoWithContentId:@"52" handworkId:@"71" comment:self.evaluaView.text imgs:@"" isAnonymity:self.isAnonymity CompleterBlock:^{
-            
+        [CNLiveCommuntViewModel requestWithCommuntyCommentsInfoWithContentId:self.recordModel.idStr handworkId:self.recordModel.handworkId comment:self.evaluaView.text imgs:@"" isAnonymity:self.isAnonymity CompleterBlock:^{
+            [QMUITips showSucceed:@"评论成功" inView:weakSelf.view hideAfterDelay:1.5];
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [weakSelf.navigationController popViewControllerAnimated:YES];
+            });
         }];
     }else{
         __weak typeof(self) weakSelf = self;
         [self uploadImageWithCompleterBlock:^(NSString *imageUrl) {
             [CNLiveCommuntViewModel requestWithCommuntyCommentsInfoWithContentId:weakSelf.recordModel.idStr handworkId:weakSelf.recordModel.handworkId comment:weakSelf.evaluaView.text imgs:imageUrl isAnonymity:weakSelf.isAnonymity CompleterBlock:^{
-                
+                [QMUITips showSucceed:@"评论成功" inView:weakSelf.view hideAfterDelay:1.5];
+                dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                    [weakSelf.navigationController popViewControllerAnimated:YES];
+                });
             }];
         }];
     }
@@ -428,14 +434,16 @@
         [fileArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
             CNLiveUploadModel *model = fileArray[idx];
             if ([model.code isEqualToString:@"200"]) {
-                [picString appendString:@","];
                 [picString appendString:model.imageUrl];
+                if (fileArray.count != idx + 1) [picString appendString:@","];
             }else {
                 weakSelf.progressHud.hidden = YES;
                 weakSelf.progressHud = nil;
                 [QMUITips showError:model.info.error.localizedDescription inView:weakSelf.view hideAfterDelay:1.5f];
             }
         }];
+        weakSelf.progressHud.hidden = YES;
+        weakSelf.progressHud = nil;
         if (completerBlock) completerBlock(picString);
     } failure:^(NSMutableArray *errorArray, NSError *error) {
         weakSelf.progressHud.hidden = YES;
@@ -466,7 +474,8 @@
         _imageView.contentMode = UIViewContentModeScaleToFill;
         _imageView.layer.masksToBounds = YES;
         _imageView.layer.cornerRadius = 5;
-        _imageView.image = [UIImage imageWithColor:[UIColor cyanColor]];
+        _imageView.image = [UIImage imageWithColor:UIColorHex(#f9f9f9)];
+        [_imageView sd_setImageWithURL:[NSURL URLWithString:self.recordModel.imgUrl] placeholderImage:[UIImage imageWithColor:UIColorHex(#f9f9f9)]];
     }
     return _imageView;
 }
@@ -189,6 +189,13 @@
         if (createModel) {
             CNLiveCommuntyOrderViewController * vc = [[CNLiveCommuntyOrderViewController alloc] initWithShowType:CNLiveCommuntyOrderShowTypeListYetOrder CreateModel:createModel];
             [weakSelf.navigationController pushViewController:vc animated:YES];
+            
+#ifdef DEBUG
+            [[NSUserDefaults standardUserDefaults] setObject:createModel.idStr forKey:@"cmnt_id"];
+            [[NSUserDefaults standardUserDefaults] synchronize];
+#else
+#endif
+            
         }
     }];
 }
@@ -157,6 +157,7 @@
 {
     if (self.showType == CNLiveCommuntListShowTypeRecord) {
         CNLiveCommuntyActivityRecordListModel * recordModel = self.dataArray[indexPath.row];
+        recordModel.status = [NSString stringWithFormat:@"%ld",(long)self.index];
         return [CNLiveCommuntSubRecordTableView setTableView:tableView RecordModel:recordModel];
     }
     if (self.showType == CNLiveCommuntListShowTypeHome) {
@@ -180,7 +181,7 @@
     }
     if (self.showType == CNLiveCommuntListShowTypeRepair) {
         CNLiveCommuntyActivityRepairListModel * repairModel = self.dataArray[indexPath.row];
-        return [repairModel.status isEqualToString:@"3"]?110.0:70.0;
+        return [repairModel.status isEqualToString:@"3"] && [repairModel.totalFee integerValue] > 0?110.0:70.0;
     }
     return 0.001;
 }
@@ -200,18 +201,14 @@
             [self.navigationController pushViewController:orderView animated:YES];
         }
     }
-    if (self.showType == CNLiveCommuntListShowTypeRepair) {
-        NSLog(@"去活动详情");
+    if (self.showType == CNLiveCommuntListShowTypeRecord) {
+        CNLiveCommuntyActivityRecordListModel * repairModel = self.dataArray[indexPath.row];
+        [[CNLiveCommuntyModule shareInstance].protocol pushWebViewWithMainProjectWithParamDict:[repairModel mj_JSONObject]];
     }
     if (self.showType == CNLiveCommuntListShowTypeHome) {
-        NSLog(@"去详情页Web页");
-        MJWeakSelf
         CNLiveCommuntyActivityHomeListModel * listModel = self.dataArray[indexPath.row];
-        [CNLiveCommuntViewModel requestWithCommuntyActivityDetailMentActivityId:listModel.idStr CompleterBlock:^(CNLiveCommuntyActivityDetailModel * _Nonnull detailModel) {
-            NSDictionary * paramDict = @{@"id":detailModel.idStr,@"mobile":detailModel.mobile,@"unitPrice":detailModel.unitPrice,@"processDesc":detailModel.processDesc,@"name":detailModel.name};
-            CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped InfoDict:paramDict];
-            [weakSelf.navigationController pushViewController:signUpView animated:YES];
-        }];
+        CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped ActivityId:listModel.idStr];
+        [self.navigationController pushViewController:signUpView animated:YES];
     }
 }
@@ -11,10 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface CNLiveCommuntSignUpViewController : CNCommonTableViewController
-
 /// 打开该界面需要的参数
-/// @param infoDict 字典
-- (instancetype)initWithStyle:(UITableViewStyle)style InfoDict:(NSDictionary *)infoDict;
+/// @param activityId 字典
+- (instancetype)initWithStyle:(UITableViewStyle)style ActivityId:(NSString *)activityId;
 @end
@@ -8,17 +8,20 @@
 #import "CNLiveCommuntSignUpViewController.h"
 @interface CNLiveCommuntSignUpViewController ()<CNLiveCommuntSignUpUserViewDelegate>
+@property (nonatomic, strong) CNLiveCommuntyActivityDetailModel * detailModel;
 @property (nonatomic, strong) NSMutableArray * userArray;
-@property (nonatomic, strong) NSDictionary * infoDict;
+@property (nonatomic, copy) NSString * activityId;
 @end
 @implementation CNLiveCommuntSignUpViewController
-- (instancetype)initWithStyle:(UITableViewStyle)style InfoDict:(NSDictionary *)infoDict
+/// 打开该界面需要的参数
+/// @param activityId 字典
+- (instancetype)initWithStyle:(UITableViewStyle)style ActivityId:(NSString *)activityId
 {
     self = [super initWithStyle:style];
     if (self) {
-        _infoDict = infoDict;
+        _activityId = activityId;
     }
     return self;
 }
@@ -30,9 +33,19 @@
     self.title = @"报名";
     self.userArray = [[NSMutableArray alloc] init];
-    
-    NSString * mobile = [self.infoDict stringValueForKey:@"mobile" default:@""];
-    if ([mobile isNotBlank]) {
+    __weak typeof(self) weakSelf = self;
+    [CNLiveCommuntViewModel requestWithCommuntyActivityDetailMentActivityId:self.activityId CompleterBlock:^(CNLiveCommuntyActivityDetailModel * _Nonnull detailModel) {
+        if (detailModel) {
+            weakSelf.detailModel = detailModel;
+            [weakSelf addTopNavigationWithView];
+            [weakSelf.tableView reloadData];
+        }
+    }];
+
+}
+-(void)addTopNavigationWithView
+{
+    if ([self.detailModel.mobile isNotBlank]) {
         UIButton * submiteBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         submiteBtn.frame = CGRectMake(0, 0, 50, 14);
         [submiteBtn setTitle:@"咨询电话" forState:UIControlStateNormal];
@@ -45,10 +58,10 @@
 }
 -(void)rightBarButtonAction:(UIButton *)button
 {
-    NSString * mobile = [self.infoDict stringValueForKey:@"mobile" default:@""];
+    __weak typeof(self) weakSelf = self;
     UIAlertController * alert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
-    [alert addAction:[UIAlertAction actionWithTitle:mobile style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
-        NSMutableString* str = [[NSMutableString alloc] initWithFormat:@"tel:%@",mobile];
+    [alert addAction:[UIAlertAction actionWithTitle:self.detailModel.mobile style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        NSMutableString* str = [[NSMutableString alloc] initWithFormat:@"tel:%@",weakSelf.detailModel.mobile];
         [[UIApplication sharedApplication] openURL:[NSURL URLWithString:str] options:@{} completionHandler:NULL];
     }]];
     [alert addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:NULL]];
@@ -58,6 +71,7 @@
 {
     __weak typeof(self) weakSelf = self;
     CNLiveCommuntyUserListViewController * userVC = [[CNLiveCommuntyUserListViewController alloc] initWithStyle:UITableViewStyleGrouped CompleterBlock:^(NSArray * _Nonnull userArray) {
+        [weakSelf.userArray removeAllObjects];
         [weakSelf.userArray addObjectsFromArray:userArray];
         [weakSelf.tableView reloadData];
         [weakSelf setupWithBottemView:weakSelf.userArray.count];
@@ -89,7 +103,7 @@
         make.height.mas_equalTo(50);
     }];
-    float unitPrice = [[self.infoDict stringValueForKey:@"unitPrice" default:@"0"] floatValue];
+    float unitPrice = [self.detailModel.unitPrice floatValue];
     NSMutableAttributedString * str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"合计: ¥%.2f",(totalPrice * unitPrice)]];
     [str addAttribute:NSForegroundColorAttributeName value:UIColorHex(#222833) range:[str.string rangeOfString:@"合计: "]];
     [str addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:14] range:[str.string rangeOfString:@"合计: "]];
@@ -135,14 +149,14 @@
 -(void)payResultAction
 {
     __weak typeof(self) weakSelf = self;
-    [CNLiveCommuntViewModel requestWithCommuntySingUpOrderMentHandworkId:[self.infoDict stringValueForKey:@"id" default:@""] Ussers:self.userArray CompleterBlock:^(CNLiveCommuntyActivitySignUpModel * _Nonnull signUpModel) {
-        float unitPrice = [[weakSelf.infoDict stringValueForKey:@"unitPrice" default:@"0"] floatValue];
+    [CNLiveCommuntViewModel requestWithCommuntySingUpOrderMentHandworkId:self.detailModel.idStr Ussers:self.userArray CompleterBlock:^(CNLiveCommuntyActivitySignUpModel * _Nonnull signUpModel) {
+        float unitPrice = [weakSelf.detailModel.unitPrice floatValue];
         if (unitPrice == 0.00) {
-            CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithSignUpModel:signUpModel];
+            NSString * handworkId = weakSelf.detailModel.idStr;
+            CNLiveCommuntyResultViewController * resultVC = [[CNLiveCommuntyResultViewController alloc] initWithSignUpModel:signUpModel activityId:handworkId];
             [weakSelf.navigationController pushViewController:resultVC animated:YES];
         }else{
-            NSString * body = [weakSelf.infoDict stringValueForKey:@"name" default:@""];
-            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:signUpModel.idStr price:signUpModel.totalFee body:body];
+            [[CNLiveCommuntyModule shareInstance].protocol pushMainProjectWithPayManagerWithOrderId:signUpModel.orderId price:weakSelf.detailModel.unitPrice body:weakSelf.detailModel.name];
         }
     }];
 }
@@ -168,8 +182,7 @@
 #pragma mark =
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    NSString * desc = [self.infoDict stringValueForKey:@"processDesc" default:@""];
-    return [desc isNotBlank]?2:1;
+    return [self.detailModel.processDesc isNotBlank]?2:1;
 }
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
@@ -183,8 +196,7 @@
         userView.delegate = self;
         return userView;
     }else{
-        NSString * desc = [self.infoDict stringValueForKey:@"processDesc" default:@""];
-        return [CNLiveCommuntSignUpTextViewCell setTableView:tableView Desc:desc];
+        return [CNLiveCommuntSignUpTextViewCell setTableView:tableView Desc:self.detailModel.processDesc];
     }
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -11,6 +11,8 @@
 @property (nonatomic, strong) CNLiveCommuntyActivityMaintainsCreateModel * createMdoel;
 @property (nonatomic, assign) CNLiveCommuntyOrderShowType showType;
 @property (nonatomic, assign) BOOL isShowTopAndBottem;
+@property (nonatomic, strong) UIView * bottemView;
+@property (nonatomic, strong) UIButton * payButton;
 @property (nonatomic, copy) NSString *maintenId;
 @property (nonatomic, assign) BOOL isChat;
 @end
@@ -71,16 +73,16 @@
 }
 -(void)setupWithNaviView
 {
-    if ((self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
-        || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder)
-        && ![self.createMdoel.repairId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
+    if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder
+        || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
+        || [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
         NSString * name = @"";
         UIColor * titleColor = [UIColor whiteColor];
-        if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder) {
+        if (self.showType == CNLiveCommuntyOrderShowTypeListYetOrder && ![self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
             name = @"咨询电话";
             titleColor = UIColorHex(#0091FF);
         }
-        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) {
+        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder || [self.createMdoel.userId isEqualToString:[CNUserInfoManager manager].userInfoModel.uid]) {
             name = @"取消订单";
             titleColor = UIColorHex(#F5A623FF);
         }
@@ -92,6 +94,11 @@
         submiteBtn.titleLabel.font = [UIFont systemFontOfSize:14];
         [submiteBtn addTarget:self action:@selector(rightBarButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:submiteBtn];
+        if (self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
+            self.navigationItem.rightBarButtonItem = nil;
+        }
+    }else{
+        self.navigationItem.rightBarButtonItem = nil;
     }
 }
 -(void)setupWithBottemView
@@ -100,39 +107,56 @@
         || self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder
         || self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder) {
         __weak typeof(self) weakSelf = self;
-        UIView * bottemView = [[UIView alloc] init];
-        bottemView.backgroundColor = [UIColor whiteColor];
-        bottemView.hidden = self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder;
-        [self.view addSubview:bottemView];
-        [bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.bottom.mas_equalTo(weakSelf.view);
-            make.height.mas_equalTo(50);
-        }];
+        if (!self.bottemView) {
+            self.bottemView = [[UIView alloc] init];
+            self.bottemView.backgroundColor = [UIColor whiteColor];
+            self.bottemView.hidden = self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder;
+            [self.view addSubview:self.bottemView];
+            [self.bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.left.right.bottom.mas_equalTo(weakSelf.view);
+                make.height.mas_equalTo(50);
+            }];
+        }
         NSString * payString = @"";
         if (self.showType == CNLiveCommuntyOrderShowTypeChatYetOrder) payString = @"立即接单";
         if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder) payString = @"取消接单";
-        UIButton * payButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        [payButton setTitle:payString forState:UIControlStateNormal];
-        [payButton setTitle:payString forState:UIControlStateHighlighted];
-        [payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        [payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateHighlighted];
-        payButton.backgroundColor = UIColorHex(#CD0302);
-        payButton.layer.masksToBounds = YES;
-        payButton.layer.cornerRadius = 18;
-        payButton.titleLabel.font = [UIFont systemFontOfSize:16];
-        payButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
-        [payButton addTarget:self action:@selector(payResultAction:) forControlEvents:UIControlEventTouchUpInside];
-        [bottemView addSubview:payButton];
-        [payButton mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.centerY.mas_equalTo(bottemView);
-            make.right.mas_equalTo(bottemView.mas_right).offset(-10);
-            make.left.mas_equalTo(bottemView.mas_left).offset(10);
-            make.height.mas_equalTo(36);
-        }];
+        if (!self.payButton) {
+            self.payButton = [UIButton buttonWithType:UIButtonTypeCustom];
+            [self.payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+            [self.payButton setTitleColor:[UIColor whiteColor] forState:UIControlStateHighlighted];
+            self.payButton.backgroundColor = UIColorHex(#CD0302);
+            self.payButton.layer.masksToBounds = YES;
+            self.payButton.layer.cornerRadius = 18;
+            self.payButton.titleLabel.font = [UIFont systemFontOfSize:16];
+            self.payButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
+            [self.payButton addTarget:self action:@selector(payResultAction:) forControlEvents:UIControlEventTouchUpInside];
+            [self.bottemView addSubview:self.payButton];
+            [self.payButton mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.centerY.mas_equalTo(weakSelf.bottemView);
+                make.right.mas_equalTo(weakSelf.bottemView.mas_right).offset(-10);
+                make.left.mas_equalTo(weakSelf.bottemView.mas_left).offset(10);
+                make.height.mas_equalTo(36);
+            }];
+        }
+        [self.payButton setTitle:payString forState:UIControlStateNormal];
+        [self.payButton setTitle:payString forState:UIControlStateHighlighted];
+        
+        if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder && [self.createMdoel.totalFee isNotBlank] && [self.createMdoel.totalFee integerValue] > 0) {
+            self.payButton.hidden = self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder;
+            self.bottemView.hidden = self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder;
+            [self.bottemView removeAllSubviews];
+        }
+    }else{
+        if (self.bottemView && self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder) {
+            self.payButton.hidden = self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder;
+            self.bottemView.hidden = self.showType == CNLiveCommuntyOrderShowTypeChatCompletOrder;
+            [self.bottemView removeAllSubviews];
+        }
     }
 }
+
 -(void)rightBarButtonAction:(UIButton *)button
 {
     MJWeakSelf
@@ -199,6 +223,10 @@
         self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 60, 0);
     }
 }
+-(void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:kCNLiveHiddenModalViewWithQrNotification object:nil];
+}
 #pragma mark =
 #pragma mark - DZNEmptyDataSetSource Methods
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
@@ -14,7 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// 初始化查看详情界面
 /// @param style 显示样式
 /// @param signId id
-- (instancetype)initWithStyle:(UITableViewStyle)style SignId:(NSString *)signId;
+/// @param orderId 订单id
+/// @param handworkId 活动id
+- (instancetype)initWithStyle:(UITableViewStyle)style SignId:(NSString *)signId OrderId:(NSString *)orderId handworkId:(NSString *)handworkId;
 @end
@@ -8,17 +8,20 @@
 #import "CNLiveCommuntyResultListViewController.h"
 @interface CNLiveCommuntyResultListViewController ()<DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
-
+@property (nonatomic, strong) CNLiveCommuntyActivityResultDetailModel * detailModel;
 @property (nonatomic, copy) NSString * signId;
-
+@property (nonatomic, copy) NSString * orderId;
+@property (nonatomic, copy) NSString * handworkId;
 @end
 @implementation CNLiveCommuntyResultListViewController
-- (instancetype)initWithStyle:(UITableViewStyle)style SignId:(NSString *)signId
+- (instancetype)initWithStyle:(UITableViewStyle)style SignId:(NSString *)signId OrderId:(NSString *)orderId handworkId:(nonnull NSString *)handworkId
 {
     self = [super initWithStyle:style];
     if (self) {
+        _handworkId = handworkId;
+        _orderId = orderId;
         _signId = signId;
     }
     return self;
@@ -30,36 +33,43 @@
     self.view.backgroundColor = [UIColor whiteColor];
     self.title = @"报名成功";
-    [self setupWithBottemView];
+
+    __weak typeof(self) weakSelf = self;
+    [CNLiveCommuntViewModel requestWithCommuntyActivityResultDetailMentOrderId:self.orderId SignId:self.signId handworkId:self.handworkId CompleterBlock:^(CNLiveCommuntyActivityResultDetailModel * _Nonnull detailModel) {
+        weakSelf.detailModel = detailModel;
+        [weakSelf setupWithBottemView];
+        [weakSelf.tableView reloadData];
+    }];
 }
 -(void)setupWithBottemView
 {
-    __weak typeof(self) weakSelf = self;
-    UIView * bottemView = [[UIView alloc] init];
-    bottemView.backgroundColor = [UIColor whiteColor];
-    [self.view addSubview:bottemView];
-    [bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.bottom.mas_equalTo(weakSelf.view);
-        make.height.mas_equalTo(50);
-    }];
-    
-    NSMutableAttributedString * str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"合计: 400元"]];
-    [str addAttribute:NSForegroundColorAttributeName value:UIColorHex(#222833) range:[str.string rangeOfString:@"合计: "]];
-    [str addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:14] range:[str.string rangeOfString:@"合计: "]];
-    [str addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:14] range:[str.string rangeOfString:@"合计: "]];
-    [str addAttribute:NSForegroundColorAttributeName value:UIColorHex(#DF0D23) range:[str.string rangeOfString:@"¥"]];
-    [str addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:9] range:[str.string rangeOfString:@"¥"]];
-    
-    UILabel * priceLabel = [[UILabel alloc] init];
-    priceLabel.textColor = UIColorHex(#DF0D23);
-    priceLabel.font = [UIFont boldSystemFontOfSize:16];
-    priceLabel.attributedText = str;
-    [bottemView addSubview:priceLabel];
-    [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.mas_equalTo(bottemView);
-        make.right.mas_equalTo(bottemView.mas_right).offset(-10);
-    }];
-    
+    if ([self.detailModel.unitPrice isNotBlank] && [self.detailModel.unitPrice floatValue] > 0) {
+        __weak typeof(self) weakSelf = self;
+        UIView * bottemView = [[UIView alloc] init];
+        bottemView.backgroundColor = [UIColor whiteColor];
+        [self.view addSubview:bottemView];
+        [bottemView mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.bottom.mas_equalTo(weakSelf.view);
+            make.height.mas_equalTo(50);
+        }];
+        
+        NSMutableAttributedString * str = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"合计: %.2f元",(self.detailModel.signupVoList.count * [self.detailModel.unitPrice floatValue])/2]];
+        [str addAttribute:NSForegroundColorAttributeName value:UIColorHex(#222833) range:[str.string rangeOfString:@"合计: "]];
+        [str addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:14] range:[str.string rangeOfString:@"合计: "]];
+        [str addAttribute:NSFontAttributeName value:[UIFont boldSystemFontOfSize:14] range:[str.string rangeOfString:@"合计: "]];
+        [str addAttribute:NSForegroundColorAttributeName value:UIColorHex(#DF0D23) range:[str.string rangeOfString:@"¥"]];
+        [str addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:9] range:[str.string rangeOfString:@"¥"]];
+        
+        UILabel * priceLabel = [[UILabel alloc] init];
+        priceLabel.textColor = UIColorHex(#DF0D23);
+        priceLabel.font = [UIFont boldSystemFontOfSize:16];
+        priceLabel.attributedText = str;
+        [bottemView addSubview:priceLabel];
+        [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerY.mas_equalTo(bottemView);
+            make.right.mas_equalTo(bottemView.mas_right).offset(-10);
+        }];
+    }
 }
 - (void)initTableView
 {
@@ -110,17 +120,18 @@
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
-    return 1;
+    return self.detailModel.dataArray.count;
 }
 -(NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
 {
-    return 3;
+    return [self.detailModel.dataArray[section] count];
 }
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    return [CNLiveCommuntSignUpOrderViewCell setTableView:tableView Dict:@{}];
+    NSDictionary * dic = self.detailModel.dataArray[indexPath.section][indexPath.row];
+    return [CNLiveCommuntSignUpOrderViewCell setTableView:tableView Dict:dic];
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
@@ -154,24 +165,24 @@
     nameLabel.numberOfLines = 1;
     nameLabel.font = [UIFont systemFontOfSize:15];
     nameLabel.font = [UIFont boldSystemFontOfSize:15];
-    nameLabel.text = [NSString stringWithFormat:@"参与人%ld",section+1];
+    nameLabel.text = (self.detailModel.dataArray.count - 1 == section) ? @"活动信息" : [NSString stringWithFormat:@"参与人%ld",section+1];
     [view addSubview:nameLabel];
     [nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(view);
         make.left.mas_equalTo(view.mas_left).offset(20);
     }];
-    UILabel * priceLabel = [[UILabel alloc] init];
-    priceLabel.textColor = UIColorHex(#DF0D23);
-    priceLabel.font = [UIFont boldSystemFontOfSize:16];
-    priceLabel.text = @"200元";
-    [view addSubview:priceLabel];
-    [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.mas_equalTo(view);
-        make.right.mas_equalTo(view.mas_right).offset(-20);
-    }];
-    
-    
+    if (self.detailModel.dataArray.count-1 != section && [self.detailModel.unitPrice isNotBlank] && [self.detailModel.unitPrice integerValue] > 0) {
+        UILabel * priceLabel = [[UILabel alloc] init];
+        priceLabel.textColor = UIColorHex(#DF0D23);
+        priceLabel.font = [UIFont boldSystemFontOfSize:16];
+        priceLabel.text = [NSString stringWithFormat:@"%lu元",[self.detailModel.unitPrice integerValue]*100*self.detailModel.signupVoList.count];
+        [view addSubview:priceLabel];
+        [priceLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerY.mas_equalTo(view);
+            make.right.mas_equalTo(view.mas_right).offset(-20);
+        }];
+    }
     return view;
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
@@ -13,7 +13,12 @@ NS_ASSUME_NONNULL_BEGIN
 /// 初始化界面显示
 /// @param signUpModel 报名model
-- (instancetype)initWithSignUpModel:(CNLiveCommuntyActivitySignUpModel *)signUpModel;
+- (instancetype)initWithSignUpModel:(CNLiveCommuntyActivitySignUpModel *)signUpModel activityId:(NSString *)activityId;
+
+/// 初始化界面显示
+/// @param activityId 活动id
+/// @param orderId 活动id
+- (instancetype)initWithActivityId:(NSString *)activityId OrderId:(NSString *)orderId Msg:(NSString *)msg;
 @end
 NS_ASSUME_NONNULL_END
@@ -10,9 +10,13 @@
 @interface CNLiveCommuntyResultViewController ()
 @property (nonatomic, strong) QMUIButton * statusButton;
 @property (nonatomic, strong) QMUIFillButton * descButton;
+@property (nonatomic, strong) UILabel * nameLabel;
 @property (nonatomic, strong) CNLiveCommuntyActivitySignUpModel *signUpModel;
+@property (nonatomic, copy) NSString *activityId;
+@property (nonatomic, copy) NSString *orderId;
+@property (nonatomic, copy) NSString *msg;
 @property (nonatomic, assign) BOOL isSuccess;
 @end
@@ -20,16 +24,33 @@
 /// 初始化界面显示
 /// @param signUpModel 报名model
-- (instancetype)initWithSignUpModel:(CNLiveCommuntyActivitySignUpModel *)signUpModel
+- (instancetype)initWithSignUpModel:(CNLiveCommuntyActivitySignUpModel *)signUpModel activityId:(nonnull NSString *)activityId
 {
     self = [super init];
     if (self) {
+        _activityId = activityId;
         _isSuccess = signUpModel != nil;
         _signUpModel = signUpModel;
     }
     return self;
 }
+/// 初始化界面显示
+/// @param activityId 活动id
+/// @param orderId 活动id
+/// @param msg 失败描述
+- (instancetype)initWithActivityId:(NSString *)activityId OrderId:(NSString *)orderId Msg:(NSString *)msg
+{
+    self = [super init];
+    if (self) {
+        _activityId = activityId;
+        _orderId = orderId;
+        _msg = msg;
+        _isSuccess = [orderId isNotBlank];
+    }
+    return self;
+}
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -37,15 +58,20 @@
     self.title  = self.isSuccess?@"支付成功":@"支付失败";
     [self.view addSubview:self.statusButton];
+    [self.view addSubview:self.nameLabel];
     [self.view addSubview:self.descButton];
     __weak typeof(self) weakSelf = self;
     [self.statusButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(weakSelf.view);
         make.top.mas_equalTo(weakSelf.view).offset(150);
     }];
+    [self.nameLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(weakSelf.view);
+        make.top.mas_equalTo(weakSelf.statusButton.mas_bottom).offset(20);
+    }];
     [self.descButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(weakSelf.view);
-        make.top.mas_equalTo(weakSelf.statusButton.mas_bottom).offset(30);
+        make.top.mas_equalTo(weakSelf.statusButton.mas_bottom).offset(40);
         make.width.mas_equalTo(200);
         make.height.mas_equalTo(40);
     }];
@@ -53,7 +79,7 @@
 -(void)descAction:(UIButton *)button
 {
     if (self.isSuccess) {
-        CNLiveCommuntyResultListViewController * resultVC = [[CNLiveCommuntyResultListViewController alloc] initWithStyle:UITableViewStyleGrouped SignId:@""];
+        CNLiveCommuntyResultListViewController * resultVC = [[CNLiveCommuntyResultListViewController alloc] initWithStyle:UITableViewStyleGrouped SignId:self.signUpModel.signsString OrderId:self.signUpModel.orderId handworkId:self.activityId];
         [self.navigationController pushViewController:resultVC animated:YES];
     }else{
         [self.navigationController popViewControllerAnimated:YES];
@@ -94,4 +120,19 @@
     }
     return _descButton;
 }
+-(UILabel *)nameLabel
+{
+    if (!_nameLabel) {
+        _nameLabel = [[UILabel alloc] init];
+        _nameLabel.textColor = UIColorHex(#999999);
+        _nameLabel.lineBreakMode = NSLineBreakByTruncatingTail;
+        _nameLabel.numberOfLines = 1;
+        _nameLabel.backgroundColor = UIColorHex(#F9F9F9);
+        _nameLabel.textAlignment = NSTextAlignmentCenter;
+        _nameLabel.font = [UIFont systemFontOfSize:13];
+        _nameLabel.text = self.msg;
+        _nameLabel.hidden = ![self.msg isNotBlank];
+    }
+    return _nameLabel;
+}
 @end
@@ -123,7 +123,7 @@
         return;
     }
     __weak typeof(self) weakSelf = self;
-    [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:paramDict isSave:YES CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
+    [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:paramDict isSave:YES isNew:YES CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
         [weakSelf.navigationController popViewControllerAnimated:YES];
     }];
 }
@@ -19,7 +19,7 @@
 {
     [super viewDidAppear:animated];
     __weak typeof(self) weakSelf = self;
-    [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:@{} isSave:NO CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
+    [CNLiveCommuntViewModel requestWithCommuntySaveInfoUsersMentUserDict:@{} isSave:NO isNew:NO CompleterBlock:^(NSArray * _Nonnull userArray, BOOL isSave) {
         weakSelf.userArray = [[NSMutableArray alloc] initWithArray:userArray];
         [weakSelf.tableView reloadData];
         [weakSelf setupWithBottemView:weakSelf.userArray.count > 0];
@@ -115,6 +115,11 @@
     self.tableView.frame = CGRectMake(0, kNavigationBarHeight, kScreenWidth, kScreenHeight - kNavigationBarHeight);
     self.tableView.contentInset = UIEdgeInsetsMake(10, 0, 60, 0);
 }
+
+/// 跳转删除人员
+/// @param subDict 显示信息
+-(void)setCommuntPushAddWithDelectUserViewController:(NSDictionary *)subDict{}
+
 /// 跳转到编辑或添加人员界面
 /// @param subDict 显示信息
 -(void)setCommuntPushAddWithEditUserViewController:(NSDictionary *)subDict
@@ -89,8 +89,9 @@ typedef enum : NSUInteger {
 /// 对用户信息进行存读取操作
 /// @param userDict 用户信息
 /// @param isSave 读&存
+/// @param isNew 是不是新数据
 /// @param completerBlock 返回结果
-+(void)requestWithCommuntySaveInfoUsersMentUserDict:(NSDictionary *)userDict isSave:(BOOL)isSave CompleterBlock:(void(^)(NSArray * userArray, BOOL isSave))completerBlock;
++(void)requestWithCommuntySaveInfoUsersMentUserDict:(NSDictionary *)userDict isSave:(BOOL)isSave isNew:(BOOL)isNew CompleterBlock:(void(^)(NSArray * userArray, BOOL isSave))completerBlock;
 /// 对活动进行评论id
 /// @param contentId 订单Id
@@ -106,6 +107,13 @@ typedef enum : NSUInteger {
 /// @param completerBlock 返回结果
 +(void)requestWithCommuntyActivityDetailMentActivityId:(NSString *)activityId CompleterBlock:(void(^)(CNLiveCommuntyActivityDetailModel * detailModel))completerBlock;
+/// 获取成功界面查看详情界面
+/// @param orderId 订单id
+/// @param signId 报名id
+/// @param handworkId 活动id
+/// @param completerBlock 返回结果
++(void)requestWithCommuntyActivityResultDetailMentOrderId:(NSString *)orderId SignId:(NSString *)signId handworkId:(NSString *)handworkId CompleterBlock:(void(^)(CNLiveCommuntyActivityResultDetailModel * detailModel))completerBlock;
+
 @end
 NS_ASSUME_NONNULL_END
@@ -43,6 +43,8 @@
 #define CNCCommuntPayMentActivityCommentsOrderContentURL   cn_API_CommuntyApi(@"/feedbackApi/add")
 //活动详情
 #define CNCCommuntPayMentActivityDetailOrderContentURL   cn_API_CommuntyApi(@"/handworkApi/handworkById")
+//查看详情
+#define CNCCommuntPayMentActivityResultOrderContentURL   cn_API_CommuntyApi(@"/signupApi/userSignupInfo")
 @implementation CNLiveCommuntViewModel
 /// 读取小区APP首页
@@ -304,7 +306,7 @@
     [CNLiveNetworking setupShowResult:YES];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNCCommuntPayMentDetailContentURL 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) {
+        [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:NO CompleterBlock:^(id responseObject) {
             if (responseObject && completerBlock) completerBlock();
         }];
     }];
@@ -361,7 +363,7 @@
 {
     NSDictionary * paramDict = @{
         @"id":orderId,
-        @"totalFee":[NSString stringWithFormat:@"%.0f",[totalFee floatValue] * 100],
+        @"totalFee":totalFee//[NSString stringWithFormat:@"%.0f",[totalFee floatValue] * 100],
     };
     [QMUITips showLoadingInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
@@ -377,7 +379,7 @@
                     @"sp_id":AppId,
                     @"out_trade_no":orderId,
                     @"body":[responseObject stringValueForKey:@"repairName" default:@"服务"],
-                    @"total_fee":[NSString stringWithFormat:@"%.0f",[totalFee floatValue] * 100],
+                    @"total_fee":totalFee,//[NSString stringWithFormat:@"%.0f",[totalFee floatValue] * 100],
                     @"user_id":[CNUserInfoManager manager].userInfoModel.uid,
                     @"notify_url":CNCCommuntPayMentRepairOrderContentURL,
                     @"ver":[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"],
@@ -412,7 +414,6 @@
         [QMUITips hideAllTipsInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
         [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:YES CompleterBlock:^(id responseObject) {
             if (responseObject) {
-                NSLog(@"%@",[responseObject mj_JSONString]);
                 CNLiveCommuntyActivitySignUpModel * signUpModel = [CNLiveCommuntyActivitySignUpModel mj_objectWithKeyValues:responseObject];
                 if (completerBlock) completerBlock(signUpModel);
             }else{
@@ -425,34 +426,39 @@
 /// 对用户信息进行存读取操作
 /// @param userDict 用户信息
 /// @param isSave 读&存
+/// @param isNew 是不是新数据
 /// @param completerBlock 返回结果
-+(void)requestWithCommuntySaveInfoUsersMentUserDict:(NSDictionary *)userDict isSave:(BOOL)isSave CompleterBlock:(void(^)(NSArray * userArray, BOOL isSave))completerBlock
++(void)requestWithCommuntySaveInfoUsersMentUserDict:(NSDictionary *)userDict isSave:(BOOL)isSave isNew:(BOOL)isNew CompleterBlock:(void(^)(NSArray * userArray, BOOL isSave))completerBlock
 {
     NSString * cacheKey = [NSString stringWithFormat:@"%@/kCNLiveCommuntySaveInfoUsersMentKey04",[CNUserInfoManager manager].userInfoModel.uid];
     if (isSave) {
         if ([userDict allKeys].count > 0 && [userDict allValues].count > 0) {
             NSString * save_string = [NSString stringWithFormat:@"%@",[CNLiveRespCacheManager objectCacheWithFileName:cacheKey]];
             NSMutableArray * tempArray = [[NSMutableArray alloc] initWithArray:[save_string mj_JSONObject]];
-            BOOL isReplace = YES;
-            NSString * i_nameString = [userDict stringValueForKey:@"name" default:@""];
-            NSString * i_sexString = [userDict stringValueForKey:@"gender" default:@""];
-            NSString * i_ageString = [userDict stringValueForKey:@"age" default:@""];
-            NSString * i_mobileString = [userDict stringValueForKey:@"mobile" default:@""];
-            for (NSDictionary * subDict in tempArray) {
-                NSString * o_nameString = [subDict stringValueForKey:@"name" default:@""];
-                NSString * o_sexString = [subDict stringValueForKey:@"gender" default:@""];
-                NSString * o_ageString = [subDict stringValueForKey:@"age" default:@""];
-                NSString * o_mobileString = [subDict stringValueForKey:@"mobile" default:@""];
-                if (![i_nameString isEqualToString:o_nameString]
-                    || ![i_sexString isEqualToString:o_sexString]
-                    || ![i_ageString isEqualToString:o_ageString]
-                    || ![i_mobileString isEqualToString:o_mobileString]) {
-                    [tempArray replaceObjectAtIndex:[tempArray indexOfObject:subDict] withObject:userDict];
-                    isReplace = NO;
-                    break;
+            if (!isNew) {
+                BOOL isReplace = YES;
+                NSString * i_nameString = [userDict stringValueForKey:@"name" default:@""];
+                NSString * i_sexString = [userDict stringValueForKey:@"gender" default:@""];
+                NSString * i_ageString = [userDict stringValueForKey:@"age" default:@""];
+                NSString * i_mobileString = [userDict stringValueForKey:@"mobile" default:@""];
+                for (NSDictionary * subDict in tempArray) {
+                    NSString * o_nameString = [subDict stringValueForKey:@"name" default:@""];
+                    NSString * o_sexString = [subDict stringValueForKey:@"gender" default:@""];
+                    NSString * o_ageString = [subDict stringValueForKey:@"age" default:@""];
+                    NSString * o_mobileString = [subDict stringValueForKey:@"mobile" default:@""];
+                    if (![i_nameString isEqualToString:o_nameString]
+                        || ![i_sexString isEqualToString:o_sexString]
+                        || ![i_ageString isEqualToString:o_ageString]
+                        || ![i_mobileString isEqualToString:o_mobileString]) {
+                        [tempArray replaceObjectAtIndex:[tempArray indexOfObject:subDict] withObject:userDict];
+                        isReplace = NO;
+                        break;
+                    }
                 }
+                if (isReplace) [tempArray addObject:userDict];
+            }else{
+                [tempArray addObject:userDict];
             }
-            if (isReplace) [tempArray addObject:userDict];
             NSString * user_info = [tempArray mj_JSONString];
             [CNLiveRespCacheManager cachePathWithObject:user_info FileName:cacheKey];
             if (completerBlock) completerBlock(@[],isSave);
@@ -488,12 +494,8 @@
     [CNLiveNetworking setupShowResult:YES];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNCCommuntPayMentActivityCommentsOrderContentURL 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) {
-                
-            }else{
-                
-            }
+        [CNLiveCommuntViewModel communty_chooseRequestWithResponseObject:responseObject Error:error isData:NO CompleterBlock:^(id responseObject) {
+            if ([responseObject[@"errorMessage"] isEqualToString:@"success"] && completerBlock) completerBlock();
         }];
     }];
 }
@@ -522,6 +524,33 @@
         }];
     }];
 }
+/// 获取成功界面查看详情界面
+/// @param orderId 订单id
+/// @param signId 报名id
+/// @param completerBlock 返回结果
++(void)requestWithCommuntyActivityResultDetailMentOrderId:(NSString *)orderId SignId:(NSString *)signId handworkId:(NSString *)handworkId CompleterBlock:(void(^)(CNLiveCommuntyActivityResultDetailModel * detailModel))completerBlock
+{
+    NSDictionary * paramDict = @{
+        @"orderId":[orderId isNotBlank]?orderId:@"",
+        @"handworkId":[handworkId isNotBlank]?handworkId:@"",
+        @"signupIds":[signId isNotBlank]?signId:@""
+    };
+    [QMUITips showLoadingInView:[CNLiveCommuntTools cCommunt_currentViewController].view];
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    [CNLiveNetworking setupShowResult:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNCCommuntPayMentActivityResultOrderContentURL 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) {
+                CNLiveCommuntyActivityResultDetailModel * detailModel = [CNLiveCommuntyActivityResultDetailModel mj_objectWithKeyValues:responseObject];
+                if (completerBlock) completerBlock(detailModel);
+            }else{
+                if (completerBlock) completerBlock(nil);
+            }
+        }];
+    }];
+}
 #pragma mark =========== 对放回的结果进行提醒判断 ===========
 /// 获取时间戳
@@ -23,7 +23,7 @@
     [IQKeyboardManager sharedManager].enable = YES;
     [IQKeyboardManager sharedManager].enableAutoToolbar = YES;
-    [CNUserInfoManager manager].userInfoModel.uid = @"145680";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10458139";//@"10537318";//@"10499533";//
+    [CNUserInfoManager manager].userInfoModel.uid = @"145680";//@"10545988";//@"353001";//@"353417";//@"10511059";//@"10458139";//@"10537318";//@"10499533";//@"11973842"
 //    [[NSUserDefaults standardUserDefaults] setObject:@"38" forKey:@"kCNLiveCommuntyNBhdIdIdentifier"];
 //    [[NSUserDefaults standardUserDefaults] synchronize];
@@ -18,6 +18,12 @@
 #import <Masonry/Masonry.h>
 #import "CNLiveCommuntyModule.h"
 #import "CNLIVEAppDelegate.h"
+#import <YYCategories/YYCategories.h>
+#import <JXCategoryView/JXCategoryView.h>
+#import <JXPagingView/JXPagerView.h>
+#import <Masonry/Masonry.h>
+#import <YYText/YYText.h>
+#import "CNLiveCommuntViewModel.h"
 #import "CNLiveCommuntyResultListViewController.h"
 #import <CNLiveEnvironment/CNLiveEnvironment.h>
 #import <CNLiveUserManagement/CNUserInfoManager.h>
@@ -63,6 +69,14 @@
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.mas_equalTo(self.view);
     }];
+    
+    __block NSArray * array = @[@"123",@"123",@"123",@"123",@"123",@"123"];
+    __block NSMutableString *picString = [[NSMutableString alloc] init];
+    [array enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        [picString appendString:obj];
+        if (array.count != idx+1) [picString appendString:@","];
+    }];
+    NSLog(@"===>%@",picString);
 }
 -(NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -80,7 +94,7 @@
         cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:NSStringFromClass(UITableViewCell.class)];
     }
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
-    cell.textLabel.text = self.dataArray[indexPath.row];
+    cell.textLabel.text = [NSString stringWithFormat:@"%@==%ld",self.dataArray[indexPath.row],(long)indexPath.row];
     return cell;
 }
@@ -112,22 +126,19 @@
         [self.navigationController pushViewController:evaluaView animated:YES];
     }
     if (indexPath.row == 5) {
-        /*
-         "id" : 37,
-         "mobile" : null,
-         "unitPrice" : 10,
-         "processDesc" : "阿斯达大1"
-         */
-        NSDictionary * paramDict = @{@"id":@"37",@"mobile":@"",@"unitPrice":@"0",@"processDesc":@"阿斯达大1"};
-        CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped InfoDict:paramDict];
+        CNLiveCommuntSignUpViewController * signUpView = [[CNLiveCommuntSignUpViewController alloc] initWithStyle:UITableViewStyleGrouped ActivityId:@"52"];
         [self.navigationController pushViewController:signUpView animated:YES];
     }
     if (indexPath.row == 6) {
-        CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:@"cmnt2022021613328658203"];
-        [self.navigationController pushViewController:orderVC animated:YES];
+        NSString * cmnt_id = [[NSUserDefaults standardUserDefaults] objectForKey:@"cmnt_id"];
+        if ([cmnt_id isNotBlank]) {
+            CNLiveCommuntyOrderViewController * orderVC = [[CNLiveCommuntyOrderViewController alloc] initWithMaintenId:cmnt_id];
+            [self.navigationController pushViewController:orderVC animated:YES];
+        }
+
     }
     if (indexPath.row == 7) {
-        CNLiveCommuntyResultListViewController * orderVC = [[CNLiveCommuntyResultListViewController alloc] initWithStyle:UITableViewStyleGrouped SignId:@""];
+        CNLiveCommuntyResultListViewController * orderVC = [[CNLiveCommuntyResultListViewController alloc] initWithStyle:UITableViewStyleGrouped SignId:@"48" OrderId:@"" handworkId:@"52"];
         [self.navigationController pushViewController:orderVC animated:YES];
     }
 //    if (indexPath.row == 8) {
@@ -135,8 +146,8 @@
 //        [self.navigationController pushViewController:orderVC animated:YES];
 //    }
     if (indexPath.row == 8) {
-        [CNUserInfoManager manager].userInfoModel.uid = self.isChange ? @"353001" : @"145680";
-        [self.dataArray replaceObjectAtIndex:8 withObject:self.isChange ? @"353001" : @"145680"];
+        [CNUserInfoManager manager].userInfoModel.uid = self.isChange ? @"11973842" : @"145680";
+        [self.dataArray replaceObjectAtIndex:8 withObject:self.isChange ? @"11973842" : @"145680"];
         self.isChange = !self.isChange;
         NSMutableDictionary * mDict = [[NSMutableDictionary alloc] init];
         [mDict setValue:[CNUserInfoManager manager].userInfoModel.uid forKey:@"loginSid"];