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
53553155
Commit
53553155
authored
Nov 18, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复分销商品全选bug
parent
ce652027
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
26 deletions
+15
-26
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.swift
...sPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.swift
+1
-0
GeliBusinessPlatform/ViewController/供应商合作管理/GYS_HZ_Vc.swift
GeliBusinessPlatform/ViewController/供应商合作管理/GYS_HZ_Vc.swift
+8
-15
GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift
...sPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift
+6
-11
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
53553155
No preview for this file type
GeliBusinessPlatform/View/Cell/GYS_FX_ProductCellTableViewCell.swift
View file @
53553155
...
@@ -36,6 +36,7 @@ class GYS_FX_ProductCellTableViewCell: UITableViewCell {
...
@@ -36,6 +36,7 @@ class GYS_FX_ProductCellTableViewCell: UITableViewCell {
@IBOutlet
weak
var
submitBtn
:
UIButton
!
@IBOutlet
weak
var
submitBtn
:
UIButton
!
@IBOutlet
weak
var
old_price_line
:
UIView
!
@IBOutlet
weak
var
old_price_line
:
UIView
!
@IBOutlet
weak
var
leftValue
:
NSLayoutConstraint
!
@IBOutlet
weak
var
leftValue
:
NSLayoutConstraint
!
override
func
awakeFromNib
()
{
override
func
awakeFromNib
()
{
super
.
awakeFromNib
()
super
.
awakeFromNib
()
// Initialization code
// Initialization code
...
...
GeliBusinessPlatform/ViewController/供应商合作管理/GYS_HZ_Vc.swift
View file @
53553155
...
@@ -9,25 +9,27 @@
...
@@ -9,25 +9,27 @@
import
UIKit
import
UIKit
class
GYS_HZ_Vc
:
BaseViewController
,
UITableViewDelegate
,
UITableViewDataSource
,
UISearchBarDelegate
,
SearchBarViewDelegate
,
GYS_GuanLi_CellDelegate
,
GeliAlertViewDelegate
{
class
GYS_HZ_Vc
:
BaseViewController
,
UITableViewDelegate
,
UITableViewDataSource
,
UISearchBarDelegate
,
SearchBarViewDelegate
,
GYS_GuanLi_CellDelegate
,
GeliAlertViewDelegate
{
let
UserToken
=
UserDefaults
.
standard
.
value
(
forKey
:
"user_token"
)
var
keyword
=
""
var
title_str
=
""
func
sureGeliAlertViewAction
(
sender
:
UIButton
)
{
func
sureGeliAlertViewAction
(
sender
:
UIButton
)
{
if
title_str
==
"分销商管理"
{
if
title_str
==
"分销商管理"
{
let
model
=
dbt_datas
[
sender
.
tag
]
let
model
=
dbt_datas
[
sender
.
tag
]
stopContract
([
"user_token"
:
UserToken
as
Any
,
"dbt_id"
:
model
.
dbt_id
])
{
(
data
)
in
stopContract
([
"user_token"
:
UserToken
as
Any
,
"dbt_id"
:
model
.
dbt_id
])
{
(
data
)
in
HUD
.
flash
(
.
label
(
"删除成功~"
),
delay
:
1.2
)
HUD
.
flash
(
.
label
(
"删除成功~"
),
delay
:
1.2
)
self
.
home_list_tbv
.
mj_header
?
.
beginRefreshing
()
self
.
home_list_tbv
.
mj_header
?
.
beginRefreshing
()
}
failture
:
{
(
err
)
in
}
failture
:
{
(
err
)
in
}
}
return
return
}
}
let
model
=
gys_datas
[
sender
.
tag
]
let
model
=
gys_datas
[
sender
.
tag
]
stopContract
([
"user_token"
:
UserToken
as
Any
,
"sup_id"
:
model
.
sup_id
])
{
(
data
)
in
stopContract
([
"user_token"
:
UserToken
as
Any
,
"sup_id"
:
model
.
sup_id
])
{
(
data
)
in
HUD
.
flash
(
.
label
(
"终止合作成功~"
),
delay
:
1.2
)
HUD
.
flash
(
.
label
(
"终止合作成功~"
),
delay
:
1.2
)
self
.
home_list_tbv
.
mj_header
?
.
beginRefreshing
()
self
.
home_list_tbv
.
mj_header
?
.
beginRefreshing
()
}
failture
:
{
(
err
)
in
}
failture
:
{
(
err
)
in
}
}
}
}
let
UserToken
=
UserDefaults
.
standard
.
value
(
forKey
:
"user_token"
)
func
GYS_GuanLi_CellStopAction
(
idx
:
Int
)
{
func
GYS_GuanLi_CellStopAction
(
idx
:
Int
)
{
var
content
=
"终止和单个供应商的合作后,从该供应商处代销的所有产品都将不再能订单回流,且立即生效,是否确认终止合作?"
var
content
=
"终止和单个供应商的合作后,从该供应商处代销的所有产品都将不再能订单回流,且立即生效,是否确认终止合作?"
if
title_str
==
"分销商管理"
{
if
title_str
==
"分销商管理"
{
...
@@ -40,7 +42,6 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
...
@@ -40,7 +42,6 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确定"
),
for
:
.
normal
)
alertView
.
rightBtn
.
setAttributedTitle
(
NSAttributedString
(
string
:
"确定"
),
for
:
.
normal
)
alertView
.
rightBtn
.
tag
=
idx
alertView
.
rightBtn
.
tag
=
idx
self
.
view
.
window
?
.
addSubview
(
alertView
)
self
.
view
.
window
?
.
addSubview
(
alertView
)
}
}
func
rightBtnClick
()
{
func
rightBtnClick
()
{
...
@@ -53,24 +54,19 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
...
@@ -53,24 +54,19 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
self
.
view
.
window
?
.
addSubview
(
alertView
)
self
.
view
.
window
?
.
addSubview
(
alertView
)
}
}
var
keyword
=
""
func
searchBarSearchButtonClicked
(
_
searchBar
:
UISearchBar
)
{
func
searchBarSearchButtonClicked
(
_
searchBar
:
UISearchBar
)
{
print
(
"点击搜索进行--"
)
print
(
"点击搜索进行--"
)
searchBar
.
resignFirstResponder
()
searchBar
.
resignFirstResponder
()
keyword
=
searchBar
.
text
!
keyword
=
searchBar
.
text
!
removeBlackBtnView
()
removeBlackBtnView
()
self
.
home_list_tbv
.
mj_header
?
.
beginRefreshing
()
self
.
home_list_tbv
.
mj_header
?
.
beginRefreshing
()
}
}
//MARK:--取消搜索代理
//MARK:--取消搜索代理
func
clearSearchAction
()
{
func
clearSearchAction
()
{
print
(
"取消搜索代理了--"
)
print
(
"取消搜索代理了--"
)
// keyword = ""
// self.home_list_tbv.mj_header?.beginRefreshing()
}
}
func
searchBarTextDidEndEditing
(
_
searchBar
:
UISearchBar
)
{
func
searchBarTextDidEndEditing
(
_
searchBar
:
UISearchBar
)
{
print
(
"编辑即将结束了--"
)
print
(
"编辑即将结束了--"
)
if
keyword
.
count
>
0
{
if
keyword
.
count
>
0
{
keyword
=
searchBar
.
text
!
keyword
=
searchBar
.
text
!
if
keyword
.
count
==
0
{
if
keyword
.
count
==
0
{
...
@@ -98,7 +94,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
...
@@ -98,7 +94,7 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
blackBtnView
.
addTarget
(
self
,
action
:
#selector(
removeBlackBtnView
)
,
for
:
.
touchUpInside
)
blackBtnView
.
addTarget
(
self
,
action
:
#selector(
removeBlackBtnView
)
,
for
:
.
touchUpInside
)
return
true
return
true
}
}
var
title_str
=
""
weak
var
searchV
:
SearchBarView
?
=
nil
weak
var
searchV
:
SearchBarView
?
=
nil
@IBOutlet
weak
var
search_view
:
UIView
!
@IBOutlet
weak
var
search_view
:
UIView
!
@IBOutlet
weak
var
home_list_tbv
:
UITableView
!
@IBOutlet
weak
var
home_list_tbv
:
UITableView
!
...
@@ -106,9 +102,6 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
...
@@ -106,9 +102,6 @@ class GYS_HZ_Vc: BaseViewController,UITableViewDelegate,UITableViewDataSource, U
var
dbt_datas
:
Array
<
dbtListDataModel
>
=
[]
var
dbt_datas
:
Array
<
dbtListDataModel
>
=
[]
override
func
viewDidLoad
()
{
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
super
.
viewDidLoad
()
// title_str = "分销商管理"
SetTopFrame
(
view
:
search_view
,
height
:
44
)
SetTopFrame
(
view
:
search_view
,
height
:
44
)
navbar
.
title
=
title_str
navbar
.
title
=
title_str
...
...
GeliBusinessPlatform/ViewController/分销商品管理/FX_Product_GuanLiVC.swift
View file @
53553155
...
@@ -131,7 +131,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -131,7 +131,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
showSelectV
=
showSelectView
showSelectV
=
showSelectView
showSelectView
.
dataArr
=
[
"上架"
,
"下架"
]
showSelectView
.
dataArr
=
[
"上架"
,
"下架"
]
showSelectView
.
selectIndx
=
selectIndexArr
[
1
]
showSelectView
.
selectIndx
=
selectIndexArr
[
1
]
}
}
break
break
default
:
break
default
:
break
...
@@ -165,7 +164,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -165,7 +164,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
func
clearSearchAction
()
{
func
clearSearchAction
()
{
print
(
"取消搜索代理了--"
)
print
(
"取消搜索代理了--"
)
// home_list_tbv.mj_header?.beginRefreshing()
// home_list_tbv.mj_header?.beginRefreshing()
}
}
func
searchBarTextDidEndEditing
(
_
searchBar
:
UISearchBar
)
{
func
searchBarTextDidEndEditing
(
_
searchBar
:
UISearchBar
)
{
print
(
"编辑即将结束了--"
)
print
(
"编辑即将结束了--"
)
...
@@ -190,15 +189,12 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -190,15 +189,12 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
return
true
return
true
}
}
@IBAction
func
allSelect
(
_
sender
:
UIButton
)
{
@IBAction
func
allSelect
(
_
sender
:
UIButton
)
{
sender
.
isSelected
=
!
sender
.
isSelected
sender
.
isSelected
=
!
sender
.
isSelected
selectItem
.
removeAll
()
selectItem
.
removeAll
()
if
sender
.
isSelected
{
if
sender
.
isSelected
{
home_list_tbv
.
visibleCells
.
forEach
{
(
item
)
in
datas
.
forEach
{
(
model
)
in
let
cell
=
item
as!
GYS_FX_ProductCellTableViewCell
selectItem
.
append
(
model
.
sku_id
!
)
selectItem
.
append
(
cell
.
tag
)
}
}
}
}
home_list_tbv
.
reloadData
()
home_list_tbv
.
reloadData
()
...
@@ -221,6 +217,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -221,6 +217,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
}
}
home_list_tbv
.
reloadData
()
home_list_tbv
.
reloadData
()
}
}
@IBOutlet
weak
var
home_list_tbv
:
UITableView
!
@IBOutlet
weak
var
home_list_tbv
:
UITableView
!
@IBOutlet
weak
var
right_title
:
UILabel
!
@IBOutlet
weak
var
right_title
:
UILabel
!
@IBOutlet
weak
var
left_title
:
UILabel
!
@IBOutlet
weak
var
left_title
:
UILabel
!
...
@@ -229,7 +226,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -229,7 +226,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
@IBOutlet
weak
var
count_lbl
:
UILabel
!//
数量
@IBOutlet
weak
var
count_lbl
:
UILabel
!//
数量
@IBOutlet
weak
var
search_view
:
UIView
!
@IBOutlet
weak
var
search_view
:
UIView
!
weak
var
searchV
:
SearchBarView
?
=
nil
weak
var
searchV
:
SearchBarView
?
=
nil
weak
var
selectV
:
HeaderSelectView
!
=
nil
weak
var
selectV
:
HeaderSelectView
!
=
nil
@IBOutlet
weak
var
top_btn_bg_view
:
UIView
!
@IBOutlet
weak
var
top_btn_bg_view
:
UIView
!
...
@@ -313,6 +309,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -313,6 +309,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
cell
.
select_Img
.
image
=
UIImage
(
named
:
"daixuan"
)
cell
.
select_Img
.
image
=
UIImage
(
named
:
"daixuan"
)
selectItem
.
forEach
{
(
idx
)
in
selectItem
.
forEach
{
(
idx
)
in
print
(
"abc = "
,
idx
,
model
.
sku_id
)
if
idx
==
model
.
sku_id
{
if
idx
==
model
.
sku_id
{
cell
.
select_Img
.
image
=
UIImage
(
named
:
"yuxuan"
)
cell
.
select_Img
.
image
=
UIImage
(
named
:
"yuxuan"
)
}
}
...
@@ -363,7 +360,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -363,7 +360,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
return
cell
return
cell
}
}
var
selectItem
:
Array
<
Int
>
=
[]
var
selectItem
:
Array
<
Int
>
=
[]
func
GYS_FX_ProductCellTableViewCellSelect
(
idx
:
Int
)
{
func
GYS_FX_ProductCellTableViewCellSelect
(
idx
:
Int
)
{
let
model
=
datas
[
idx
]
let
model
=
datas
[
idx
]
if
selectItem
.
contains
(
idx
){
if
selectItem
.
contains
(
idx
){
...
@@ -416,7 +412,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -416,7 +412,7 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
self
.
home_list_tbv
.
reloadData
()
self
.
home_list_tbv
.
reloadData
()
self
.
home_list_tbv
?
.
mj_header
?
.
endRefreshing
()
self
.
home_list_tbv
?
.
mj_header
?
.
endRefreshing
()
self
.
page
=
2
self
.
page
=
2
// self.count_lbl.text = "0"
// self.count_lbl.text = "0"
if
model
.
data
?
.
res
?
.
count
==
0
||
model
.
data
?
.
res
!=
nil
{
if
model
.
data
?
.
res
?
.
count
==
0
||
model
.
data
?
.
res
!=
nil
{
...
@@ -427,7 +423,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -427,7 +423,6 @@ class FX_Product_GuanLiVC: BaseViewController,UITableViewDelegate,UITableViewDat
}
failture
:
{
(
err
)
in
}
failture
:
{
(
err
)
in
self
.
home_list_tbv
?
.
mj_header
?
.
endRefreshing
()
self
.
home_list_tbv
?
.
mj_header
?
.
endRefreshing
()
}
}
}
}
//MARK:--加载更多数据
//MARK:--加载更多数据
@objc
func
loadMoreData
(){
@objc
func
loadMoreData
(){
...
...
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