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
605db812
Commit
605db812
authored
Jul 17, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复发现选择bug
parent
516136e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
15 deletions
+21
-15
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.swift
...essPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.swift
+21
-14
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
...ssPlatform/ViewController/订单详情/OrderDViewController.swift
+0
-1
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
605db812
No preview for this file type
GeliBusinessPlatform/ViewController/订单管理/关联客户/GuanLianKehuVC.swift
View file @
605db812
...
@@ -17,9 +17,9 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
...
@@ -17,9 +17,9 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
var
delegate
:
GuanLianKehuVCDelegate
?
var
delegate
:
GuanLianKehuVCDelegate
?
@IBOutlet
weak
var
btnLblH
:
NSLayoutConstraint
!
@IBOutlet
weak
var
btnLblH
:
NSLayoutConstraint
!
let
UserToken
=
UserDefaults
.
standard
.
value
(
forKey
:
"user_token"
)
let
UserToken
=
UserDefaults
.
standard
.
value
(
forKey
:
"user_token"
)
@IBOutlet
weak
var
btn
:
LGButton
!
@IBOutlet
weak
var
btn
:
LGButton
!
var
selectIdx
:
Int
?
=
nil
//暂代关联客户数据
var
selectIdx
:
Int
?
//暂代关联客户数据
var
order_id
:
Int
?
=
0
var
order_id
:
Int
?
=
0
...
@@ -36,11 +36,11 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
...
@@ -36,11 +36,11 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
}
}
return
return
}
}
if
selectIdx
!=
nil
{
if
selectIdx
!=
nil
{
HUD
.
flash
(
.
progress
)
HUD
.
flash
(
.
progress
)
let
model
=
self
.
dataArr
[
self
.
selectIdx
!
]
let
model
=
self
.
dataArr
[
self
.
selectIdx
!
]
bindCus
([
"cus_id"
:
model
.
cus_id
as
Any
,
"user_token"
:
UserToken
as
Any
,
"order_id"
:
order_id
as
Any
],
success
:
{
(
data
)
in
bindCus
([
"cus_id"
:
model
.
cus_id
as
Any
,
"user_token"
:
UserToken
as
Any
,
"order_id"
:
order_id
as
Any
],
success
:
{
(
data
)
in
...
@@ -67,7 +67,13 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
...
@@ -67,7 +67,13 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
navbar
.
title
=
"关联客户"
navbar
.
title
=
"关联客户"
self
.
view
.
addSubview
(
navbar
)
self
.
view
.
addSubview
(
navbar
)
self
.
view
.
backgroundColor
=
UIColor
.
white
self
.
view
.
backgroundColor
=
UIColor
.
white
setTabv
()
setTabv
()
}
}
//MARK:--传入已选客户
//MARK:--传入已选客户
var
cus_id
:
Int
?
=
nil
var
cus_id
:
Int
?
=
nil
...
@@ -82,7 +88,12 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
...
@@ -82,7 +88,12 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
dataM
.
data
?
.
forEach
({
(
model
)
in
dataM
.
data
?
.
forEach
({
(
model
)
in
self
.
dataArr
.
append
(
model
)
self
.
dataArr
.
append
(
model
)
})
})
for
i
in
0
..<
self
.
dataArr
.
count
{
let
item
=
self
.
dataArr
[
i
]
if
self
.
cus_id
==
item
.
cus_id
{
self
.
selectIdx
=
i
}
}
if
self
.
dataArr
.
count
==
0
{
if
self
.
dataArr
.
count
==
0
{
self
.
btn
.
isHidden
=
true
self
.
btn
.
isHidden
=
true
self
.
btnLblH
.
constant
=
0
self
.
btnLblH
.
constant
=
0
...
@@ -150,6 +161,7 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
...
@@ -150,6 +161,7 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
let
rowModel
=
self
.
dataArr
[
indexPath
.
row
]
let
rowModel
=
self
.
dataArr
[
indexPath
.
row
]
cell
.
senderLbl
.
text
=
rowModel
.
cus_name
cell
.
senderLbl
.
text
=
rowModel
.
cus_name
if
rowModel
.
user_name
==
nil
{
if
rowModel
.
user_name
==
nil
{
cell
.
arrowImg
.
isHidden
=
true
cell
.
arrowImg
.
isHidden
=
true
cell
.
receiverLbl
.
text
=
""
cell
.
receiverLbl
.
text
=
""
...
@@ -157,6 +169,7 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
...
@@ -157,6 +169,7 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
cell
.
arrowImg
.
isHidden
=
false
cell
.
arrowImg
.
isHidden
=
false
cell
.
receiverLbl
.
text
=
rowModel
.
user_name
cell
.
receiverLbl
.
text
=
rowModel
.
user_name
}
}
if
rowModel
.
cus_type
==
1
{
if
rowModel
.
cus_type
==
1
{
cell
.
personLbl
.
isHidden
=
false
cell
.
personLbl
.
isHidden
=
false
cell
.
companyLbl
.
isHidden
=
true
cell
.
companyLbl
.
isHidden
=
true
...
@@ -166,17 +179,11 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
...
@@ -166,17 +179,11 @@ class GuanLianKehuVC: BaseViewController , UITableViewDelegate, UITableViewDataS
}
}
cell
.
detailLbl
.
text
=
rowModel
.
company
cell
.
detailLbl
.
text
=
rowModel
.
company
if
cus_id
!=
nil
{
if
selectIdx
==
indexPath
.
row
{
if
cus_id
==
rowModel
.
cus_id
{
cell
.
imgBtn
.
isSelected
=
true
cell
.
imgBtn
.
isSelected
=
true
selectIdx
=
indexPath
.
row
}
}
else
{
if
selectIdx
==
indexPath
.
row
{
cell
.
imgBtn
.
isSelected
=
true
}
}
}
return
cell
return
cell
}
}
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
...
...
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @
605db812
...
@@ -378,7 +378,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
...
@@ -378,7 +378,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
vc
.
cus_id
=
self
.
dataMdoel
?
.
order_res
?
.
cus_id
vc
.
cus_id
=
self
.
dataMdoel
?
.
order_res
?
.
cus_id
}
}
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
}
}
if
indexPath
.
section
==
4
{
if
indexPath
.
section
==
4
{
...
...
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