iOS Team / CNLiveCommuntyModule · Commits

Commit b646ff99ab69ee45ea9f121dde256a95314d0faf

Authored by liushiyu
1 parent 15132d87

0.2.6

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
CNLiveCommuntyModule.podspec
  View file @b646ff9
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveCommuntyModule' 10 s.name = 'CNLiveCommuntyModule'
11 - s.version = '0.2.5' 11 + s.version = '0.2.6'
12 s.summary = 'A short description of CNLiveCommuntyModule.' 12 s.summary = 'A short description of CNLiveCommuntyModule.'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
  View file @b646ff9
@@ -36,10 +36,10 @@ @@ -36,10 +36,10 @@
36 [dateFormatter setDateFormat:@"yyyy/MM"]; 36 [dateFormatter setDateFormat:@"yyyy/MM"];
37 NSDate *detaildate_beginTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.beginTime doubleValue]/1000)]; 37 NSDate *detaildate_beginTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.beginTime doubleValue]/1000)];
38 NSDate *detaildate_endTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.endTime doubleValue]/1000)]; 38 NSDate *detaildate_endTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.endTime doubleValue]/1000)];
39 - NSString * time_string = [NSString stringWithFormat:@"%@~%@",[dateFormatter stringFromDate:detaildate_beginTime],[dateFormatter stringFromDate:detaildate_endTime]]; 39 + NSString * time_string = [NSString stringWithFormat:@"%@-%@",[dateFormatter stringFromDate:detaildate_beginTime],[dateFormatter stringFromDate:detaildate_endTime]];
40 40
41 NSDateFormatter *dateFormatter_pay = [[NSDateFormatter alloc] init]; 41 NSDateFormatter *dateFormatter_pay = [[NSDateFormatter alloc] init];
42 - [dateFormatter_pay setDateFormat:@"yyyy/MM/dd"];//HH:mm:ss 42 + [dateFormatter_pay setDateFormat:@"yyyy/MM/dd HH:mm:ss"];
43 NSDate *detaildate_payTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.payTime doubleValue]/1000)]; 43 NSDate *detaildate_payTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.payTime doubleValue]/1000)];
44 NSMutableArray * dataArray = [[NSMutableArray alloc] init]; 44 NSMutableArray * dataArray = [[NSMutableArray alloc] init];
45 [dataArray addObject:@{@"key":@"回单类型",@"value":paycostModel.receiptType}]; 45 [dataArray addObject:@{@"key":@"回单类型",@"value":paycostModel.receiptType}];