iOS Team / CNLiveCommuntyModule · Commits

Commit d31ecda5dcefa7a478560654350c53558dabc145

Authored by liushiyu
1 parent c3e3d433

0.1.4

Inline Side-by-side
Showing 2 changed files with 7 additions and 1 deletions
CNLiveCommuntyModule.podspec
  View file @d31ecda
@@ -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.1.3' 11 + s.version = '0.1.4'
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/ViewController/CNLiveCommuntyOrderViewController.m
  View file @d31ecda
@@ -87,6 +87,9 @@ @@ -87,6 +87,9 @@
87 [weakSelf.tableView reloadData]; 87 [weakSelf.tableView reloadData];
88 } 88 }
89 }]; 89 }];
  90 + }else{
  91 + self.createMdoel.imgs = [self.createMdoel.img componentsSeparatedByString:@","].mutableCopy;
  92 + [self.createMdoel.imgs removeObject:@""];
90 } 93 }
91 } 94 }
92 -(void)setupWithNaviView 95 -(void)setupWithNaviView
@@ -134,6 +137,7 @@ @@ -134,6 +137,7 @@
134 self.payButton.backgroundColor = UIColorHex(#CD0302); 137 self.payButton.backgroundColor = UIColorHex(#CD0302);
135 self.payButton.layer.masksToBounds = YES; 138 self.payButton.layer.masksToBounds = YES;
136 self.payButton.layer.cornerRadius = 18; 139 self.payButton.layer.cornerRadius = 18;
  140 + self.payButton.hidden = self.showType == CNLiveCommuntyOrderShowTypeListFailureOrder;
137 self.payButton.titleLabel.font = [UIFont systemFontOfSize:16]; 141 self.payButton.titleLabel.font = [UIFont systemFontOfSize:16];
138 self.payButton.titleLabel.font = [UIFont boldSystemFontOfSize:16]; 142 self.payButton.titleLabel.font = [UIFont boldSystemFontOfSize:16];
139 [self.payButton addTarget:self action:@selector(payResultAction:) forControlEvents:UIControlEventTouchUpInside]; 143 [self.payButton addTarget:self action:@selector(payResultAction:) forControlEvents:UIControlEventTouchUpInside];
@@ -154,6 +158,8 @@ @@ -154,6 +158,8 @@
154 } 158 }
155 [self.payButton setTitle:payString forState:UIControlStateNormal]; 159 [self.payButton setTitle:payString forState:UIControlStateNormal];
156 [self.payButton setTitle:payString forState:UIControlStateHighlighted]; 160 [self.payButton setTitle:payString forState:UIControlStateHighlighted];
  161 + self.bottemView.hidden = ![payString isNotBlank];
  162 + self.payButton.hidden = ![payString isNotBlank];
157 163
158 164
159 if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder && [self.createMdoel.totalFee isNotBlank] && [self.createMdoel.totalFee integerValue] > 0) { 165 if (self.showType == CNLiveCommuntyOrderShowTypeChatReadyOrder && [self.createMdoel.totalFee isNotBlank] && [self.createMdoel.totalFee integerValue] > 0) {