Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
Car-iOS-Merchant
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
张杰
Car-iOS-Merchant
Commits
b9523645
Commit
b9523645
authored
8 years ago
by
Sandy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
核销订单增加了起止时间,隐藏描述
parent
c9dbbe0e
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
14 deletions
+25
-14
project.pbxproj
Car.xcodeproj/project.pbxproj
+2
-2
Main.storyboard
Car/Base.lproj/Main.storyboard
+8
-8
CardView.m
Car/CodeClass/LeftView/Views/CardView.m
+5
-1
OrderListTableViewCell.m
Car/CodeClass/Main/Cells/OrderListTableViewCell.m
+6
-1
Info.plist
Car/Info.plist
+2
-2
car_objc_json_client.h
Car/car_objc_json_client.h
+2
-0
No files found.
Car.xcodeproj/project.pbxproj
View file @
b9523645
...
...
@@ -1202,7 +1202,7 @@
INFOPLIST_FILE
=
Car/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.
czt
.car
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.
gomore
.car
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
USER_HEADER_SEARCH_PATHS
=
"$(SRCROOT)/**"
;
};
...
...
@@ -1227,7 +1227,7 @@
INFOPLIST_FILE
=
Car/Info.plist
;
IPHONEOS_DEPLOYMENT_TARGET
=
8.0
;
LD_RUNPATH_SEARCH_PATHS
=
"$(inherited) @executable_path/Frameworks"
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.
czt
.car
;
PRODUCT_BUNDLE_IDENTIFIER
=
com.
gomore
.car
;
PRODUCT_NAME
=
"$(TARGET_NAME)"
;
USER_HEADER_SEARCH_PATHS
=
"$(SRCROOT)/**"
;
};
...
...
This diff is collapsed.
Click to expand it.
Car/Base.lproj/Main.storyboard
View file @
b9523645
This diff is collapsed.
Click to expand it.
Car/CodeClass/LeftView/Views/CardView.m
View file @
b9523645
...
...
@@ -25,7 +25,11 @@
self
.
labelBillNumber
.
text
=
model
.
billNumber
;
self
.
labelMoney
.
text
=
[
model
.
realPayTotal
stringValue
];
self
.
imgState
.
hidden
=
!
[
model
.
state
isEqualToString
:
@"checked"
];
if
(
model
.
validatedStartDate
)
{
self
.
labelDuring
.
text
=
[
NSString
stringWithFormat
:
@"%@~%@"
,
model
.
validatedStartDate
,
model
.
validatedEndDate
];
}
else
{
self
.
labelDuring
.
text
=
@"暂无"
;
}
}
@end
This diff is collapsed.
Click to expand it.
Car/CodeClass/Main/Cells/OrderListTableViewCell.m
View file @
b9523645
...
...
@@ -24,7 +24,12 @@
self
.
labelBillNumber
.
text
=
model
.
billNumber
;
self
.
labelMoney
.
text
=
[
model
.
realPayTotal
stringValue
];
self
.
imgState
.
hidden
=
!
[
model
.
state
isEqualToString
:
@"checked"
];
if
(
model
.
validatedStartDate
)
{
self
.
labelDuring
.
text
=
[
NSString
stringWithFormat
:
@"%@~%@"
,
model
.
validatedStartDate
,
model
.
validatedEndDate
];
}
else
{
self
.
labelDuring
.
text
=
@"暂无"
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Car/Info.plist
View file @
b9523645
...
...
@@ -17,7 +17,7 @@
<
k
e
y
>
CFBundlePackageType
<
/k
e
y
>
<
string
>
APPL
<
/string
>
<
k
e
y
>
CFBundleShortVersionString
<
/k
e
y
>
<
string
>
1.0.
3
<
/string
>
<
string
>
1.0.
0
<
/string
>
<
k
e
y
>
CFBundleURLTypes
<
/k
e
y
>
<
a
rr
a
y
>
<
d
i
c
t
>
...
...
@@ -30,7 +30,7 @@
<
/
d
i
c
t
>
<
/
a
rr
a
y
>
<
k
e
y
>
CFBundleVersion
<
/k
e
y
>
<
string
>
1.0.
3
<
/string
>
<
string
>
1.0.
0
<
/string
>
<
k
e
y
>
LSApplicationQueriesSchemes
<
/k
e
y
>
<
a
rr
a
y
>
<
string
>
wechat
<
/string
>
...
...
This diff is collapsed.
Click to expand it.
Car/car_objc_json_client.h
View file @
b9523645
...
...
@@ -1469,6 +1469,8 @@ extern NSString * const QUERYORDERDIRECTION_DESC;
*
*/
@property
(
nonatomic
,
copy
)
NSString
*
productImageUrl
;
@property
(
nonatomic
,
copy
)
NSString
*
validatedEndDate
;
@property
(
nonatomic
,
copy
)
NSString
*
validatedStartDate
;
@end
/* interface ProductOrderEntity */
...
...
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