Commit e069d27

committed

【iOS】客户反馈"【青岛达芬奇】安卓 APP 充值订单显示有误" #26481

1 parent 3694a3a commit e069d27Copy full SHA for e069d27

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ - (void)setCurTeam:(Team *)curTeam{`
`103`	`103`	`NSInteger remain_days = _curTeam.info.remain_days.integerValue;`
`104`	`104`
`105`	`105`	`_tipL.textColor = remain_days > kEANeedTipRemainDays && !isLocked? kColorDark4: kColorActionRed;`
`106`		`- if (isTrial \|\| !isToped_up) {`
	`106`	`+ if (!isToped_up) {`
`107`	`107`	`NSInteger trial_left_days = [_curTeam.info trial_left_days];`
`108`	`108`	`if (isLocked \|\| trial_left_days < 0) {`
`109`	`109`	`_tipL.text = @"您的试用期已结束,请订购后使用";`
`@@ -174,7 +174,7 @@ + (CGFloat)cellHeightWithObj:(id)obj{`
`174`	`174`	`if (!isToped_up) {`
`175`	`175`	`cellHeight = 85;`
`176`	`176`	`}else{`
`177`		`- BOOL needTipStr = (isTrial \|\| remain_days <= kEANeedTipRemainDays \|\| isLocked);`
	`177`	`+ BOOL needTipStr = (!isToped_up \|\| remain_days <= kEANeedTipRemainDays \|\| isLocked);`
`178`	`178`	`if (needTipStr) {`
`179`	`179`	`cellHeight = 165;`
`180`	`180`	`}else{`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,12 @@ - (void)setCurTeam:(Team *)curTeam{`
`57`	`57`	`_curTeam = curTeam;`
`58`	`58`
`59`	`59`	`BOOL isToped_up = [_curTeam.info isToped_up];//是否充值过`
`60`		`- BOOL isTrial = _curTeam.info.trial.boolValue;`
`61`	`60`	`BOOL isLocked = _curTeam.info.locked.boolValue;`
`62`	`61`	`NSInteger remain_days = _curTeam.info.remain_days.integerValue;`
`63`	`62`
`64`	`63`	`_introductionL.textColor = remain_days > kEANeedTipRemainDays? kColor999: kColorActionRed;`
`65`	`64`	`NSString *valueStr = @"";`
`66`		`- if (!isToped_up \|\| isTrial) {`
	`65`	`+ if (!isToped_up) {`
`67`	`66`	`valueStr = [NSString stringWithFormat:@"%ld", (long)[_curTeam.info trial_left_days]];`
`68`	`67`	`if (!isLocked && valueStr.integerValue >= 0) {`
`69`	`68`	`[_introductionL setAttrStrWithStr:[NSString stringWithFormat:@"试用期剩余 %@ 天", valueStr] diffColorStr:valueStr diffColor:valueStr.integerValue > kEANeedTipRemainDays? [UIColor colorWithHexString:@"0xF78636"]: kColorActionRed];`

Comments

(0)