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
a780cc70
Commit
a780cc70
authored
Nov 16, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:已抽奖未使用,在此使用同样需要满足当时促销条件
parent
b264ee99
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
OrderdetailsViewController.m
Class/OrderdetailsViewController.m
+8
-1
PrefixHeader.pch
Tools/PrefixHeader.pch
+2
-2
No files found.
Class/OrderdetailsViewController.m
View file @
a780cc70
...
@@ -326,7 +326,14 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
...
@@ -326,7 +326,14 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
/// 消费者抽奖成功后若没有支付,后面支付时可以继续享受奖品折扣
/// 消费者抽奖成功后若没有支付,后面支付时可以继续享受奖品折扣
if
([
resultModel
.
draw
.
state
isEqualToString
:
ACCOMPLISHED
])
{
if
([
resultModel
.
draw
.
state
isEqualToString
:
ACCOMPLISHED
])
{
weakSelf
.
customerDrawModel
=
[
LuckDrawResultModel
initializeWith
:
resultModel
];
for
(
JSONModel
*
model
in
weakSelf
.
luckyDrawAndJDECardArray
)
{
if
([
model
isMemberOfClass
:[
LuckyDrawModel
class
]])
{
LuckyDrawModel
*
consumerModel
=
(
LuckyDrawModel
*
)
model
;
if
([
consumerModel
.
body
isEqualToString
:
CONSUMER
])
{
weakSelf
.
customerDrawModel
=
[
LuckDrawResultModel
initializeWith
:
resultModel
];
break
;
}
}
}
}
}
/// 支付完成后
/// 支付完成后
if
(
self
.
isShowPrintButton
&&
resultModel
.
award
)
{
if
(
self
.
isShowPrintButton
&&
resultModel
.
award
)
{
...
...
Tools/PrefixHeader.pch
View file @
a780cc70
...
@@ -136,12 +136,12 @@
...
@@ -136,12 +136,12 @@
/**
/**
* 服务器测试地址
* 服务器测试地址
*/
*/
//
#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]
///**
///**
// * 服务器正式地址
// * 服务器正式地址
// */
// */
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
//
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.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