Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
A
ALand
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
张杰
ALand
Commits
e6861c04
Commit
e6861c04
authored
Apr 22, 2016
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单详情根据不同状态展示详情
parent
7d16f628
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
129 additions
and
31 deletions
+129
-31
Contents.json
...2订单详情_iPhone_assets/icon_order_car.imageset/Contents.json
+23
-0
icon_order_car.png
..._iPhone_assets/icon_order_car.imageset/icon_order_car.png
+0
-0
icon_order_car@2x.png
...hone_assets/icon_order_car.imageset/icon_order_car@2x.png
+0
-0
OrderDetailTopView.h
ALand/CodeClass/Home/View/Order/OrderDetailTopView.h
+1
-1
OrderDetailTopView.m
ALand/CodeClass/Home/View/Order/OrderDetailTopView.m
+12
-0
OrderDetailTopView.xib
ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib
+86
-28
OrderDetailViewController.m
...ass/Home/ViewController/Order/OrderDetailViewController.m
+3
-0
ToLoginViewController.xib
ALand/CodeClass/Login/Base.lproj/ToLoginViewController.xib
+2
-2
HTTPCilent.m
ALand/Global/HTTPCilent.m
+2
-0
No files found.
ALand/Assets.xcassets/02订单详情_iPhone_assets/icon_order_car.imageset/Contents.json
0 → 100644
View file @
e6861c04
{
"images"
:
[
{
"idiom"
:
"universal"
,
"filename"
:
"icon_order_car.png"
,
"scale"
:
"1x"
},
{
"idiom"
:
"universal"
,
"filename"
:
"icon_order_car@2x.png"
,
"scale"
:
"2x"
},
{
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
}
}
\ No newline at end of file
ALand/Assets.xcassets/02订单详情_iPhone_assets/icon_order_car.imageset/icon_order_car.png
0 → 100644
View file @
e6861c04
1.57 KB
ALand/Assets.xcassets/02订单详情_iPhone_assets/icon_order_car.imageset/icon_order_car@2x.png
0 → 100644
View file @
e6861c04
2.38 KB
ALand/CodeClass/Home/View/Order/OrderDetailTopView.h
View file @
e6861c04
...
@@ -26,7 +26,7 @@ typedef NS_ENUM(NSInteger, ORDERTOPTYPE)
...
@@ -26,7 +26,7 @@ typedef NS_ENUM(NSInteger, ORDERTOPTYPE)
@property
(
nonatomic
)
CGFloat
viewHeight
;
@property
(
nonatomic
)
CGFloat
viewHeight
;
-
(
void
)
updateByOrderType
;
-
(
void
)
updateHeight
;
-
(
void
)
updateHeight
;
@end
@end
ALand/CodeClass/Home/View/Order/OrderDetailTopView.m
View file @
e6861c04
...
@@ -9,6 +9,7 @@
...
@@ -9,6 +9,7 @@
#import "OrderDetailTopView.h"
#import "OrderDetailTopView.h"
@interface
OrderDetailTopView
()
@interface
OrderDetailTopView
()
@property
(
weak
,
nonatomic
)
IBOutlet
UIView
*
viewExpress
;
@end
@end
@implementation
OrderDetailTopView
@implementation
OrderDetailTopView
...
@@ -17,10 +18,21 @@
...
@@ -17,10 +18,21 @@
}
}
-
(
void
)
updateByOrderType
{
if
(
self
.
orderType
==
ORDERTOPTYPE_TRANSPORTED
||
self
.
orderType
==
ORDERTOPTYPE_COMMPLETE
)
{
[
self
.
viewExpress
removeFromSuperview
];
}
else
{
[
self
.
viewExpress
removeFromSuperview
];
}
}
-
(
void
)
updateHeight
{
-
(
void
)
updateHeight
{
self
.
height
=
self
.
bottomView
.
bottom
;
self
.
height
=
self
.
bottomView
.
bottom
;
}
}
-
(
IBAction
)
actionCall
:
(
id
)
sender
{
-
(
IBAction
)
actionCall
:
(
id
)
sender
{
[[
UIApplication
sharedApplication
]
openURL
:[
NSURL
URLWithString
:[
NSString
stringWithFormat
:
@"tel://%@"
,
self
.
labelPhoneNumber
.
text
]]];
[[
UIApplication
sharedApplication
]
openURL
:[
NSURL
URLWithString
:[
NSString
stringWithFormat
:
@"tel://%@"
,
self
.
labelPhoneNumber
.
text
]]];
}
}
...
...
ALand/CodeClass/Home/View/Order/OrderDetailTopView.xib
View file @
e6861c04
This diff is collapsed.
Click to expand it.
ALand/CodeClass/Home/ViewController/Order/OrderDetailViewController.m
View file @
e6861c04
...
@@ -38,9 +38,12 @@
...
@@ -38,9 +38,12 @@
OrderDetailTopView
*
topView
=
[
OrderDetailTopView
viewWithNibName
:
@"OrderDetailTopView"
];
OrderDetailTopView
*
topView
=
[
OrderDetailTopView
viewWithNibName
:
@"OrderDetailTopView"
];
self
.
atopView
=
topView
;
self
.
atopView
=
topView
;
self
.
atopView
.
orderType
=
self
.
orderType
;
self
.
atopView
.
labelAddress
.
text
=
[
NSString
randomTestText
];
self
.
atopView
.
labelAddress
.
text
=
[
NSString
randomTestText
];
[
self
.
tableView
addSubview
:
topView
];
[
self
.
tableView
addSubview
:
topView
];
[
self
.
atopView
updateByOrderType
];
self
.
bottomView
=
[
OrderDetailBottomView
viewWithNibName
:
@"OrderDetailBottomView"
];
self
.
bottomView
=
[
OrderDetailBottomView
viewWithNibName
:
@"OrderDetailBottomView"
];
self
.
bottomView
.
laberRemark
.
text
=
[
NSString
randomTestText
];
self
.
bottomView
.
laberRemark
.
text
=
[
NSString
randomTestText
];
...
...
ALand/CodeClass/Login/Base.lproj/ToLoginViewController.xib
View file @
e6861c04
...
@@ -60,8 +60,8 @@
...
@@ -60,8 +60,8 @@
<constraint
firstAttribute=
"height"
constant=
"30"
id=
"bqM-pK-6q9"
/>
<constraint
firstAttribute=
"height"
constant=
"30"
id=
"bqM-pK-6q9"
/>
</constraints>
</constraints>
</imageView>
</imageView>
<textField
opaque=
"NO"
clipsSubviews=
"YES"
contentMode=
"scaleToFill"
misplaced=
"YES"
contentHorizontalAlignment=
"left"
contentVerticalAlignment=
"center"
text=
"1"
placeholder=
"请输入手机号码"
textAlignment=
"natural"
minimumFontSize=
"17"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"5eD-la-0j7"
>
<textField
opaque=
"NO"
clipsSubviews=
"YES"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"left"
contentVerticalAlignment=
"center"
text=
"1"
placeholder=
"请输入手机号码"
textAlignment=
"natural"
minimumFontSize=
"17"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"5eD-la-0j7"
>
<rect
key=
"frame"
x=
"70"
y=
"1
0"
width=
"273"
height=
"30
"
/>
<rect
key=
"frame"
x=
"70"
y=
"1
4"
width=
"273"
height=
"22
"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"18"
/>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"18"
/>
<textInputTraits
key=
"textInputTraits"
/>
<textInputTraits
key=
"textInputTraits"
/>
</textField>
</textField>
...
...
ALand/Global/HTTPCilent.m
View file @
e6861c04
...
@@ -68,10 +68,12 @@
...
@@ -68,10 +68,12 @@
[
self
.
manager
GET
:
URLString
parameters
:
parameters
progress
:^
(
NSProgress
*
_Nonnull
downloadProgress
)
{
[
self
.
manager
GET
:
URLString
parameters
:
parameters
progress
:^
(
NSProgress
*
_Nonnull
downloadProgress
)
{
}
success
:^
(
NSURLSessionDataTask
*
_Nonnull
task
,
id
_Nullable
responseObject
)
{
}
success
:^
(
NSURLSessionDataTask
*
_Nonnull
task
,
id
_Nullable
responseObject
)
{
NSDictionary
*
dic
=
responseObject
;
NSDictionary
*
dic
=
responseObject
;
CLog
(
@"GET success!-------->%@"
,
[
dic
JSONString
]);
CLog
(
@"GET success!-------->%@"
,
[
dic
JSONString
]);
success
(
task
,
responseObject
);
success
(
task
,
responseObject
);
}
failure
:^
(
NSURLSessionDataTask
*
_Nullable
task
,
NSError
*
_Nonnull
error
)
{
}
failure
:^
(
NSURLSessionDataTask
*
_Nullable
task
,
NSError
*
_Nonnull
error
)
{
CLog
(
@"GET请求失败!----->%@"
,
[
error
localizedDescription
]);
CLog
(
@"GET请求失败!----->%@"
,
[
error
localizedDescription
]);
failure
(
task
,
error
);
failure
(
task
,
error
);
}];
}];
...
...
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