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

wanghengheng · wanghengheng · commit e069d27ccaa8 · 2019-02-15T11:39:02.000+08:00
diff --git a/Coding_iOS/Views/Cell/TeamPurchaseTopCell.m b/Coding_iOS/Views/Cell/TeamPurchaseTopCell.m
@@ -103,7 +103,7 @@ - (void)setCurTeam:(Team *)curTeam{
     NSInteger remain_days = _curTeam.info.remain_days.integerValue;
 
     _tipL.textColor = remain_days > kEANeedTipRemainDays && !isLocked? kColorDark4: kColorActionRed;
-    if (isTrial || !isToped_up) {
+    if (!isToped_up) {
         NSInteger trial_left_days = [_curTeam.info trial_left_days];
         if (isLocked || trial_left_days < 0) {
             _tipL.text = @"您的试用期已结束，请订购后使用";
@@ -174,7 +174,7 @@ + (CGFloat)cellHeightWithObj:(id)obj{
         if (!isToped_up) {
             cellHeight = 85;
         }else{
-            BOOL needTipStr = (isTrial || remain_days <= kEANeedTipRemainDays || isLocked);
+            BOOL needTipStr = (!isToped_up || remain_days <= kEANeedTipRemainDays || isLocked);
             if (needTipStr) {
                 cellHeight = 165;
             }else{
diff --git a/Coding_iOS/Views/Cell/TeamTopCell.m b/Coding_iOS/Views/Cell/TeamTopCell.m
@@ -57,13 +57,12 @@ - (void)setCurTeam:(Team *)curTeam{
     _curTeam = curTeam;
     
     BOOL isToped_up = [_curTeam.info isToped_up];//是否充值过
-    BOOL isTrial = _curTeam.info.trial.boolValue;
     BOOL isLocked = _curTeam.info.locked.boolValue;
     NSInteger remain_days = _curTeam.info.remain_days.integerValue;
     
     _introductionL.textColor = remain_days > kEANeedTipRemainDays? kColor999: kColorActionRed;
     NSString *valueStr = @"";
-    if (!isToped_up || isTrial) {
+    if (!isToped_up) {
         valueStr = [NSString stringWithFormat:@"%ld", (long)[_curTeam.info trial_left_days]];
         if (!isLocked && valueStr.integerValue >= 0) {
             [_introductionL setAttrStrWithStr:[NSString stringWithFormat:@"试用期剩余 %@ 天", valueStr] diffColorStr:valueStr diffColor:valueStr.integerValue > kEANeedTipRemainDays? [UIColor colorWithHexString:@"0xF78636"]: kColorActionRed];
