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
411e96c3
Commit
411e96c3
authored
Nov 21, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:
parent
6a00b24e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1683 additions
and
1215 deletions
+1683
-1215
OrderdetailsViewController.m
Class/OrderdetailsViewController.m
+5
-5
opple_objc_json_client.h
Tools/opple_objc_json_client.h
+1260
-920
opple_objc_json_client.m
Tools/opple_objc_json_client.m
+418
-290
No files found.
Class/OrderdetailsViewController.m
View file @
411e96c3
...
@@ -295,10 +295,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
...
@@ -295,10 +295,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
deductionModel
.
priority
=
oldPromotion
.
prority
;
deductionModel
.
priority
=
oldPromotion
.
prority
;
[
weakSelf
.
promotionInformationArray
addObject
:
deductionModel
];
[
weakSelf
.
promotionInformationArray
addObject
:
deductionModel
];
}
else
if
(
!
[
BaseViewController
isBlankString
:[
oldPromotion
.
jde
cardDenomation
stringValue
]])
{
}
else
if
(
!
[
BaseViewController
isBlankString
:[
oldPromotion
.
JDE
cardDenomation
stringValue
]])
{
// 京东E卡
// 京东E卡
PromotionJDECardModel
*
jdECardModel
=
[[
PromotionJDECardModel
alloc
]
init
];
PromotionJDECardModel
*
jdECardModel
=
[[
PromotionJDECardModel
alloc
]
init
];
jdECardModel
.
total
=
[
oldPromotion
.
jde
cardDenomation
integerValue
];
jdECardModel
.
total
=
[
oldPromotion
.
JDE
cardDenomation
integerValue
];
jdECardModel
.
body
=
GUIDE
;
jdECardModel
.
body
=
GUIDE
;
jdECardModel
.
type
=
JDECardAction
;
jdECardModel
.
type
=
JDECardAction
;
jdECardModel
.
priority
=
oldPromotion
.
prority
;
jdECardModel
.
priority
=
oldPromotion
.
prority
;
...
@@ -381,7 +381,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
...
@@ -381,7 +381,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
if
(
resultModel
.
award
)
{
if
(
resultModel
.
award
)
{
weakSelf
.
customerDrawModel
=
[
PromotionLuckDrawResultModel
initializeWith
:
resultModel
];
weakSelf
.
customerDrawModel
=
[
PromotionLuckDrawResultModel
initializeWith
:
resultModel
];
}
}
PromotionChooseNavigationController
*
promotionChooseNav
=
[[
weakSelf
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"PromotionChooseNavigationController"
];
PromotionChooseNavigationController
*
promotionChooseNav
=
[[
[
weakSelf
class
]
getMainStoryboardClass
]
instantiateViewControllerWithIdentifier
:
@"PromotionChooseNavigationController"
];
PromotionChooseViewController
*
promotionChoose
=
(
PromotionChooseViewController
*
)
promotionChooseNav
.
visibleViewController
;
PromotionChooseViewController
*
promotionChoose
=
(
PromotionChooseViewController
*
)
promotionChooseNav
.
visibleViewController
;
promotionChoose
.
promotionDelegate
=
self
;
promotionChoose
.
promotionDelegate
=
self
;
promotionChoose
.
promotionDatasArray
=
weakSelf
.
customerPromotionArray
;
promotionChoose
.
promotionDatasArray
=
weakSelf
.
customerPromotionArray
;
...
@@ -582,7 +582,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
...
@@ -582,7 +582,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
#pragma mark - 卡劵领取成功
#pragma mark - 卡劵领取成功
-
(
void
)
rebateApplySuccess
:
(
NSString
*
)
message
-
(
void
)
rebateApplySuccess
:
(
NSString
*
)
message
{
{
RebateSuccessTableViewController
*
success
=
[
self
.
getStoryboardWithName
instantiateViewControllerWithIdentifier
:
@"RebateSuccessTableViewController"
];
RebateSuccessTableViewController
*
success
=
[
[[
self
class
]
getMainStoryboardClass
]
instantiateViewControllerWithIdentifier
:
@"RebateSuccessTableViewController"
];
success
.
titleArray
=
@[
message
,
@"查看账户"
,
@"我知道了"
];
success
.
titleArray
=
@[
message
,
@"查看账户"
,
@"我知道了"
];
[
success
setClickEvent
:
^
(
NSIndexPath
*
indexPath
)
{
[
success
setClickEvent
:
^
(
NSIndexPath
*
indexPath
)
{
if
(
indexPath
.
row
==
1
)
{
if
(
indexPath
.
row
==
1
)
{
...
@@ -604,7 +604,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
...
@@ -604,7 +604,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
-
(
void
)
showJDECard
-
(
void
)
showJDECard
{
{
WS
(
weakSelf
);
WS
(
weakSelf
);
JDEcardViewController
*
jdeCard
=
[[
self
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"JDEcardViewController"
];
JDEcardViewController
*
jdeCard
=
[[
[
weakSelf
class
]
getMainStoryboardClass
]
instantiateViewControllerWithIdentifier
:
@"JDEcardViewController"
];
[
jdeCard
setDismissJDECardBlock
:
^
{
[
jdeCard
setDismissJDECardBlock
:
^
{
[
weakSelf
.
settingsPopoverController
dismissPopoverAnimated
:
YES
];
[
weakSelf
.
settingsPopoverController
dismissPopoverAnimated
:
YES
];
}];
}];
...
...
Tools/opple_objc_json_client.h
View file @
411e96c3
This diff is collapsed.
Click to expand it.
Tools/opple_objc_json_client.m
View file @
411e96c3
This diff is collapsed.
Click to expand it.
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