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
a44ffd28
Commit
a44ffd28
authored
Nov 04, 2016
by
曹云霄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改项说明:storyboard分类
parent
1c8a5b36
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
5186 additions
and
37 deletions
+5186
-37
OrderdetailsViewController.m
Class/OrderdetailsViewController.m
+1
-2
RebateViewController.m
Class/RebateViewController.m
+1
-1
StoryboardwithCYX.storyboard
Lighting/StoryboardwithCYX.storyboard
+303
-14
UserStoryboard~.storyboard
Lighting/UserStoryboard~.storyboard
+4864
-0
resources-to-copy-Lighting.txt
Pods/resources-to-copy-Lighting.txt
+5
-0
CustomWKWebViewController.h
Tools/CustomWKWebViewController.h
+1
-1
CustomWKWebViewController.m
Tools/CustomWKWebViewController.m
+0
-1
opple_objc_json_client.h
Tools/opple_objc_json_client.h
+11
-17
opple_objc_json_client.m
Tools/opple_objc_json_client.m
+0
-1
No files found.
Class/OrderdetailsViewController.m
View file @
a44ffd28
...
...
@@ -167,7 +167,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
dispatch_group_leave
(
group
);
[
weakSelf
RemoveMBProgressHUDLoding
];
if
([
returnValue
[
@"code"
]
isEqualToNumber
:
@0
])
{
NSArray
*
promotionalArray
=
returnValue
[
@"data"
];
NSArray
*
promotionalArray
=
returnValue
[
@"data"
]
[
@"actions"
]
;
[
weakSelf
.
promotionalArray
removeAllObjects
];
[
weakSelf
.
luckyDrawAndJDECardArray
removeAllObjects
];
for
(
NSDictionary
*
dict
in
promotionalArray
)
{
...
...
@@ -344,7 +344,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
LuckyDrawModel
*
model
=
(
LuckyDrawModel
*
)
object
;
if
([
model
.
body
isEqualToString
:
@"consumer"
])
{
[
self
showLuckyDrawControl
:
model
.
lotteryId
andDrawId
:
@""
andOrderNumber
:
self
.
orderCode
luckyDrawFinish
:^
(
NSDictionary
*
dict
)
{
NSLog
(
@"%@"
,
dict
);
}];
break
;
...
...
Class/RebateViewController.m
View file @
a44ffd28
...
...
@@ -121,7 +121,7 @@
CardViewController
*
cardVc
=
[[
self
getStoryboardWithName
]
instantiateViewControllerWithIdentifier
:
@"CardViewController"
];
[
self
addChildViewController
:
cardVc
];
cardVc
.
view
.
frame
=
CGRectMake
(
10
,
40
,
self
.
cardBackgroundView
.
mj_w
-
20
,
self
.
cardBackgroundView
.
mj_h
-
50
);
cardVc
.
view
.
frame
=
CGRectMake
(
10
,
40
,
(
self
.
cardBackgroundView
.
mj_w
-
20
)
/
2
,
self
.
cardBackgroundView
.
mj_h
-
50
);
[
self
.
cardBackgroundView
addSubview
:
cardVc
.
view
];
}
...
...
Lighting/StoryboardwithCYX.storyboard
View file @
a44ffd28
This diff is collapsed.
Click to expand it.
Lighting/UserStoryboard~.storyboard
0 → 100644
View file @
a44ffd28
This diff is collapsed.
Click to expand it.
Pods/resources-to-copy-Lighting.txt
0 → 100644
View file @
a44ffd28
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/IQKeyboardManager/IQKeyboardManager/Resources/IQKeyboardManager.bundle
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/MJRefresh/MJRefresh/MJRefresh.bundle
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_5.0/UMSocialSDKResourcesNew.bundle
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/TencentOpenAPI/TencentOpenApi_IOS_Bundle.bundle
/Users/caoyunxiao/Desktop/Opple-iOS/Pods/UMengSocial/Umeng_SDK_Social_iOS_ARM64_5.0/UMSocial_Sdk_Extra_Frameworks/SinaSSO/WeiboSDK.bundle
Tools/CustomWKWebViewController.h
View file @
a44ffd28
...
...
@@ -21,7 +21,7 @@
/**
* 抽奖完成
*/
@property
(
nonatomic
,
weak
)
void
(
^
luckyDrawFinishBlock
)(
NSDictionary
*
luckyDrawResultDict
);
@property
(
nonatomic
,
copy
)
void
(
^
luckyDrawFinishBlock
)(
NSDictionary
*
luckyDrawResultDict
);
...
...
Tools/CustomWKWebViewController.m
View file @
a44ffd28
...
...
@@ -73,7 +73,6 @@
if
([
message
.
name
isEqualToString
:
@"AppModel"
])
{
// 打印所传过来的参数,只支持NSNumber, NSString, NSDate, NSArray,
// NSDictionary, and NSNull类型
NSLog
(
@"%@"
,
message
.
body
);
if
(
self
.
luckyDrawFinishBlock
)
{
self
.
luckyDrawFinishBlock
(
message
.
body
);
}
...
...
Tools/opple_objc_json_client.h
View file @
a44ffd28
...
...
@@ -563,73 +563,67 @@ extern NSString * const SORTDIRECTION_DESC;
*/
@interface
OrderPayRequest
:
JSONModel
/**
*
*
订单编号
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
orderNumber
;
/**
*
*
旧状态
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
oldstate
;
/**
*
*
新状态
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
fnewstate
;
/**
*
*
支付方式
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
payType
;
/**
*
*
是否开票
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
isbill
;
/**
*
*
发票类型
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
billType
;
/**
*
*
发票抬头
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
billTitle
;
/**
*
(no documentation provided)
*
实际支付金额
*
*
*/
@property
(
nonatomic
,
strong
)
NSNumber
*
realAmount
;
/**
* (no documentation provided)
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
drawId
;
/**
* (no documentation provided)
* 抽奖主题标识
*
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
lotteryId
;
/**
*
(no documentation provided)
*
促销商品
* @see PromotionGoods
*
*/
@property
(
nonatomic
,
strong
)
NSArray
<
PromotionGoods
>
*
promotionGoods
;
/**
*
(no documentation provided)
*
京东E卡面额
*
*
*/
...
...
Tools/opple_objc_json_client.m
View file @
a44ffd28
...
...
@@ -208,7 +208,6 @@
@synthesize
billType
;
@synthesize
billTitle
;
@synthesize
realAmount
;
@synthesize
drawId
;
@synthesize
lotteryId
;
@synthesize
promotionGoods
;
@synthesize
jdCardDenomation
;
...
...
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