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
ec2096e4
Commit
ec2096e4
authored
Apr 24, 2017
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
e4ec6074
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
9 deletions
+9
-9
OrderdetailsViewController.m
...ient/Orderdetails/controller/OrderdetailsViewController.m
+3
-3
PromotionJDECardModel.h
Class/MyClient/Orderdetails/model/PromotionJDECardModel.h
+1
-1
PromotionWeChatCardModel.h
Class/MyClient/Orderdetails/model/PromotionWeChatCardModel.h
+1
-1
PromotionalDeductionModel.h
...s/MyClient/Orderdetails/model/PromotionalDeductionModel.h
+1
-1
PromotionalReadPacketModel.h
.../MyClient/Orderdetails/model/PromotionalReadPacketModel.h
+1
-1
Info.plist
Lighting/Supporting Files/Info.plist
+2
-2
No files found.
Class/MyClient/Orderdetails/controller/OrderdetailsViewController.m
View file @
ec2096e4
...
@@ -540,10 +540,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
...
@@ -540,10 +540,10 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
}
}
NSString
*
message
=
MESSAGE
(
returnValue
);
NSString
*
message
=
MESSAGE
(
returnValue
);
if
([[
self
class
]
isBlankString
:
message
])
{
if
([[
self
class
]
isBlankString
:
message
])
{
[
XBLoadingView
showHUDViewWithText
:[
NSString
stringWithFormat
:
@"微信卡劵(%ld元)使用成功"
,
weakSelf
.
weChatModel
.
wxcardDenomation
]
];
NSString
*
string
=
[
NSString
stringWithFormat
:
@"微信卡劵(%ld元)使用成功"
,
weakSelf
.
weChatModel
.
wxcardDenomation
];
ShowDefaultAlertView
(
self
,
nil
,
string
,
UIAlertControllerStyleAlert
,
nil
,
nil
);
}
else
{
}
else
{
[
XBLoadingView
showHUDViewWithText
:
message
]
;
ShowDefaultAlertView
(
self
,
nil
,
message
,
UIAlertControllerStyleAlert
,
nil
,
nil
)
;
}
}
[
weakSelf
promotionInformationExecutionOrder
];
[
weakSelf
promotionInformationExecutionOrder
];
}
else
{
}
else
{
...
...
Class/MyClient/Orderdetails/model/PromotionJDECardModel.h
View file @
ec2096e4
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
@property
(
nonatomic
,
copy
)
NSString
*
type
;
@property
(
nonatomic
,
copy
)
NSString
*
type
;
//** 抵扣金额 */
//** 抵扣金额 */
@property
(
nonatomic
,
assign
)
NSInteger
total
;
@property
(
nonatomic
,
assign
)
CGFloat
total
;
//** 描述 */
//** 描述 */
@property
(
nonatomic
,
copy
)
NSString
*
descriptionString
;
@property
(
nonatomic
,
copy
)
NSString
*
descriptionString
;
...
...
Class/MyClient/Orderdetails/model/PromotionWeChatCardModel.h
View file @
ec2096e4
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
@property
(
nonatomic
,
copy
)
NSString
*
type
;
@property
(
nonatomic
,
copy
)
NSString
*
type
;
// 卡劵面额
// 卡劵面额
@property
(
nonatomic
,
assign
)
NSInteger
total
;
@property
(
nonatomic
,
assign
)
CGFloat
total
;
//** 描述 */
//** 描述 */
@property
(
nonatomic
,
copy
)
NSString
*
descriptionString
;
@property
(
nonatomic
,
copy
)
NSString
*
descriptionString
;
...
...
Class/MyClient/Orderdetails/model/PromotionalDeductionModel.h
View file @
ec2096e4
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
@property
(
nonatomic
,
copy
)
NSString
*
type
;
@property
(
nonatomic
,
copy
)
NSString
*
type
;
//** 抵扣金额 */
//** 抵扣金额 */
@property
(
nonatomic
,
assign
)
NSInteger
total
;
@property
(
nonatomic
,
assign
)
CGFloat
total
;
//** 描述 */
//** 描述 */
@property
(
nonatomic
,
copy
)
NSString
*
descriptionString
;
@property
(
nonatomic
,
copy
)
NSString
*
descriptionString
;
...
...
Class/MyClient/Orderdetails/model/PromotionalReadPacketModel.h
View file @
ec2096e4
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
@property
(
nonatomic
,
copy
)
NSString
*
type
;
@property
(
nonatomic
,
copy
)
NSString
*
type
;
//** 红包金额 */
//** 红包金额 */
@property
(
nonatomic
,
assign
)
NSInteger
total
;
@property
(
nonatomic
,
assign
)
CGFloat
total
;
//** 描述 */
//** 描述 */
@property
(
nonatomic
,
copy
)
NSString
*
descriptionString
;
@property
(
nonatomic
,
copy
)
NSString
*
descriptionString
;
...
...
Lighting/Supporting Files/Info.plist
View file @
ec2096e4
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
k
e
y
>
CFBundleName
<
/k
e
y
>
<
string
>
欧立方
<
/string
>
<
string
>
欧立方
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
2.1.
1
<
/string
>
<
string
>
2.1.
2
<
/string
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
a
rr
a
y
>
<
a
rr
a
y
>
<
d
i
c
t
>
<
d
i
c
t
>
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
<
/
d
i
c
t
>
<
/
d
i
c
t
>
<
/
a
rr
a
y
>
<
/
a
rr
a
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
2.1.
1
<
/string
>
<
string
>
2.1.
2
<
/string
>
<
k
e
y
>
LSApplicationQueriesSchemes
<
/k
e
y
>
<
k
e
y
>
LSApplicationQueriesSchemes
<
/k
e
y
>
<
a
rr
a
y
>
<
a
rr
a
y
>
<
string
>
wechat
<
/string
>
<
string
>
wechat
<
/string
>
...
...
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