Commit b646ff99ab69ee45ea9f121dde256a95314d0faf
1 parent
15132d87
0.2.6
Showing
2 changed files
with
3 additions
and
3 deletions
CNLiveCommuntyModule.podspec
CNLiveCommuntyModule/Classes/View/CNLiveCommuntSignUpView.m
| ... | ... | @@ -36,10 +36,10 @@ |
| 36 | 36 | [dateFormatter setDateFormat:@"yyyy/MM"]; |
| 37 | 37 | NSDate *detaildate_beginTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.beginTime doubleValue]/1000)]; |
| 38 | 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 | 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 | 43 | NSDate *detaildate_payTime = [NSDate dateWithTimeIntervalSince1970:([paycostModel.payTime doubleValue]/1000)]; |
| 44 | 44 | NSMutableArray * dataArray = [[NSMutableArray alloc] init]; |
| 45 | 45 | [dataArray addObject:@{@"key":@"回单类型",@"value":paycostModel.receiptType}]; | ... | ... |