Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
O
Opple-iOS
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张杰
Opple-iOS
Commits
4abca9d2
Commit
4abca9d2
authored
Jan 04, 2017
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:
parent
69c93da5
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
39 deletions
+11
-39
BindingBankCARDViewController.m
Class/BindingBankCARDViewController.m
+0
-1
BindingSuccessViewController.m
Class/BindingSuccessViewController.m
+0
-1
PaymentWithdrawalMainViewController.m
Class/PaymentWithdrawalMainViewController.m
+0
-1
RebateDetailsViewController.m
Class/RebateDetailsViewController.m
+3
-3
RebateViewController.m
Class/RebateViewController.m
+2
-2
Info.plist
Lighting/Info.plist
+1
-1
BaseViewController.m
Tools/BaseViewController.m
+3
-24
PrefixHeader.pch
Tools/PrefixHeader.pch
+2
-6
No files found.
Class/BindingBankCARDViewController.m
View file @
4abca9d2
...
...
@@ -91,7 +91,6 @@
NSString
*
type
=
[
MyBankClass
returnBankName
:
entity
.
bankAccount
];
WS
(
weakSelf
);
[
XBLoadingView
showHUDViewWithDefault
];
NSLog
(
@"%@"
,[[
entity
toDictionary
]
JSONString
]);
[[
NetworkRequestClassManager
Manager
]
NetworkRequestWithURL
:
SERVERREQUESTURL
(
VALIDATION
)
WithRequestType
:
ZERO
WithParameter
:
entity
WithReturnValueBlock
:^
(
id
returnValue
)
{
[
XBLoadingView
hideHUDViewWithDefault
];
...
...
Class/BindingSuccessViewController.m
View file @
4abca9d2
...
...
@@ -102,7 +102,6 @@
[
self
sendVerificationCodeAction
];
}
#pragma mark - 手机号加密
-
(
NSString
*
)
phoneNumberEncryption
:
(
NSString
*
)
phoneNumber
{
...
...
Class/PaymentWithdrawalMainViewController.m
View file @
4abca9d2
...
...
@@ -98,7 +98,6 @@
[
self
switchPaymentsVCAndWithdrawalVC
:
self
.
childViewControllers
[
sender
.
tag
-
100
]];
}
#pragma mark - 切换控制器
-
(
void
)
switchPaymentsVCAndWithdrawalVC
:
(
BaseViewController
*
)
newViewController
{
...
...
Class/RebateDetailsViewController.m
View file @
4abca9d2
...
...
@@ -41,9 +41,9 @@
if
([
self
.
inputRebateTextField
.
text
floatValue
]
>
self
.
rebateAmount
)
{
[
XBLoadingView
showHUDViewWithText
:
@"当前账户余额不足"
];
return
;
}
//
if ([self.inputRebateTextField.text floatValue] <= 10) {
//
[XBLoadingView showHUDViewWithText:@"提现金额不能小于10"];return;
//
}
if
([
self
.
inputRebateTextField
.
text
floatValue
]
<=
10
)
{
[
XBLoadingView
showHUDViewWithText
:
@"提现金额不能小于10"
];
return
;
}
if
([
self
includeChinese
:
self
.
inputRebateTextField
.
text
])
{
[
XBLoadingView
showHUDViewWithText
:
@"格式不正确"
];
return
;
}
...
...
Class/RebateViewController.m
View file @
4abca9d2
...
...
@@ -205,10 +205,10 @@ NSString *const redPackage = @"redPackage";
#pragma mark - 提现<tag == 100 产品返利><tag == 101 欧普奖励>
-
(
IBAction
)
withdrawalButtonClickAction
:
(
UIButton
*
)
sender
{
if
(
!
self
.
resultEntity
.
bankCards
.
count
)
{
if
(
!
self
.
resultEntity
.
bankCards
.
count
&&
sender
.
tag
==
101
)
{
[
self
showUnboundedAlertView
];
}
if
(
!
self
.
resultEntity
.
isUsable
)
{
if
(
!
self
.
resultEntity
.
isUsable
&&
sender
.
tag
==
101
)
{
[
self
promptCustomerTitle
:
@"我知道了"
withMessage
:
@"只能在周二和周五发起提现申请!"
finish
:
nil
];
return
;
}
...
...
Lighting/Info.plist
View file @
4abca9d2
...
...
@@ -15,7 +15,7 @@
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
string
>
欧立方
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
2.0.
0
<
/string
>
<
string
>
2.0.
1
<
/string
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
a
rr
a
y
>
<
d
i
c
t
>
...
...
Tools/BaseViewController.m
View file @
4abca9d2
...
...
@@ -53,16 +53,6 @@
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
{
[
super
viewDidLoad
];
...
...
@@ -101,7 +91,6 @@
});
}
#pragma mark -切换rootViewcontroller
-
(
void
)
restoreRootViewController
:
(
UIViewController
*
)
rootViewController
{
...
...
@@ -114,7 +103,6 @@
window
.
rootViewController
=
rootViewController
;
[
UIView
setAnimationsEnabled
:
oldState
];
};
[
UIView
transitionWithView
:
window
duration
:
0
.
5
f
options
:
UIViewAnimationOptionTransitionFlipFromBottom
...
...
@@ -126,7 +114,6 @@
-
(
void
)
endRefreshingForTableView
:
(
UIScrollView
*
)
TableView
{
if
(
TableView
.
mj_header
.
isRefreshing
)
{
[
TableView
.
mj_header
endRefreshing
];
}
else
if
(
TableView
.
mj_footer
.
isRefreshing
)
...
...
@@ -208,7 +195,6 @@
return
nil
;
}
#pragma mark -查询兑奖单state对应文字
+
(
id
)
returnPrizeBillStateTitleColor
:
(
NSString
*
)
stateCode
{
...
...
@@ -223,7 +209,6 @@
return
dict
;
}
#pragma mark - 设置提现状态
+
(
NSDictionary
*
)
setupLabelColor
:
(
NSString
*
)
text
{
...
...
@@ -241,11 +226,13 @@
}
else
if
([
text
isEqualToString
:
@"failure"
])
{
color
=
[
UIColor
redColor
];
string
=
@"提现失败"
;
}
else
if
([
text
isEqualToString
:
@"reject"
])
{
color
=
[
UIColor
redColor
];
string
=
@"驳回"
;
}
return
@{
@"text"
:
string
?
string
:
text
,
@"color"
:
color
};
}
#pragma mark - 获取当前时间之前或者之后的时间(之前传入负数)
+
(
NSString
*
)
getTimeby
:
(
NSInteger
)
day
{
...
...
@@ -308,13 +295,6 @@
[
self
presentViewController
:
alertVC
animated
:
YES
completion
:
nil
];
}
#pragma mark -删除提示文本、图片
-
(
void
)
RemovePromptinformationView
{
[
self
.
promptView
removeFromSuperview
];
self
.
promptView
=
nil
;
}
#pragma mark -传入订单状态,返回当前状态图片
+
(
UIImage
*
)
ReturnOrderStateImageWithStateCode
:
(
NSInteger
)
ordercode
{
...
...
@@ -445,7 +425,6 @@
#pragma mark -友好化时间
+
(
NSString
*
)
compareCurrentTime
:
(
NSString
*
)
str
{
//把字符串转为NSdate
NSDateFormatter
*
dateFormatter
=
[[
NSDateFormatter
alloc
]
init
];
[
dateFormatter
setDateFormat
:
@"yyyy-MM-dd HH:mm:ss.SSS"
];
...
...
Tools/PrefixHeader.pch
View file @
4abca9d2
...
...
@@ -96,7 +96,6 @@
*/
#define SAVEPASSWORD @"passWord"
/**
* AppDelegate代理
*/
...
...
@@ -137,7 +136,6 @@
*/
#define RightWidth 200
#define ZERO 0
#define ONE 1
...
...
@@ -161,7 +159,6 @@
*/
#define kCornerRadius 4
/**
* 主题灰色
*/
...
...
@@ -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]
//**
// * 服务器正式地址
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment