修改项说明：优化进度详情状态显示

Class/CardDetailsViewController.m

@@ -86,38 +86,11 @@
 #pragma mark - 切换ContentController
 - (IBAction)paymentsButtonAndWithdrawalButtonClick:(UIButton *)sender {
     
-    switch (sender.tag) {
-        case 100:
-        {
-            self.beenUseButton.selected = NO;
-            self.isUsedButton.selected = NO;
-            self.examinationButton.selected = NO;
+    for (id object in self.view.subviews) {
+        if ([object isKindOfClass:[UIButton class]]) {
+            UIButton *button = (UIButton *)object;
+            button.selected = NO;
         }
-            break;
-        case 101:
-        {
-            self.dontUseButton.selected = NO;
-            self.isUsedButton.selected = NO;
-            self.beenUseButton.selected = NO;
-        }
-            break;
-        case 102:
-        {
-            self.dontUseButton.selected = NO;
-            self.isUsedButton.selected = NO;
-            self.examinationButton.selected = NO;
-        }
-            break;
-        case 103:
-        {
-            self.dontUseButton.selected = NO;
-            self.beenUseButton.selected = NO;
-            self.examinationButton.selected = NO;
-        }
-            break;
-            
-        default:
-            break;
     }
     sender.selected = YES;
     [self setupInstructionsViewOrigin:sender];

Class/LuckyDrawViewController.m

@@ -68,21 +68,11 @@
 #pragma mark - 切换ContentController
 - (IBAction)paymentsButtonAndWithdrawalButtonClick:(UIButton *)sender {
     
-    switch (sender.tag) {
-        case 100:
-        {
-            self.usedDrawButton.selected = NO;
-            
+    for (id object in self.view.subviews) {
+        if ([object isKindOfClass:[UIButton class]]) {
+            UIButton *button = (UIButton *)object;
+            button.selected = NO;
         }
-            break;
-        case 101:
-        {
-            self.notDrawButton.selected = NO;
-        }
-            break;
-            
-        default:
-            break;
     }
     sender.selected = YES;
     [self setupInstructionsViewOrigin:sender];

Class/PaymentWithdrawalMainViewController.h

@@ -13,10 +13,12 @@
  返回控制器类型
 
  - PaymentDetails: 收支明细
+ - OppleReward:    opple奖励
  - Withdrawal:     提现进度
  */
 typedef NS_ENUM(NSInteger,CONTROLLERTYPE){
     PaymentDetails=0,
+    OppleReward,
     Withdrawal
 };
 

Class/PaymentWithdrawalMainViewController.m

@@ -42,6 +42,11 @@
  */
 @property (weak, nonatomic) IBOutlet UIButton *withdrawalButton;
 
+/**
+ 欧普奖励
+ */
+@property (weak, nonatomic) IBOutlet UIButton *oppleRewardButton;
+
 
 @end
 
@@ -69,7 +74,7 @@
 {
     PaymentsViewController *payments = self.childViewControllers[0];
     payments.view.frame = CGRectMake(0, 0, self.controllerBackView.width, self.controllerBackView.height);
-
+    
     WithdrawalViewController *withdrawal = self.childViewControllers[1];
     withdrawal.view.frame = CGRectMake(0, 0, self.controllerBackView.width, self.controllerBackView.height);
 }
@@ -77,21 +82,11 @@
 #pragma mark - 收支明细、提现进度
 - (IBAction)paymentDetailsOrwithdrawalButtonClickAction:(UIButton *)sender {
     
-    NSInteger number = sender.tag-100;
-    switch (number) {
-        case PaymentDetails:
-        {
-            self.withdrawalButton.selected = NO;
-        }
-            break;
-        case Withdrawal:
-        {
-            self.paymentDetailsButton.selected = NO;
+    for (id object in self.view.subviews) {
+        if ([object isKindOfClass:[UIButton class]]) {
+            UIButton *button = (UIButton *)object;
+            button.selected = NO;
         }
-            break;
-            
-        default:
-            break;
     }
     sender.selected = YES;
     [self setupInstructionsViewOrigin:sender];

Class/RebateDetailsViewController.m

@@ -22,8 +22,10 @@
 @property (nonatomic,copy) NSString *applyUUID;
 
 
+
 @end
 
+
 @implementation RebateDetailsViewController
 
 - (void)viewDidLoad {
@@ -41,7 +43,7 @@
     if ([self.inputRebateTextField.text floatValue] > self.rebateAmount) {
         [XBLoadingView showHUDViewWithText:@"当前账户余额不足"];return;
     }
-    if ([self.inputRebateTextField.text floatValue] <= 10) {
+    if ([self.inputRebateTextField.text floatValue] <= 10 && [self.billType isEqualToString:redPackage]) {
         [XBLoadingView showHUDViewWithText:@"提现金额不能小于10"];return;
     }
     if ([self includeChinese:self.inputRebateTextField.text]) {

Class/RebateViewController.m

@@ -99,10 +99,6 @@
 
 @end
 
-//欧普奖励
-NSString *const commission = @"commission";
-//红包
-NSString *const redPackage = @"redPackage";
 
 
 @implementation RebateViewController
@@ -258,7 +254,7 @@ NSString *const redPackage = @"redPackage";
 - (void)haveBindingBankCARDS
 {
     TOBankCardEntity *entity = self.resultEntity.bankCards[0];
-    NSString *bankCard = [NSString stringWithFormat:@"您已绑定提现账户\n%@(**** %@)",entity.bankCardType,[entity.bankAccount substringWithRange:NSMakeRange(entity.bankAccount.length-4, 4)]];
+    NSString *bankCard = [NSString stringWithFormat:@"您已绑定提现账户\n%@\n%@****%@",entity.bankCardType,[entity.bankAccount substringWithRange:NSMakeRange(0, 4)],[entity.bankAccount substringWithRange:NSMakeRange(entity.bankAccount.length-4, 4)]];
     UIAlertController *alertView = [UIAlertController alertControllerWithTitle:nil message:bankCard preferredStyle:UIAlertControllerStyleAlert];
     [alertView addAction:[UIAlertAction actionWithTitle:@"解除绑定" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [self removeBindingBankCARDS];

Class/WithdrawalTableViewCell.h

@@ -15,6 +15,11 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *progressLabel;
 
+/**
+ 进度title
+ */
+@property (weak, nonatomic) IBOutlet UILabel *progressTitleLabel;
+
 /**
  *  时间
  */
@@ -25,5 +30,9 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *amountLabel;
 
+/**
+ 数据源
+ */
+@property (nonatomic,strong) TOApplyBillEntity *entity;
 
 @end

Class/WithdrawalTableViewCell.m

@@ -15,10 +15,14 @@
     [super awakeFromNib];
 }
 
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
+- (void)setEntity:(TOApplyBillEntity *)entity
+{
+    _entity = entity;
+    self.amountLabel.text = [NSString stringWithFormat:@"%.2f",[entity.applyMoney floatValue]];
+    self.createTimeLabel.text = entity.createDate;
+    self.progressLabel.textColor = [BaseViewController setupLabelColor:entity.billStates][@"color"];
+    self.progressLabel.text = [BaseViewController setupLabelColor:entity.billStates][@"text"];
+    self.progressTitleLabel.text = [BaseViewController setupLabelColor:entity.billType][@"text"];
 }
 
 @end

Class/WithdrawalTableViewController.h

@@ -31,10 +31,6 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *applyCompleteLabel;
 
-/**
- *  到账时间
- */
-@property (weak, nonatomic) IBOutlet UILabel *appleCompleteTimeLabel;
 
 /**
  *  金额

Class/WithdrawalTableViewController.m

@@ -30,11 +30,10 @@
 #pragma mark - 填充数据
 - (void)fillDataAction
 {
-    BOOL boolValue = [self.model.billStates isEqualToString:@"到账成功"];
+    BOOL boolValue = [self.model.billStates isEqualToString:@"accomplished"] || [self.model.billStates isEqualToString:@"reject"];
     self.progressImageView.image = boolValue?TCImage(@"finish"):TCImage(@"progress");
-    self.appleCompleteTimeLabel.hidden = !boolValue;
-    self.appleCompleteTimeLabel.textColor = [BaseViewController setupLabelColor:self.model.billStates][@"color"];
-    self.appleCompleteTimeLabel.text =  [BaseViewController setupLabelColor:self.model.billStates][@"text"];
+    self.applyCompleteLabel.textColor = [BaseViewController setupLabelColor:self.model.billStates][@"color"];
+    self.applyCompleteLabel.text =  [BaseViewController setupLabelColor:self.model.billStates][@"text"];
     self.submitApplyTimeLabel.text = self.model.createDate;
     self.orderTimeLabel.text = self.model.createDate;
     self.orderBillNumberLabel.text = self.model.billNumber;

Class/WithdrawalViewController.m

@@ -130,10 +130,7 @@
 {
     WithdrawalTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"WithdrawalTableViewCell" forIndexPath:indexPath];
     TOApplyBillEntity *entity = self.resultArray[indexPath.row];
-    cell.amountLabel.text = [NSString stringWithFormat:@"%.2f",[entity.applyMoney floatValue]];
-    cell.createTimeLabel.text = entity.createDate;
-    cell.progressLabel.textColor = [[self class] setupLabelColor:entity.billStates][@"color"];
-    cell.progressLabel.text = [[self class] setupLabelColor:entity.billStates][@"text"];
+    cell.entity = entity;
     return cell;
 }
 

Lighting/OppleMain.storyboard

@@ -559,10 +559,10 @@
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="55.5" width="1000" height="84"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="1024" height="84"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
-                                            <frame key="frameInset" width="1000" height="83.5"/>
+                                            <frame key="frameInset" width="1024" height="83.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KGm-XJ-NyV">
@@ -634,10 +634,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="139.5" width="1000" height="110"/>
+                                        <rect key="frame" x="0.0" y="139.5" width="1024" height="110"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
-                                            <frame key="frameInset" width="1000" height="109.5"/>
+                                            <frame key="frameInset" width="1024" height="109.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="Zdg-s0-xfD">
@@ -717,10 +717,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="84" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="249.5" width="1000" height="84"/>
+                                        <rect key="frame" x="0.0" y="249.5" width="1024" height="84"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
-                                            <frame key="frameInset" width="1000" height="83.5"/>
+                                            <frame key="frameInset" width="1024" height="83.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tiK-JC-Jy4">
@@ -776,10 +776,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
-                                        <rect key="frame" x="0.0" y="333.5" width="1000" height="80"/>
+                                        <rect key="frame" x="0.0" y="333.5" width="1024" height="80"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
-                                            <frame key="frameInset" width="1000" height="79.5"/>
+                                            <frame key="frameInset" width="1024" height="79.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="6MS-gq-TMk">
@@ -854,10 +854,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
-                                        <rect key="frame" x="0.0" y="413.5" width="1000" height="50"/>
+                                        <rect key="frame" x="0.0" y="413.5" width="1024" height="50"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
-                                            <frame key="frameInset" width="1000" height="49.5"/>
+                                            <frame key="frameInset" width="1024" height="49.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总计：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ywx-T1-GlW">
@@ -898,10 +898,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrderDetailsSectionHeaderView" rowHeight="60" id="93R-pm-DiM" customClass="OrderDetailsSectionHeaderView">
-                                        <rect key="frame" x="0.0" y="463.5" width="1000" height="60"/>
+                                        <rect key="frame" x="0.0" y="463.5" width="1024" height="60"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="93R-pm-DiM" id="ps4-EA-igT">
-                                            <frame key="frameInset" width="1000" height="59.5"/>
+                                            <frame key="frameInset" width="1024" height="59.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7rk-Gz-d7W">
@@ -933,10 +933,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="checkmark" indentationWidth="10" reuseIdentifier="PromotionalTableViewCell" rowHeight="44" id="R0y-9Q-NEJ" customClass="PromotionalTableViewCell">
-                                        <rect key="frame" x="0.0" y="523.5" width="1000" height="44"/>
+                                        <rect key="frame" x="0.0" y="523.5" width="1024" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R0y-9Q-NEJ" id="tLA-TB-cwT">
-                                            <frame key="frameInset" width="812" height="43.5"/>
+                                            <frame key="frameInset" width="824" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="折扣金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iOu-WG-fyV">
@@ -1183,7 +1183,7 @@
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="192" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="7fl-ag-O5b">
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="182" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="182" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
                                         <rect key="frame" x="0.0" y="55.5" width="1024" height="182"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
@@ -1541,7 +1541,7 @@
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="ebs-7R-KfJ">
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ClientDetails" rowHeight="100" id="EPc-Ii-VaY" customClass="ClientDetailsTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ClientDetails" rowHeight="100" id="EPc-Ii-VaY" customClass="ClientDetailsTableViewCell">
                                         <rect key="frame" x="0.0" y="28" width="1024" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EPc-Ii-VaY" id="e8t-Pc-QPv">
@@ -3449,7 +3449,7 @@
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="LIf-UD-q9P">
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="NotDrawTableViewCell" rowHeight="70" id="X3v-Ll-1MC" customClass="NotDrawTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="NotDrawTableViewCell" rowHeight="70" id="X3v-Ll-1MC" customClass="NotDrawTableViewCell">
                                         <rect key="frame" x="0.0" y="28" width="1024" height="70"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="X3v-Ll-1MC" id="900-Pd-b1F">
@@ -3492,7 +3492,7 @@
                                             <outlet property="orderNumberTitle" destination="TMg-8t-PNg" id="bad-iY-IGi"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="UsedDrawTableViewCell" id="7NE-I0-E9m" customClass="UsedDrawTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UsedDrawTableViewCell" id="7NE-I0-E9m" customClass="UsedDrawTableViewCell">
                                         <rect key="frame" x="0.0" y="98" width="1024" height="70"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7NE-I0-E9m" id="6dy-h1-Du5">
@@ -3847,10 +3847,10 @@
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="PaymentsTableViewCell" rowHeight="70" id="ycT-hi-XMt" customClass="PaymentsTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="1000" height="70"/>
+                                        <rect key="frame" x="0.0" y="28" width="1024" height="70"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ycT-hi-XMt" id="kgy-QA-YB7">
-                                            <frame key="frameInset" width="1000" height="69.5"/>
+                                            <frame key="frameInset" width="1024" height="69.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="撒大声地" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IgV-UM-cUZ">
@@ -4090,6 +4090,7 @@
                                             <outlet property="amountLabel" destination="nw7-yq-t8s" id="m0l-aI-pMc"/>
                                             <outlet property="createTimeLabel" destination="Tdh-Rb-cNX" id="k5f-Pv-A76"/>
                                             <outlet property="progressLabel" destination="SLc-Hh-EOX" id="cLd-Hw-Heu"/>
+                                            <outlet property="progressTitleLabel" destination="Ssz-VZ-85R" id="rag-bZ-dJN"/>
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>
@@ -4143,7 +4144,7 @@
                                                     <color key="textColor" red="0.50196078431372548" green="0.74901960784313726" blue="0.20392156862745098" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="到账成功" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Qj-uC-VHm">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="驳回" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Qj-uC-VHm">
                                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
                                                     <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -4158,13 +4159,6 @@
                                                     <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Wy-5J-W1w">
-                                                    <frame key="frameInset" minX="44.78%" minY="170" width="16.41%" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                    <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
                                             </subviews>
                                             <constraints>
                                                 <constraint firstItem="UIr-Jo-wn0" firstAttribute="centerX" secondItem="mQZ-vP-Ej3" secondAttribute="centerX" id="2Wb-Ef-cND"/>
@@ -4173,7 +4167,7 @@
                                                 <constraint firstItem="smo-gx-5xx" firstAttribute="centerY" secondItem="UIr-Jo-wn0" secondAttribute="centerY" id="MGO-lp-uT2"/>
                                                 <constraint firstItem="UIr-Jo-wn0" firstAttribute="centerY" secondItem="3Qj-uC-VHm" secondAttribute="centerY" id="QYC-2N-2rS"/>
                                                 <constraint firstItem="mQZ-vP-Ej3" firstAttribute="centerX" secondItem="uun-nY-hTG" secondAttribute="centerX" id="XYH-PG-vKB"/>
-                                                <constraint firstItem="3Qj-uC-VHm" firstAttribute="trailing" secondItem="mQZ-vP-Ej3" secondAttribute="trailing" constant="10" id="ZoA-hw-xWW"/>
+                                                <constraint firstItem="3Qj-uC-VHm" firstAttribute="trailing" secondItem="mQZ-vP-Ej3" secondAttribute="trailing" id="ZoA-hw-xWW"/>
                                                 <constraint firstItem="3Qj-uC-VHm" firstAttribute="top" secondItem="mQZ-vP-Ej3" secondAttribute="bottom" constant="24" id="ecX-86-yE9"/>
                                                 <constraint firstItem="mQZ-vP-Ej3" firstAttribute="centerY" secondItem="uun-nY-hTG" secondAttribute="centerY" id="iJI-W4-dS0"/>
                                                 <constraint firstAttribute="trailing" secondItem="mQZ-vP-Ej3" secondAttribute="trailing" constant="300" id="o0d-k8-fNq"/>
@@ -4247,7 +4241,6 @@
                     <navigationItem key="navigationItem" id="Q4z-nB-baI"/>
                     <connections>
                         <outlet property="amountLabel" destination="UOg-pQ-dye" id="7F0-uo-A5c"/>
-                        <outlet property="appleCompleteTimeLabel" destination="3Wy-5J-W1w" id="zPw-pg-c4P"/>
                         <outlet property="applyCompleteLabel" destination="3Qj-uC-VHm" id="lrs-Lw-6JA"/>
                         <outlet property="orderBillNumberLabel" destination="XCK-AI-v31" id="0xg-cM-PIh"/>
                         <outlet property="orderTimeLabel" destination="bNQ-A8-lu4" id="GJL-tY-xuN"/>
@@ -5461,7 +5454,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="登录" translatesAutoresizingMaskIntoConstraints="NO" id="rGw-q9-ctQ">
-                                                    <frame key="frameInset" minX="-3" minY="-4" maxX="5" maxY="2"/>
+                                                    <frame key="frameInset" minX="-4" minY="-5" maxX="8.5" maxY="3"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 </imageView>
                                             </subviews>
@@ -6463,7 +6456,7 @@
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="I31-IQ-4Pp">
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PromotionChooseTableViewCell" id="5vC-JB-WSk" customClass="PromotionChooseTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="PromotionChooseTableViewCell" id="5vC-JB-WSk" customClass="PromotionChooseTableViewCell">
                                         <rect key="frame" x="0.0" y="92" width="1024" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5vC-JB-WSk" id="XVj-PN-Pxx">
@@ -6817,10 +6810,20 @@
                                     <action selector="paymentDetailsOrwithdrawalButtonClickAction:" destination="heY-Sl-l3P" eventType="touchUpInside" id="rkS-YO-N3n"/>
                                 </connections>
                             </button>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="siT-oE-InO">
+                                <color key="backgroundColor" red="0.2156862745" green="0.46274509800000002" blue="0.6705882353" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="65" id="2o6-Td-kWQ"/>
+                                    <constraint firstAttribute="height" constant="2" id="dkj-Gz-1Ai"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="m63-Tv-2AV">
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </view>
                             <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z1x-9D-kv2">
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="88" id="i3F-re-4Bc"/>
-                                    <constraint firstAttribute="height" constant="30" id="zZo-iE-I83"/>
+                                    <constraint firstAttribute="width" constant="88" id="nxC-ge-Wau"/>
+                                    <constraint firstAttribute="height" constant="30" id="qtY-Ic-zPd"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
                                 <state key="normal" title="提现进度">
@@ -6833,16 +6836,6 @@
                                     <action selector="paymentDetailsOrwithdrawalButtonClickAction:" destination="heY-Sl-l3P" eventType="touchUpInside" id="ZW8-sH-ED8"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="siT-oE-InO">
-                                <color key="backgroundColor" red="0.2156862745" green="0.46274509800000002" blue="0.6705882353" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="65" id="2o6-Td-kWQ"/>
-                                    <constraint firstAttribute="height" constant="2" id="dkj-Gz-1Ai"/>
-                                </constraints>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="m63-Tv-2AV">
-                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            </view>
                         </subviews>
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
@@ -6852,9 +6845,9 @@
                             <constraint firstItem="wLR-8w-dmO" firstAttribute="top" secondItem="NTH-tf-xwy" secondAttribute="bottom" constant="44" id="PPR-fs-UJZ"/>
                             <constraint firstItem="siT-oE-InO" firstAttribute="leading" secondItem="yRJ-cn-SlI" secondAttribute="leading" constant="47" id="QOG-Dj-NVr"/>
                             <constraint firstItem="siT-oE-InO" firstAttribute="top" secondItem="wLR-8w-dmO" secondAttribute="bottom" constant="2" id="Qdc-nW-hM4"/>
+                            <constraint firstItem="z1x-9D-kv2" firstAttribute="centerY" secondItem="wLR-8w-dmO" secondAttribute="centerY" id="TLy-Aj-t7F"/>
+                            <constraint firstItem="z1x-9D-kv2" firstAttribute="leading" secondItem="wLR-8w-dmO" secondAttribute="trailing" constant="10" id="b4M-zs-ize"/>
                             <constraint firstItem="wLR-8w-dmO" firstAttribute="leading" secondItem="yRJ-cn-SlI" secondAttribute="leading" constant="35" id="fAC-NC-47g"/>
-                            <constraint firstItem="z1x-9D-kv2" firstAttribute="leading" secondItem="wLR-8w-dmO" secondAttribute="trailing" constant="10" id="mlW-WZ-8qD"/>
-                            <constraint firstItem="z1x-9D-kv2" firstAttribute="centerY" secondItem="wLR-8w-dmO" secondAttribute="centerY" id="sbm-fp-aAb"/>
                             <constraint firstItem="m63-Tv-2AV" firstAttribute="leading" secondItem="yRJ-cn-SlI" secondAttribute="leading" constant="20" id="umf-8F-JYx"/>
                         </constraints>
                     </view>

Tools/BaseViewController.m

@@ -229,10 +229,17 @@
     }else if ([text isEqualToString:@"reject"]) {
         color = [UIColor redColor];
         string = @"驳回";
+    }else if ([text isEqualToString:@"commission"]) {
+        color = [UIColor blackColor];
+        string = @"【产品返利】进度:";
+    }else if ([text isEqualToString:@"redPackage"]) {
+        color = [UIColor blackColor];
+        string = @"【欧普奖励】进度:";
     }
     return @{@"text":string?string:text,@"color":color};
 }
 
+
 #pragma mark - 获取当前时间之前或者之后的时间（之前传入负数）
 + (NSString *)getTimeby:(NSInteger)day
 {

Tools/CYConstManager.h

@@ -600,3 +600,12 @@ extern NSString *const INSPECTIONTHROUGH;
  */
 extern NSString *const RECRUITTHROUGH;
 
+/**
+ *  返利
+ */
+extern NSString *const commission;
+/**
+ *  红包
+ */
+extern NSString *const redPackage;
+

Tools/CYConstManager.m

@@ -598,3 +598,19 @@ NSString *const INSPECTIONTHROUGH = @"6";
  *  闯关通过
  */
 NSString *const RECRUITTHROUGH = @"7";
+
+/**
+ *  返利
+ */
+NSString *const commission = @"commission";
+/**
+ *  红包
+ */
+NSString *const redPackage = @"redPackage";
+
+
+
+
+
+
+

Tools/PrefixHeader.pch

@@ -288,6 +288,4 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
 
 
 
-
-
 #endif /* PrefixHeader_pch */