Commit 4abca9d2 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 69c93da5
...@@ -91,7 +91,6 @@ ...@@ -91,7 +91,6 @@
NSString *type = [MyBankClass returnBankName:entity.bankAccount]; NSString *type = [MyBankClass returnBankName:entity.bankAccount];
WS(weakSelf); WS(weakSelf);
[XBLoadingView showHUDViewWithDefault]; [XBLoadingView showHUDViewWithDefault];
NSLog(@"%@",[[entity toDictionary] JSONString]);
[[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(VALIDATION) WithRequestType:ZERO WithParameter:entity WithReturnValueBlock:^(id returnValue) { [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(VALIDATION) WithRequestType:ZERO WithParameter:entity WithReturnValueBlock:^(id returnValue) {
[XBLoadingView hideHUDViewWithDefault]; [XBLoadingView hideHUDViewWithDefault];
......
...@@ -102,7 +102,6 @@ ...@@ -102,7 +102,6 @@
[self sendVerificationCodeAction]; [self sendVerificationCodeAction];
} }
#pragma mark - 手机号加密 #pragma mark - 手机号加密
- (NSString *)phoneNumberEncryption:(NSString *)phoneNumber - (NSString *)phoneNumberEncryption:(NSString *)phoneNumber
{ {
......
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
[self switchPaymentsVCAndWithdrawalVC:self.childViewControllers[sender.tag-100]]; [self switchPaymentsVCAndWithdrawalVC:self.childViewControllers[sender.tag-100]];
} }
#pragma mark - 切换控制器 #pragma mark - 切换控制器
- (void)switchPaymentsVCAndWithdrawalVC:(BaseViewController *)newViewController - (void)switchPaymentsVCAndWithdrawalVC:(BaseViewController *)newViewController
{ {
......
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
if ([self.inputRebateTextField.text floatValue] > self.rebateAmount) { if ([self.inputRebateTextField.text floatValue] > self.rebateAmount) {
[XBLoadingView showHUDViewWithText:@"当前账户余额不足"];return; [XBLoadingView showHUDViewWithText:@"当前账户余额不足"];return;
} }
// if ([self.inputRebateTextField.text floatValue] <= 10) { if ([self.inputRebateTextField.text floatValue] <= 10) {
// [XBLoadingView showHUDViewWithText:@"提现金额不能小于10"];return; [XBLoadingView showHUDViewWithText:@"提现金额不能小于10"];return;
// } }
if ([self includeChinese:self.inputRebateTextField.text]) { if ([self includeChinese:self.inputRebateTextField.text]) {
[XBLoadingView showHUDViewWithText:@"格式不正确"];return; [XBLoadingView showHUDViewWithText:@"格式不正确"];return;
} }
......
...@@ -205,10 +205,10 @@ NSString *const redPackage = @"redPackage"; ...@@ -205,10 +205,10 @@ NSString *const redPackage = @"redPackage";
#pragma mark - 提现<tag == 100 产品返利><tag == 101 欧普奖励> #pragma mark - 提现<tag == 100 产品返利><tag == 101 欧普奖励>
- (IBAction)withdrawalButtonClickAction:(UIButton *)sender { - (IBAction)withdrawalButtonClickAction:(UIButton *)sender {
if (!self.resultEntity.bankCards.count) { if (!self.resultEntity.bankCards.count && sender.tag == 101) {
[self showUnboundedAlertView]; [self showUnboundedAlertView];
} }
if (!self.resultEntity.isUsable) { if (!self.resultEntity.isUsable && sender.tag == 101) {
[self promptCustomerTitle:@"我知道了" withMessage:@"只能在周二和周五发起提现申请!" finish:nil]; [self promptCustomerTitle:@"我知道了" withMessage:@"只能在周二和周五发起提现申请!" finish:nil];
return; return;
} }
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>欧立方</string> <string>欧立方</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.0.0</string> <string>2.0.1</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
......
...@@ -53,16 +53,6 @@ ...@@ -53,16 +53,6 @@
return _webView; return _webView;
} }
//#pragma mark -渲染完成
//- (void)viewDidAppear:(BOOL)animated
//{
// [super viewDidAppear:animated];
// self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = YES;
// if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
// self.navigationController.interactivePopGestureRecognizer.enabled = YES;
// }
//}
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
...@@ -101,7 +91,6 @@ ...@@ -101,7 +91,6 @@
}); });
} }
#pragma mark -切换rootViewcontroller #pragma mark -切换rootViewcontroller
- (void)restoreRootViewController:(UIViewController *)rootViewController - (void)restoreRootViewController:(UIViewController *)rootViewController
{ {
...@@ -114,7 +103,6 @@ ...@@ -114,7 +103,6 @@
window.rootViewController = rootViewController; window.rootViewController = rootViewController;
[UIView setAnimationsEnabled:oldState]; [UIView setAnimationsEnabled:oldState];
}; };
[UIView transitionWithView:window [UIView transitionWithView:window
duration:0.5f duration:0.5f
options:UIViewAnimationOptionTransitionFlipFromBottom options:UIViewAnimationOptionTransitionFlipFromBottom
...@@ -126,7 +114,6 @@ ...@@ -126,7 +114,6 @@
- (void)endRefreshingForTableView:(UIScrollView *)TableView - (void)endRefreshingForTableView:(UIScrollView *)TableView
{ {
if (TableView.mj_header.isRefreshing) { if (TableView.mj_header.isRefreshing) {
[TableView.mj_header endRefreshing]; [TableView.mj_header endRefreshing];
} }
else if (TableView.mj_footer.isRefreshing) else if (TableView.mj_footer.isRefreshing)
...@@ -208,7 +195,6 @@ ...@@ -208,7 +195,6 @@
return nil; return nil;
} }
#pragma mark -查询兑奖单state对应文字 #pragma mark -查询兑奖单state对应文字
+ (id)returnPrizeBillStateTitleColor:(NSString *)stateCode + (id)returnPrizeBillStateTitleColor:(NSString *)stateCode
{ {
...@@ -223,7 +209,6 @@ ...@@ -223,7 +209,6 @@
return dict; return dict;
} }
#pragma mark - 设置提现状态 #pragma mark - 设置提现状态
+ (NSDictionary *)setupLabelColor:(NSString *)text + (NSDictionary *)setupLabelColor:(NSString *)text
{ {
...@@ -241,11 +226,13 @@ ...@@ -241,11 +226,13 @@
}else if ([text isEqualToString:@"failure"]) { }else if ([text isEqualToString:@"failure"]) {
color = [UIColor redColor]; color = [UIColor redColor];
string = @"提现失败"; string = @"提现失败";
}else if ([text isEqualToString:@"reject"]) {
color = [UIColor redColor];
string = @"驳回";
} }
return @{@"text":string?string:text,@"color":color}; return @{@"text":string?string:text,@"color":color};
} }
#pragma mark - 获取当前时间之前或者之后的时间(之前传入负数) #pragma mark - 获取当前时间之前或者之后的时间(之前传入负数)
+ (NSString *)getTimeby:(NSInteger)day + (NSString *)getTimeby:(NSInteger)day
{ {
...@@ -308,13 +295,6 @@ ...@@ -308,13 +295,6 @@
[self presentViewController:alertVC animated:YES completion:nil]; [self presentViewController:alertVC animated:YES completion:nil];
} }
#pragma mark -删除提示文本、图片
- (void)RemovePromptinformationView
{
[self.promptView removeFromSuperview];
self.promptView = nil;
}
#pragma mark -传入订单状态,返回当前状态图片 #pragma mark -传入订单状态,返回当前状态图片
+ (UIImage *)ReturnOrderStateImageWithStateCode:(NSInteger)ordercode + (UIImage *)ReturnOrderStateImageWithStateCode:(NSInteger)ordercode
{ {
...@@ -445,7 +425,6 @@ ...@@ -445,7 +425,6 @@
#pragma mark -友好化时间 #pragma mark -友好化时间
+ (NSString *) compareCurrentTime:(NSString *)str + (NSString *) compareCurrentTime:(NSString *)str
{ {
//把字符串转为NSdate //把字符串转为NSdate
NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
[dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss.SSS"]; [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss.SSS"];
......
...@@ -96,7 +96,6 @@ ...@@ -96,7 +96,6 @@
*/ */
#define SAVEPASSWORD @"passWord" #define SAVEPASSWORD @"passWord"
/** /**
* AppDelegate代理 * AppDelegate代理
*/ */
...@@ -137,7 +136,6 @@ ...@@ -137,7 +136,6 @@
*/ */
#define RightWidth 200 #define RightWidth 200
#define ZERO 0 #define ZERO 0
#define ONE 1 #define ONE 1
...@@ -161,7 +159,6 @@ ...@@ -161,7 +159,6 @@
*/ */
#define kCornerRadius 4 #define kCornerRadius 4
/** /**
* 主题灰色 * 主题灰色
*/ */
...@@ -176,13 +173,12 @@ ...@@ -176,13 +173,12 @@
/** /**
* 服务器开发地址 * 服务器开发地址
*/ */
#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]
//** //**
// * 服务器正式地址 // * 服务器正式地址
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment