Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
ios1x
Overview
Overview
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
cemarose
ios1x
Commits
7358e811
Commit
7358e811
authored
8 years ago
by
houweibin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1,地址列表,提交订单页面显示国家
parent
d9abf67a
master
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
KWMAddressCell.m
iCemarose/Class/UI/ShopCart/Cell/KWMAddressCell.m
+3
-3
KWMBeforePayVC.m
iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m
+3
-3
No files found.
iCemarose/Class/UI/ShopCart/Cell/KWMAddressCell.m
View file @
7358e811
...
...
@@ -24,10 +24,10 @@
_address
=
address
;
_lbName
.
text
=
address
.
lastName
;
_lbPhone
.
text
=
address
.
phone
;
if
(
address
.
province
!=
nil
){
_lbAddress
.
text
=
[
NSString
stringWithFormat
:
@"%@, %@
"
,
address
.
city
,
address
.
province
];
if
(
address
.
province
){
//省份有可能为空
_lbAddress
.
text
=
[
NSString
stringWithFormat
:
@"%@, %@
, %@"
,
address
.
city
,
address
.
province
,
address
.
country
];
}
else
{
_lbAddress
.
text
=
address
.
city
;
_lbAddress
.
text
=
[
NSString
stringWithFormat
:
@"%@, %@"
,
address
.
city
,
address
.
country
]
;
}
_lbAddressDetail
.
text
=
[
NSString
stringWithFormat
:
@"%@ %@"
,
address
.
address1
,
address
.
address2
==
nil
?
@""
:
address
.
address2
];
}
...
...
This diff is collapsed.
Click to expand it.
iCemarose/Class/UI/ShopCart/KWMBeforePayVC.m
View file @
7358e811
...
...
@@ -103,12 +103,12 @@
self
.
lbNoAddress
.
hidden
=
YES
;
_lbName
.
text
=
address
.
lastName
;
_lbPhone
.
text
=
address
.
phone
;
if
(
address
.
province
!=
nil
){
if
(
address
.
province
){
//省份有可能为空
//城市 省份
_lbAddress
.
text
=
[
NSString
stringWithFormat
:
@"%@, %@
"
,
address
.
city
,
address
.
province
];
_lbAddress
.
text
=
[
NSString
stringWithFormat
:
@"%@, %@
, %@"
,
address
.
city
,
address
.
province
,
address
.
country
];
}
else
{
//具体地址 补充
_lbAddress
.
text
=
address
.
city
;
_lbAddress
.
text
=
[
NSString
stringWithFormat
:
@"%@, %@"
,
address
.
city
,
address
.
country
]
;
}
_lbAddressDetail
.
text
=
[
NSString
stringWithFormat
:
@"%@ %@"
,
address
.
address1
,
address
.
address2
==
nil
?
@""
:
address
.
address2
];
self
.
lbShippingRate
.
textColor
=
[
UIColor
sam_colorWithHex
:
@"393939"
];
...
...
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