修改项说明：修复提现进度状态显示异常

Class/Login/LoginViewController.h

@@ -16,21 +16,16 @@
  */
 @property (weak, nonatomic) IBOutlet UIView *userNameLoginView;
 
-
 /**
  * 账户名
  */
 @property (weak, nonatomic) IBOutlet UITextField *userName;
 
-
-
 /**
  *  密码
  */
 @property (weak, nonatomic) IBOutlet UITextField *passWord;
 
-
-
 /**
  *  忘记密码
  */
@@ -41,13 +36,11 @@
  */
 @property (weak, nonatomic) IBOutlet UIButton *loginButton;
 
-
 /**
  *  用户名背景View
  */
 @property (weak, nonatomic) IBOutlet UIView *userNameBackview;
 
-
 /**
  *  密码背景View
  */

Class/RebateViewController.m

@@ -208,10 +208,10 @@ NSString *const redPackage = @"redPackage";
     if (!self.resultEntity.bankCards.count) {
         [self showUnboundedAlertView];
     }
-//    if (!self.resultEntity.isUsable) {
-//        [self promptCustomerTitle:@"我知道了" withMessage:@"只能在周二和周五发起提现申请!" finish:nil];
-//        return;
-//    }
+    if (!self.resultEntity.isUsable) {
+        [self promptCustomerTitle:@"我知道了" withMessage:@"只能在周二和周五发起提现申请!" finish:nil];
+        return;
+    }
     WS(weakSelf);
     RebateDetailsViewController *rebateDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateDetailsViewController"];
     rebateDetails.rebateAmount = (sender.tag == 100)?[self.resultEntity.accountTotal floatValue]:[self.resultEntity.redPackageAccountTotal floatValue];

Class/WithdrawalTableViewController.m

@@ -33,8 +33,8 @@
     BOOL boolValue = [self.model.billStates isEqualToString:@"到账成功"];
     self.progressImageView.image = boolValue?TCImage(@"finish"):TCImage(@"progress");
     self.appleCompleteTimeLabel.hidden = !boolValue;
-    self.appleCompleteTimeLabel.textColor = [self setupLabelColor:self.model.billStates];
-    self.appleCompleteTimeLabel.text =  self.model.updateDate;
+    self.appleCompleteTimeLabel.textColor = [BaseViewController setupLabelColor:self.model.billStates][@"color"];
+    self.appleCompleteTimeLabel.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;
@@ -42,18 +42,6 @@
 }
 
 
-#pragma mark - 设置字体颜色
-- (UIColor *)setupLabelColor:(NSString *)text
-{
-    if ([text isEqualToString:@"到账成功"]) {
-        return RGB(89, 172, 220, 1);
-    }
-    if ([text isEqualToString:@"申请已提交"]) {
-        return RGB(128, 189, 51, 1);
-    }
-    return nil;
-}
-
 
 
 

Class/WithdrawalViewController.m

@@ -132,8 +132,8 @@
     TOApplyBillEntity *entity = self.resultArray[indexPath.row];
     cell.amountLabel.text = [NSString stringWithFormat:@"%.2f",[entity.applyMoney floatValue]];
     cell.createTimeLabel.text = entity.createDate;
-    cell.progressLabel.textColor = [self setupLabelColor:entity.billStates];
-    cell.progressLabel.text = entity.billStates;
+    cell.progressLabel.textColor = [[self class] setupLabelColor:entity.billStates][@"color"];
+    cell.progressLabel.text = [[self class] setupLabelColor:entity.billStates][@"text"];
     return cell;
 }
 
@@ -155,18 +155,6 @@
     [self.navigationController pushViewController:paymentsDetailsVC animated:YES];
 }
 
-#pragma mark - 设置字体颜色
-- (UIColor *)setupLabelColor:(NSString *)text
-{
-    if ([text isEqualToString:@"到账成功"]) {
-        return RGB(89, 172, 220, 1);
-    }
-    if ([text isEqualToString:@"申请已提交"]) {
-        return RGB(128, 189, 51, 1);
-    }
-    return nil;
-}
-
 #pragma mark - 释放
 - (void)dealloc
 {

Tools/BaseViewController.h

@@ -120,6 +120,17 @@
  */
 + (id)returnPrizeBillStateTitleColor:(NSString *)stateCode;
 
+#pragma mark - 设置提现状态
+
+/**
+ 提现申请状态
+
+ @param text 状态码
+
+ @return 字体颜色、文本
+ */
++ (NSDictionary *)setupLabelColor:(NSString *)text;
+
 /**
  考核题型转义
  */

Tools/BaseViewController.m

@@ -223,6 +223,29 @@
     return dict;
 }
 
+
+#pragma mark - 设置提现状态
++ (NSDictionary *)setupLabelColor:(NSString *)text
+{
+    UIColor *color = kMainBlueColor;
+    NSString *string;
+    if ([text isEqualToString:@"submit"]) {
+        color = RGB(128, 189, 51, 1);
+        string = @"已提交";
+    }else if ([text isEqualToString:@"paying"]) {
+        color = kMainBlueColor;
+        string = @"支付中";
+    }else if ([text isEqualToString:@"accomplished"]) {
+        color = kMainBlueColor;
+        string = @"已完成";
+    }else if ([text isEqualToString:@"failure"]) {
+        color = [UIColor redColor];
+        string = @"提现失败";
+    }
+    return @{@"text":string?string:text,@"color":color};
+}
+
+
 #pragma mark - 获取当前时间之前或者之后的时间（之前传入负数）
 + (NSString *)getTimeby:(NSInteger)day
 {

Tools/PrefixHeader.pch

@@ -176,13 +176,13 @@
 /**
  *  服务器开发地址
  */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
 
 
 /**
  *  服务器测试地址
  */
-#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
+//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
 
 //**
 // *  服务器正式地址
@@ -292,4 +292,6 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
 
 
 
+
+
 #endif /* PrefixHeader_pch */