Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GeliBusinessPlatform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ljy
GeliBusinessPlatform
Commits
b2f3400b
Commit
b2f3400b
authored
Nov 25, 2020
by
刘俊宏
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正分销订单显示和修正xib优先级
parent
f3798cad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
4 deletions
+18
-4
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
...ata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib
GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib
+4
-1
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift
...wController/分销订单管理/RetailManageDetailViewController.swift
+14
-3
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/liujunhong.xcuserdatad/UserInterfaceState.xcuserstate
View file @
b2f3400b
No preview for this file type
GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib
View file @
b2f3400b
...
...
@@ -27,6 +27,9 @@
</view>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"252"
verticalHuggingPriority=
"251"
text=
"标题:"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"6wI-Bk-Hnz"
>
<rect
key=
"frame"
x=
"15"
y=
"17"
width=
"40"
height=
"16"
/>
<constraints>
<constraint
firstAttribute=
"width"
relation=
"greaterThanOrEqual"
constant=
"40"
id=
"L8l-dk-MgC"
/>
</constraints>
<fontDescription
key=
"fontDescription"
type=
"system"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"标题字颜色"
/>
<nil
key=
"highlightedColor"
/>
...
...
@@ -41,11 +44,11 @@
<constraints>
<constraint
firstAttribute=
"trailing"
secondItem=
"Q6V-I9-aNd"
secondAttribute=
"trailing"
constant=
"15"
id=
"91e-XA-Iqf"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"zvz-cN-gmt"
secondAttribute=
"trailing"
id=
"91g-iJ-e2S"
/>
<constraint
firstItem=
"Q6V-I9-aNd"
firstAttribute=
"leading"
secondItem=
"6wI-Bk-Hnz"
secondAttribute=
"trailing"
priority=
"750"
constant=
"15"
id=
"HNr-U6-OGL"
/>
<constraint
firstItem=
"zvz-cN-gmt"
firstAttribute=
"leading"
secondItem=
"H2p-sc-9uM"
secondAttribute=
"leading"
constant=
"15"
id=
"Mua-VI-kn3"
/>
<constraint
firstItem=
"6wI-Bk-Hnz"
firstAttribute=
"leading"
secondItem=
"H2p-sc-9uM"
secondAttribute=
"leading"
constant=
"15"
id=
"NXV-5U-lIO"
/>
<constraint
firstItem=
"6wI-Bk-Hnz"
firstAttribute=
"centerY"
secondItem=
"H2p-sc-9uM"
secondAttribute=
"centerY"
id=
"aLi-6W-mr9"
/>
<constraint
firstItem=
"Q6V-I9-aNd"
firstAttribute=
"centerY"
secondItem=
"H2p-sc-9uM"
secondAttribute=
"centerY"
id=
"lmF-E2-VqK"
/>
<constraint
firstItem=
"Q6V-I9-aNd"
firstAttribute=
"leading"
secondItem=
"6wI-Bk-Hnz"
secondAttribute=
"trailing"
constant=
"15"
id=
"mma-bX-li1"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"zvz-cN-gmt"
secondAttribute=
"bottom"
id=
"oe1-RM-1UU"
/>
</constraints>
</tableViewCellContentView>
...
...
GeliBusinessPlatform/ViewController/分销订单管理/RetailManageDetailViewController.swift
View file @
b2f3400b
...
...
@@ -104,7 +104,6 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
cell
.
textTF
.
text
=
"¥"
+
(
self
.
dataMdoel
?
.
order_res
!.
goods_amount
)
!
case
3
:
cell
.
nameLbl
.
text
=
fenxiaoTitleArr
[
indexPath
.
row
]
switch
indexPath
.
row
{
case
0
:
if
self
.
dataMdoel
?
.
order_res
?
.
dbt_target
==
1
{
...
...
@@ -127,15 +126,27 @@ class RetailManageDetailViewController: BaseViewController ,UITableViewDelegate,
cell
.
textTF
.
text
=
"-"
}
case
2
:
cell
.
textTF
.
text
=
self
.
dataMdoel
?
.
dbt_info
?
.
commission_type
if
self
.
dataMdoel
?
.
dbt_info
?
.
commission_type
!=
nil
{
if
(
self
.
dataMdoel
?
.
dbt_info
?
.
commission_type
!.
count
)
!
>
0
{
cell
.
textTF
.
text
=
self
.
dataMdoel
?
.
dbt_info
?
.
commission_type
}
else
{
cell
.
textTF
.
text
=
"-"
}
}
else
{
cell
.
textTF
.
text
=
"-"
}
case
3
:
cell
.
textTF
.
text
=
self
.
dataMdoel
?
.
dbt_info
?
.
commission_time
case
4
:
cell
.
textTF
.
text
=
"¥"
+
(
self
.
dataMdoel
?
.
order_res
!.
sum_commission_val
)
!
default
:
cell
.
textTF
.
text
=
""
cell
.
textTF
.
text
=
"
-
"
break
}
cell
.
nameLbl
.
text
=
fenxiaoTitleArr
[
indexPath
.
row
]
case
4
:
cell
.
nameLbl
.
text
=
orderTitleArr
[
indexPath
.
row
]
switch
indexPath
.
row
{
...
...
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